Bumped TNG to latest version.

Change-Id: Id3ca6c18c1f51640997829bd8ad251a7ca91d04f

diff --git a/src/external/tng_io/CMakeLists.txt b/src/external/tng_io/CMakeLists.txt
index dab7a617280c2decb621e08da2351ead039ead91..dded3945c14022b263fcc4453d3da8da24f6ae83 100644 (file)
--- a/src/external/tng_io/CMakeLists.txt
+++ b/src/external/tng_io/CMakeLists.txt
@@ -20,6 +20,7 @@ option(TNG_BUILD_TEST "Build TNG testing binary." ON)
 option(TNG_BUILD_COMPRESSION_TESTS "Build tests of the TNG compression library" OFF)
 
 find_package(ZLIB QUIET)
+option(TNG_BUILD_WITH_ZLIB "Build TNG with zlib compression" ${ZLIB_FOUND})
 
 include(CheckIncludeFile)
 check_include_file(inttypes.h   HAVE_INTTYPES_H)

diff --git a/src/external/tng_io/src/lib/CMakeLists.txt b/src/external/tng_io/src/lib/CMakeLists.txt
index 45e13d2f2f697ad2dc1d9dc284bd3f45538b1bf6..c760f57539435f13fe50c1ec36e9a87f51b84f64 100644 (file)
--- a/src/external/tng_io/src/lib/CMakeLists.txt
+++ b/src/external/tng_io/src/lib/CMakeLists.txt
@@ -23,7 +23,7 @@ if(TNG_INTEGER_BIG_ENDIAN)
   set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS TNG_INTEGER_BIG_ENDIAN)
 endif()
 
-if(ZLIB_FOUND)
+if(TNG_BUILD_WITH_ZLIB)
   set_property(TARGET tng_io APPEND PROPERTY COMPILE_DEFINITIONS USE_ZLIB)
   target_link_libraries(tng_io tng_compress ${ZLIB_LIBRARIES})
 else()

diff --git a/src/external/tng_io/src/lib/tng_io.c b/src/external/tng_io/src/lib/tng_io.c
index b51796adbc133c23c334bdfea90f1833b386778e..efcaaabea07076b444ca15a998f5f66ac5a93051 100644 (file)
--- a/src/external/tng_io/src/lib/tng_io.c
+++ b/src/external/tng_io/src/lib/tng_io.c
@@ -16517,7 +16517,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_particle_data_next_frame_read
                  double *retrieved_time)
 {
     tng_trajectory_frame_set_t frame_set;
-    tng_particle_data_t data;
+    tng_particle_data_t data = 0;
     tng_function_status stat;
     int size;
     int64_t i, data_size, n_particles;
@@ -16670,7 +16670,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_non_particle_data_next_frame_read
                  double *retrieved_time)
 {
     tng_trajectory_frame_set_t frame_set;
-    tng_non_particle_data_t data;
+    tng_non_particle_data_t data = 0;
     tng_function_status stat;
     int size;
     int64_t i, data_size;
@@ -17359,7 +17359,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_write
     tng_trajectory_frame_set_t frame_set;
     tng_particle_data_t p_data;
     tng_non_particle_data_t np_data;
-    int64_t n_particles, n_frames, stride_length = 100, frame_pos;
+    int64_t n_particles = 0, n_frames, stride_length = 100, frame_pos;
     int64_t last_frame;
     int is_first_frame_flag = 0;
     char block_type_flag;
@@ -17573,7 +17573,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_generic_double_write
     tng_trajectory_frame_set_t frame_set;
     tng_particle_data_t p_data;
     tng_non_particle_data_t np_data;
-    int64_t n_particles, n_frames, stride_length = 100, frame_pos;
+    int64_t n_particles = 0, n_frames, stride_length = 100, frame_pos;
     int64_t last_frame;
     int is_first_frame_flag = 0;
     char block_type_flag;
@@ -18149,8 +18149,8 @@ tng_function_status DECLSPECDLLEXPORT tng_util_frame_current_compression_get
                  float *factor)
 {
     tng_trajectory_frame_set_t frame_set;
-    tng_particle_data_t p_data;
-    tng_non_particle_data_t np_data;
+    tng_particle_data_t p_data = 0;
+    tng_non_particle_data_t np_data = 0;
     tng_function_status stat;
     int64_t i;
     int block_type = -1;