diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-27 16:41:43 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-11-27 16:41:43 (GMT) |
| commit | 670f2c04c46635fd974817793075f0918c6e3f16 (patch) | |
| tree | 672e30759463dfa3e9859926f3bfbaf7c77fb831 /src | |
| parent | c4838a1bc12f0b258611bd7b7054312acd3b6743 (diff) | |
Improved prematurely finished frame sets.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/tng_io.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 11a2b4e..430fc35 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -11664,6 +11664,11 @@ tng_function_status tng_frame_set_write(tng_trajectory_t tng_data, TNG_ASSERT(tng_data, "TNG library: Trajectory container not properly setup."); frame_set = &tng_data->current_trajectory_frame_set; + + if(frame_set->n_written_frames == frame_set->n_frames) + { + return(TNG_SUCCESS); + } tng_data->current_trajectory_frame_set_output_file_pos = ftell(tng_data->output_file); @@ -16427,11 +16432,9 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write { block_type_flag = TNG_TRAJECTORY_BLOCK; - n_frames = tng_data->frame_set_n_frames; - if(!frame_set || tng_data->n_trajectory_frame_sets <= 0) { - stat = tng_frame_set_new(tng_data, 0, n_frames); + stat = tng_frame_set_new(tng_data, 0, tng_data->frame_set_n_frames); if(stat != TNG_SUCCESS) { printf("TNG library: Cannot create frame set. %s: %d\n", __FILE__, @@ -16439,10 +16442,6 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write return(stat); } } - else - { - n_frames = frame_set->n_frames; - } last_frame = frame_set->first_frame + frame_set->n_frames - 1; if(frame_nr > last_frame) @@ -16458,7 +16457,8 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write { last_frame = frame_nr - 1; } - stat = tng_frame_set_new(tng_data, last_frame + 1, n_frames); + stat = tng_frame_set_new(tng_data, last_frame + 1, + tng_data->frame_set_n_frames); if(stat != TNG_SUCCESS) { printf("TNG library: Cannot create frame set. %s: %d\n", __FILE__, @@ -16468,6 +16468,8 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write } frame_set->n_unwritten_frames = frame_nr - frame_set->first_frame + 1; + + n_frames = frame_set->n_frames; } if(particle_dependency == TNG_PARTICLE_BLOCK_DATA) |