summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/tng_io.c26
-rw-r--r--src/lib/tng_io.h13
-rw-r--r--src/tests/tng_io_testing.c4
3 files changed, 25 insertions, 18 deletions
diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c
index 0319ce2..ecdcaeb 100644
--- a/src/lib/tng_io.c
+++ b/src/lib/tng_io.c
@@ -8014,7 +8014,7 @@ tng_function_status tng_frame_particle_data_write(tng_trajectory_t tng_data,
const int64_t val_first_particle,
const int64_t val_n_particles,
const void *values,
- const tng_hash_mode hash_mode)
+ const tng_hash_mode hash_mode)
{
int64_t header_pos, file_pos, tot_n_particles;
int64_t output_file_len, n_values_per_frame, size, contents_size;
@@ -8548,6 +8548,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
const int64_t block_id,
const int64_t start_frame_nr,
const int64_t end_frame_nr,
+ const tng_hash_mode hash_mode,
union data_values ***values,
int64_t *n_values_per_frame,
tng_data_type *type)
@@ -8577,7 +8578,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
block->id != TNG_TRAJECTORY_FRAME_SET)
{
stat = tng_block_read_next(tng_data, block,
- TNG_SKIP_HASH);
+ hash_mode);
if(stat != TNG_CRITICAL)
{
file_pos = ftell(tng_data->input_file);
@@ -8658,7 +8659,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -8677,7 +8678,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -8696,7 +8697,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -8716,7 +8717,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -8887,6 +8888,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
const int64_t block_id,
const int64_t start_frame_nr,
const int64_t end_frame_nr,
+ const tng_hash_mode hash_mode,
union data_values ****values,
int64_t *n_particles,
int64_t *n_values_per_frame,
@@ -8918,7 +8920,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
block->id != TNG_TRAJECTORY_FRAME_SET)
{
stat = tng_block_read_next(tng_data, block,
- TNG_SKIP_HASH);
+ hash_mode);
if(stat != TNG_CRITICAL)
{
file_pos = ftell(tng_data->input_file);
@@ -8981,7 +8983,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
*n_values_per_frame = data->n_values_per_frame;
if(tng_allocate_particle_data_mem(tng_data, new_data, n_frames,
*n_particles, data->n_values_per_frame) !=
- TNG_SUCCESS)
+ TNG_SUCCESS)
{
free(new_data);
return(TNG_CRITICAL);
@@ -9015,7 +9017,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -9038,7 +9040,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -9061,7 +9063,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
@@ -9085,7 +9087,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
current_frame_pos++;
if(current_frame_pos == frame_set->n_frames)
{
- stat = tng_frame_set_read_next(tng_data, TNG_SKIP_HASH);
+ stat = tng_frame_set_read_next(tng_data, hash_mode);
if(stat != TNG_SUCCESS)
{
return(stat);
diff --git a/src/lib/tng_io.h b/src/lib/tng_io.h
index 97c590f..5b818d4 100644
--- a/src/lib/tng_io.h
+++ b/src/lib/tng_io.h
@@ -1458,6 +1458,7 @@ tng_function_status tng_data_interval_get(tng_trajectory_t tng_data,
const int64_t block_id,
const int64_t start_frame_nr,
const int64_t end_frame_nr,
+ const tng_hash_mode hash_mode,
union data_values ***values,
int64_t *n_values_per_frame,
tng_data_type *type);
@@ -1465,13 +1466,14 @@ tng_function_status tng_data_interval_get_(tng_trajectory_t tng_data,
const int64_t *block_id,
const int64_t *start_frame_nr,
const int64_t *end_frame_nr,
+ const tng_hash_mode *hash_mode,
union data_values ***values,
int64_t *n_values_per_frame,
tng_data_type *type)
{
return(tng_data_interval_get(tng_data, *block_id, *start_frame_nr,
- *end_frame_nr, values, n_values_per_frame,
- type));
+ *end_frame_nr, *hash_mode, values,
+ n_values_per_frame, type));
}
/**
@@ -1546,6 +1548,7 @@ tng_function_status tng_particle_data_interval_get(tng_trajectory_t tng_data,
const int64_t block_id,
const int64_t start_frame_nr,
const int64_t end_frame_nr,
+ const tng_hash_mode hash_mode,
union data_values ****values,
int64_t *n_particles,
int64_t *n_values_per_frame,
@@ -1554,14 +1557,16 @@ tng_function_status tng_particle_data_interval_get_(tng_trajectory_t tng_data,
const int64_t *block_id,
const int64_t *start_frame_nr,
const int64_t *end_frame_nr,
+ const tng_hash_mode *hash_mode,
union data_values ****values,
int64_t *n_particles,
int64_t *n_values_per_frame,
tng_data_type *type)
{
return(tng_particle_data_interval_get(tng_data, *block_id, *start_frame_nr,
- *end_frame_nr, values, n_particles,
- n_values_per_frame, type));
+ *end_frame_nr, *hash_mode, values,
+ n_particles, n_values_per_frame,
+ type));
}
/** @brief Get the date and time of initial file creation in ISO format (string).
diff --git a/src/tests/tng_io_testing.c b/src/tests/tng_io_testing.c
index c0bc595..e5e93ff 100644
--- a/src/tests/tng_io_testing.c
+++ b/src/tests/tng_io_testing.c
@@ -485,8 +485,8 @@ tng_function_status tng_test_get_positions_data(tng_trajectory_t traj)
values = 0;
tng_particle_data_interval_get(traj, TNG_TRAJ_POSITIONS, 11000, 11499,
- &values, &n_particles, &n_values_per_frame,
- &type);
+ TNG_SKIP_HASH, &values, &n_particles,
+ &n_values_per_frame, &type);
tng_particle_data_values_free(values, 500, n_particles, n_values_per_frame, type);
contact: Jan Huwald // Impressum