diff options
author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-05 15:02:51 (GMT) |
---|---|---|
committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-12-05 15:02:51 (GMT) |
commit | 18fa4ccaba77d03647c46bb2036328bf340f8be3 (patch) | |
tree | d5ce8491974351aeba1861934052277dcb7fb858 | |
parent | 5b842271c661b6ce24e52b3a9575e05423acb8fe (diff) |
Fixed some bugs.
-rw-r--r-- | src/lib/tng_io.c | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c index 89168e2..258c479 100644 --- a/src/lib/tng_io.c +++ b/src/lib/tng_io.c @@ -17259,12 +17259,16 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write { stride_length = p_data->stride_length; - frame_pos = (frame_nr - frame_set->first_frame) / stride_length; - if(is_first_frame_flag) { p_data->first_frame_with_data = frame_nr; + frame_pos = 0; + } + else + { + frame_pos = (frame_nr - frame_set->first_frame) / stride_length; } + memcpy((char *)p_data->values + sizeof(float) * frame_pos * n_particles * n_values_per_frame, values, sizeof(float) * n_particles * n_values_per_frame); @@ -17313,15 +17317,14 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write { stride_length = np_data->stride_length; - frame_pos = (frame_nr - frame_set->first_frame) / stride_length; - if(is_first_frame_flag) { np_data->first_frame_with_data = frame_nr; + frame_pos = 0; } else { - np_data->first_frame_with_data = frame_set->first_frame; + frame_pos = (frame_nr - frame_set->first_frame) / stride_length; } memcpy((char *)np_data->values + sizeof(float) * frame_pos * @@ -17473,24 +17476,23 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_double_write { stride_length = p_data->stride_length; - frame_pos = (frame_nr - frame_set->first_frame) / stride_length; - if(is_first_frame_flag) { p_data->first_frame_with_data = frame_nr; + frame_pos = 0; } else { - p_data->first_frame_with_data = frame_set->first_frame; + frame_pos = (frame_nr - frame_set->first_frame) / stride_length; } - memcpy((char *)p_data->values + sizeof(float) * frame_pos * n_particles * - n_values_per_frame, values, sizeof(float) * + memcpy((char *)p_data->values + sizeof(double) * frame_pos * n_particles * + n_values_per_frame, values, sizeof(double) * n_particles * n_values_per_frame); } else { - memcpy(p_data->values, values, sizeof(float) * n_particles * + memcpy(p_data->values, values, sizeof(double) * n_particles * n_values_per_frame); } } @@ -17532,24 +17534,23 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_double_write { stride_length = np_data->stride_length; - frame_pos = (frame_nr - frame_set->first_frame) / stride_length; - if(is_first_frame_flag) { np_data->first_frame_with_data = frame_nr; + frame_pos = 0; } else { - np_data->first_frame_with_data = frame_set->first_frame; + frame_pos = (frame_nr - frame_set->first_frame) / stride_length; } - memcpy((char *)np_data->values + sizeof(float) * frame_pos * - n_values_per_frame, values, sizeof(float) * + memcpy((char *)np_data->values + sizeof(double) * frame_pos * + n_values_per_frame, values, sizeof(double) * n_values_per_frame); } else { - memcpy(np_data->values, values, sizeof(float) * n_values_per_frame); + memcpy(np_data->values, values, sizeof(double) * n_values_per_frame); } } |