summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--BuildTNG.cmake71
-rw-r--r--CMakeLists.txt49
-rw-r--r--Doxyfile.in2
-rw-r--r--include/tng/md5.h (renamed from include/md5.h)0
-rw-r--r--include/tng/tng_io.h (renamed from include/tng_io.h)73
-rw-r--r--include/tng/tng_io.hpp (renamed from include/tng_io.hpp)0
-rw-r--r--include/tng/tng_io_fwd.h (renamed from include/tng_io_fwd.h)0
-rw-r--r--include/tng/version.h.in16
-rw-r--r--include/version.h.in7
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/compression/CMakeLists.txt15
-rw-r--r--src/lib/CMakeLists.txt37
-rw-r--r--src/lib/md5.c2
-rw-r--r--src/lib/tng_io-config.cmake.in13
-rw-r--r--src/lib/tng_io-configVersion.cmake.in12
-rw-r--r--src/lib/tng_io.c60
-rw-r--r--src/tests/compression/CMakeLists.txt6
-rw-r--r--src/tests/compression/testsuite.c2
-rw-r--r--src/tests/md_openmp.c12
-rw-r--r--src/tests/md_openmp_util.c12
-rw-r--r--src/tests/tng_io_read_pos.c2
-rw-r--r--src/tests/tng_io_read_pos_util.c2
-rw-r--r--src/tests/tng_io_testing.c14
-rw-r--r--src/tests/tng_parallel_read.c2
24 files changed, 308 insertions, 103 deletions
diff --git a/BuildTNG.cmake b/BuildTNG.cmake
new file mode 100644
index 0000000..f4f2caf
--- /dev/null
+++ b/BuildTNG.cmake
@@ -0,0 +1,71 @@
+set(TNG_ROOT_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR})
+file(RELATIVE_PATH TNG_ROOT_BINARY_DIR ${CMAKE_SOURCE_DIR} ${TNG_ROOT_SOURCE_DIR})
+set(TNG_ROOT_BINARY_DIR ${CMAKE_BINARY_DIR}/${TNG_ROOT_BINARY_DIR})
+
+function (TNG_GENERATE_VERSION_H)
+ set(TNG_MAJOR_VERSION "1")
+ set(TNG_MINOR_VERSION "6")
+ set(TNG_VERSION_PATCH_LEVEL "0")
+ set(TNG_IO_VERSION "${TNG_MAJOR_VERSION}.${TNG_MINOR_VERSION}.${TNG_VERSION_PATCH_LEVEL}")
+ set(TNG_API_VERSION "6")
+ configure_file(${TNG_ROOT_SOURCE_DIR}/include/tng/version.h.in
+ ${TNG_ROOT_BINARY_DIR}/include/tng/version.h)
+
+ set(TNG_MAJOR_VERSION ${TNG_MAJOR_VERSION} PARENT_SCOPE)
+ set(TNG_IO_VERSION ${TNG_IO_VERSION} PARENT_SCOPE)
+endfunction()
+
+tng_generate_version_h()
+
+include(TestBigEndian)
+test_big_endian(TNG_INTEGER_BIG_ENDIAN)
+include(CheckIncludeFile)
+check_include_file(inttypes.h TNG_HAVE_INTTYPES_H)
+
+macro(TNG_GET_SOURCE_LIST TNG_SOURCELIST TNG_COMPILEDEFS)
+ include_directories(${TNG_ROOT_SOURCE_DIR}/include)
+ include_directories(${TNG_ROOT_BINARY_DIR}/include)
+ set(_tng_compression_sources bwlzh.c bwt.c coder.c dict.c fixpoint.c huffman.c huffmem.c lz77.c merge_sort.c mtf.c rle.c tng_compress.c vals16.c warnmalloc.c widemuldiv.c xtc2.c xtc3.c)
+ set(_tng_io_sources tng_io.c md5.c)
+ set(${TNG_SOURCELIST})
+ set(${TNG_COMPILEDEFS})
+ foreach(_file ${_tng_compression_sources})
+ list(APPEND ${TNG_SOURCELIST} ${TNG_ROOT_SOURCE_DIR}/src/compression/${_file})
+ endforeach()
+ foreach(_file ${_tng_io_sources})
+ list(APPEND ${TNG_SOURCELIST} ${TNG_ROOT_SOURCE_DIR}/src/lib/${_file})
+ endforeach()
+ if(TNG_BUILD_FORTRAN)
+ list(APPEND ${TNG_SOURCELIST} ${TNG_ROOT_SOURCE_DIR}/src/lib/tng_io_fortran.c)
+ endif()
+ if (TNG_HAVE_INTTYPES_H)
+ list(APPEND ${TNG_COMPILEDEFS} USE_STD_INTTYPES_H)
+ endif()
+endmacro()
+
+macro(TNG_SET_SOURCE_PROPERTIES)
+ set(_tng_with_zlib OFF)
+ set(_curr_var)
+ foreach (_arg ${ARGN})
+ if (_arg STREQUAL "WITH_ZLIB")
+ set(_curr_var with_zlib)
+ elseif (_curr_var)
+ set(_tng_${_curr_var} ${_arg})
+ set(_curr_var "")
+ else()
+ message(FATAL_ERROR "Invalid argument ${_arg} to TNG_SET_SOURCE_PROPERTIES")
+ endif()
+ endforeach()
+ if (_tng_with_zlib)
+ set_property(SOURCE ${TNG_ROOT_SOURCE_DIR}/src/lib/tng_io.c
+ APPEND PROPERTY COMPILE_DEFINITIONS USE_ZLIB)
+ endif()
+ if (TNG_HAVE_INTTYPES_H)
+ set_property(SOURCE ${TNG_ROOT_SOURCE_DIR}/src/lib/tng_io.c
+ APPEND PROPERTY COMPILE_DEFINITIONS USE_STD_INTTYPES_H)
+ endif()
+ if (TNG_INTEGER_BIG_ENDIAN)
+ set_property(SOURCE ${TNG_ROOT_SOURCE_DIR}/src/lib/md5.c
+ APPEND PROPERTY COMPILE_DEFINITIONS TNG_INTEGER_BIG_ENDIAN)
+ endif()
+endmacro()
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 871d17e..7fc6ad6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,7 @@
cmake_minimum_required(VERSION 2.8.8)
project(TNG_IO)
-set(PROJECT_VERSION "1.5")
-set(API_VERSION "5")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/version.h.in
- ${CMAKE_BINARY_DIR}/include/version.h )
-include_directories(${CMAKE_BINARY_DIR}/include)
if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall")
@@ -31,9 +26,47 @@ option(TNG_BUILD_WITH_ZLIB "Build TNG with zlib compression" ${ZLIB_FOUND})
include(CheckIncludeFile)
check_include_file(inttypes.h HAVE_INTTYPES_H)
-add_subdirectory(src)
+include(BuildTNG.cmake)
+tng_get_source_list(TNG_SOURCES TNG_COMPILE_DEFS)
+
+tng_set_source_properties(WITH_ZLIB ${ZLIB_FOUND})
+
+if (ZLIB_FOUND)
+ list(APPEND EXTRA_LIBRARIES ${ZLIB_LIBRARIES})
+endif()
+
+if (UNIX)
+ list(APPEND EXTRA_LIBRARIES m)
+endif()
+
+add_library(tng_io ${TNG_SOURCES})
+
+target_link_libraries(tng_io ${EXTRA_LIBRARIES})
-install(FILES include/tng_io.h include/tng_io_fwd.h DESTINATION include/)
+set_target_properties(tng_io PROPERTIES VERSION ${TNG_IO_VERSION} SOVERSION ${TNG_MAJOR_VERSION})
+
+# Create the tng_ioConfig.cmake and tng_ioConfigVersion.cmake files for the install tree
+set(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
+configure_file( src/lib/tng_io-config.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake/tng_io-config.cmake" @ONLY)
+configure_file( src/lib/tng_io-configVersion.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake/tng_io-configVersion.cmake" @ONLY)
+
+# Use GNUInstallDirst to set paths on multiarch systems
+include(GNUInstallDirs)
+
+# Install the tng_ioConfig.cmake and tng_ioConfigVersion.cmake
+install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake/tng_io-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/cmake/tng_io-configVersion.cmake"
+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/tng_io")
+
+install(TARGETS tng_io
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+install(FILES include/tng/tng_io.h include/tng/tng_io_fwd.h ${CMAKE_CURRENT_BINARY_DIR}/include/tng/version.h
+ DESTINATION include/tng)
#-- Add an Option to toggle the generation of the API documentation
option(TNG_BUILD_DOCUMENTATION "Use Doxygen to create the HTML based API documentation" OFF)
@@ -57,3 +90,5 @@ if(TNG_BUILD_DOCUMENTATION)
DESTINATION share/tng/doc)
endif()
+add_subdirectory(src)
+
diff --git a/Doxyfile.in b/Doxyfile.in
index 3d6f0f7..03ba553 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -658,7 +658,7 @@ RECURSIVE = NO
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = @PROJECT_SOURCE_DIR@/src/lib/md5.c @PROJECT_SOURCE_DIR@/include/md5.h @PROJECT_SOURCE_DIR@/include/tng_io.hpp @PROJECT_SOURCE_DIR@/src/lib/tng_io.c
+EXCLUDE = @PROJECT_SOURCE_DIR@/src/lib/md5.c @PROJECT_SOURCE_DIR@/include/tng/md5.h @PROJECT_SOURCE_DIR@/include/tng/tng_io.hpp @PROJECT_SOURCE_DIR@/src/lib/tng_io.c
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/include/md5.h b/include/tng/md5.h
index 80fbf6c..80fbf6c 100644
--- a/include/md5.h
+++ b/include/tng/md5.h
diff --git a/include/tng_io.h b/include/tng/tng_io.h
index 5b89cd6..42119a5 100644
--- a/include/tng_io.h
+++ b/include/tng/tng_io.h
@@ -21,9 +21,9 @@
* Each block can contain MD5 hashes to verify data integrity and the file
* can be signed by the user to ensure that the origin is correct.
*
- * This is version 1.4 of the TNG API. The intention is that this version of
- * the API and ABI should be stable, but it is still possible that future
- * changes might make that impossible, in which case that will be clarified.
+ * The intention is that the API and ABI should be stable, but it is
+ * still possible that future changes might make that impossible, in which
+ * case that will be clarified.
*
* The API and all examples are released without any warranties. Use them at
* your own risk.
@@ -76,6 +76,16 @@
*
* Revisions
*
+ * v. 1.6 - Fourth stable release of the API.
+ *
+ * - Removed OpenMP option when building.
+ * - Functionality for migrating data blocks.
+ * - Improved handling of molecules.
+ * - Improved installation of TNG documentation.
+ * - Enhancements to CMake usage.
+ * - Required CMake version raised to 2.8.8.
+ * - Bugs fixed.
+ *
* v. 1.5 - Third stable release of the API.
*
* - Fortran wrapper split into separate file
@@ -173,7 +183,7 @@
* \code
* #include <stdlib.h>
* #include <stdio.h>
- * #include "tng_io.h"
+ * #include "tng/tng_io.h"
*
* int main(int argc, char **argv)
* {
@@ -531,6 +541,59 @@ extern "C"
*/
/**
+ * @brief Get the major version of the TNG library.
+ * @param tng_data is a trajectory data container, it does not have
+ * to be initialized beforehand.
+ * @param version is pointing to a value set to the major version of
+ * the library.
+ * @return TNG_SUCCESS (0) if successful.
+ */
+tng_function_status DECLSPECDLLEXPORT tng_version_major
+ (const tng_trajectory_t tng_data,
+ int *version);
+
+/**
+ * @brief Get the minor version of the TNG library.
+ * @param tng_data is a trajectory data container, it does not have
+ * to be initialized beforehand.
+ * @param version is pointing to a value set to the minor version of
+ * the library.
+ * @return TNG_SUCCESS (0) if successful.
+ */
+tng_function_status DECLSPECDLLEXPORT tng_version_minor
+ (const tng_trajectory_t tng_data,
+ int *version);
+
+/**
+ * @brief Get the patch level of the TNG library.
+ * @param tng_data is a trajectory data container, it does not have
+ * to be initialized beforehand.
+ * @param patch_level is the string to fill with the full version,
+ * memory must be allocated before.
+ * @return TNG_SUCCESS (0) if successful.
+ */
+tng_function_status DECLSPECDLLEXPORT tng_version_patchlevel
+ (const tng_trajectory_t tng_data,
+ int *patch_level);
+
+/**
+ * @brief Get the full version string of the TNG library.
+ * @param tng_data is a trajectory data container, it does not have
+ * to be initialized beforehand.
+ * @param version is pointing to a value set to the major version of
+ * the library.
+ * @param max_len maximum char length of the string, i.e. how much memory has
+ * been reserved for version. This includes \0 terminating character.
+ * @pre \code version != 0 \endcode The pointer to the name string
+ * must not be a NULL pointer.
+ * @return TNG_SUCCESS (0) if successful.
+ */
+tng_function_status DECLSPECDLLEXPORT tng_version
+ (const tng_trajectory_t tng_data,
+ char *version,
+ const int max_len);
+
+/**
* @brief Setup a trajectory data container.
* @param tng_data_p a pointer to memory to initialise as a trajectory.
* @pre tng_data_p must not be pointing at a reserved memory block.
@@ -4677,7 +4740,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_frame_current_compression_get
(tng_trajectory_t tng_data,
const int64_t block_id,
int64_t *codec_id,
- float *factor);
+ double *factor);
/** @brief High-level function for determining the next frame with data and what
* data blocks have data for that frame. The search can be limited to certain
diff --git a/include/tng_io.hpp b/include/tng/tng_io.hpp
index 12172e5..12172e5 100644
--- a/include/tng_io.hpp
+++ b/include/tng/tng_io.hpp
diff --git a/include/tng_io_fwd.h b/include/tng/tng_io_fwd.h
index 8b63a9a..8b63a9a 100644
--- a/include/tng_io_fwd.h
+++ b/include/tng/tng_io_fwd.h
diff --git a/include/tng/version.h.in b/include/tng/version.h.in
new file mode 100644
index 0000000..662e68f
--- /dev/null
+++ b/include/tng/version.h.in
@@ -0,0 +1,16 @@
+#ifndef VERSION_CONFIG_H
+#define VERSION_CONFIG_H
+
+/* define the API version (integer) */
+#define TNG_API_VERSION @TNG_API_VERSION@
+
+/* define the major and minor versions
+ of the library */
+#define TNG_VERSION_MAJOR @TNG_MAJOR_VERSION@
+#define TNG_VERSION_MINOR @TNG_MINOR_VERSION@
+/* define the patchlevel of the library */
+#define TNG_VERSION_PATCHLEVEL @TNG_VERSION_PATCH_LEVEL@
+/* define the full version of the library (string) */
+#define TNG_VERSION "@TNG_IO_VERSION@"
+
+#endif
diff --git a/include/version.h.in b/include/version.h.in
deleted file mode 100644
index 840e454..0000000
--- a/include/version.h.in
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef VERSION_CONFIG_H
-#define VERSION_CONFIG_H
-
-/* define the API version */
-#define TNG_API_VERSION @API_VERSION@
-
-#endif
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d5f2bc0..88c0516 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1 @@
-add_subdirectory(compression)
-add_subdirectory(lib)
add_subdirectory(tests)
diff --git a/src/compression/CMakeLists.txt b/src/compression/CMakeLists.txt
deleted file mode 100644
index 8bb0220..0000000
--- a/src/compression/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(source_files bwlzh.c bwt.c coder.c dict.c fixpoint.c huffman.c huffmem.c lz77.c merge_sort.c mtf.c rle.c tng_compress.c vals16.c warnmalloc.c widemuldiv.c xtc2.c xtc3.c)
-
-add_library(tng_compress ${source_files})
-
-# Append the required library dependencies
-if(UNIX)
- target_link_libraries(tng_compress m)
-endif()
-
-# Use GNUInstallDirst to set paths on multiarch systems
-include(GNUInstallDirs)
-
-install(TARGETS tng_compress
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
deleted file mode 100644
index 838f827..0000000
--- a/src/lib/CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-set(source_files tng_io.c md5.c)
-if(TNG_BUILD_FORTRAN)
- list(APPEND source_files tng_io_fortran.c)
-endif()
-
-add_library(tng_io ${source_files})
-
-# Now add source-file compilation properties to the source-file
-# targets
-
-if(HAVE_INTTYPES_H)
- set_property(SOURCE tng_io.c APPEND PROPERTY COMPILE_DEFINITIONS USE_STD_INTTYPES_H)
-endif()
-if(TNG_BUILD_WITH_ZLIB)
- set_property(SOURCE tng_io.c APPEND PROPERTY COMPILE_DEFINITIONS USE_ZLIB)
-endif()
-
-# This test is for md5. The TNG library itself determines the actual byte order -
-# not just if it is small or big endian.
-include(TestBigEndian)
-test_big_endian(TNG_INTEGER_BIG_ENDIAN)
-if(TNG_INTEGER_BIG_ENDIAN)
- set_property(SOURCE md5.c APPEND PROPERTY COMPILE_DEFINITIONS TNG_INTEGER_BIG_ENDIAN)
-endif()
-
-# Append the required library dependencies
-target_link_libraries(tng_io tng_compress)
-if(TNG_BUILD_WITH_ZLIB)
- target_link_libraries(tng_io ${ZLIB_LIBRARIES})
-endif()
-
-# Use GNUInstallDirst to set paths on multiarch systems
-include(GNUInstallDirs)
-
-install(TARGETS tng_io
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/src/lib/md5.c b/src/lib/md5.c
index ea8bb37..f6a2391 100644
--- a/src/lib/md5.c
+++ b/src/lib/md5.c
@@ -75,7 +75,7 @@
1999-05-03 lpd Original version.
*/
-#include "../../include/md5.h"
+#include "tng/md5.h"
#include <string.h>
#undef BYTE_ORDER /* 1 = big-endian, -1 = little-endian, 0 = unknown */
diff --git a/src/lib/tng_io-config.cmake.in b/src/lib/tng_io-config.cmake.in
new file mode 100644
index 0000000..06c0470
--- /dev/null
+++ b/src/lib/tng_io-config.cmake.in
@@ -0,0 +1,13 @@
+# - Config file for the TNG_IO package
+# It defines the following variables
+# TNG_IO_INCLUDE_DIRS - include directories for TNG_IO
+# TNG_IO_LIBRARIES - libraries to link against
+# TNG_IO_DEFINITIONS - definitions used when compiling
+
+# Compute paths
+get_filename_component(TNG_IO_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+set(TNG_IO_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
+set(TNG_IO_DEFINITIONS "@TNG_COMPILE_DEFS@")
+
+set(TNG_IO_LIBRARIES tng_io)
+
diff --git a/src/lib/tng_io-configVersion.cmake.in b/src/lib/tng_io-configVersion.cmake.in
new file mode 100644
index 0000000..8946f5e
--- /dev/null
+++ b/src/lib/tng_io-configVersion.cmake.in
@@ -0,0 +1,12 @@
+set(PACKAGE_VERSION "@TNG_IO_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
+
diff --git a/src/lib/tng_io.c b/src/lib/tng_io.c
index 252cbb2..792be2e 100644
--- a/src/lib/tng_io.c
+++ b/src/lib/tng_io.c
@@ -22,10 +22,10 @@
#include <zlib.h>
#endif
-#include "../../include/tng_io.h"
-#include "../../include/md5.h"
-#include "../../include/compression/tng_compress.h"
-#include "../include/version.h"
+#include "tng/tng_io.h"
+#include "tng/md5.h"
+#include "compression/tng_compress.h"
+#include "tng/version.h"
struct tng_bond {
@@ -7852,6 +7852,52 @@ static tng_function_status tng_atom_destroy(tng_atom_t atom)
return(TNG_SUCCESS);
}
+tng_function_status DECLSPECDLLEXPORT tng_version_major
+ (const tng_trajectory_t tng_data,
+ int *version)
+{
+ (void)tng_data;
+
+ *version = TNG_VERSION_MAJOR;
+
+ return(TNG_SUCCESS);
+}
+
+tng_function_status DECLSPECDLLEXPORT tng_version_minor
+ (const tng_trajectory_t tng_data,
+ int *version)
+{
+ (void)tng_data;
+
+ *version = TNG_VERSION_MINOR;
+
+ return(TNG_SUCCESS);
+}
+
+tng_function_status DECLSPECDLLEXPORT tng_version_patchlevel
+ (const tng_trajectory_t tng_data,
+ int *patch_level)
+{
+ (void)tng_data;
+
+ *patch_level = TNG_VERSION_PATCHLEVEL;
+
+ return(TNG_SUCCESS);
+}
+
+tng_function_status DECLSPECDLLEXPORT tng_version
+ (const tng_trajectory_t tng_data,
+ char *version,
+ const int max_len)
+{
+ (void)tng_data;
+ TNG_ASSERT(version, "TNG library: version must not be a NULL pointer");
+
+ TNG_SNPRINTF(version, max_len, "%s", TNG_VERSION);
+
+ return(TNG_SUCCESS);
+}
+
tng_function_status DECLSPECDLLEXPORT tng_molecule_add
(tng_trajectory_t tng_data,
const char *name,
@@ -18889,7 +18935,7 @@ tng_function_status DECLSPECDLLEXPORT tng_util_frame_current_compression_get
(tng_trajectory_t tng_data,
const int64_t block_id,
int64_t *codec_id,
- float *factor)
+ double *factor)
{
tng_trajectory_frame_set_t frame_set;
tng_particle_data_t p_data = 0;
@@ -18986,12 +19032,12 @@ tng_function_status DECLSPECDLLEXPORT tng_util_frame_current_compression_get
if(block_type == TNG_PARTICLE_BLOCK_DATA)
{
*codec_id = p_data->codec_id;
- *factor = (float)p_data->compression_multiplier;
+ *factor = p_data->compression_multiplier;
}
else if(block_type == TNG_NON_PARTICLE_BLOCK_DATA)
{
*codec_id = np_data->codec_id;
- *factor = (float)np_data->compression_multiplier;
+ *factor = np_data->compression_multiplier;
}
return(TNG_SUCCESS);
}
diff --git a/src/tests/compression/CMakeLists.txt b/src/tests/compression/CMakeLists.txt
index 075b06b..d29791b 100644
--- a/src/tests/compression/CMakeLists.txt
+++ b/src/tests/compression/CMakeLists.txt
@@ -4,8 +4,6 @@ add_definitions(-DTNG_COMPRESS_FILES_DIR="${CMAKE_BINARY_DIR}/test_tng_compress_
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/test_tng_compress_files)
-include_directories(${CMAKE_BINARY_DIR}/include/)
-
set(number 0)
set(numtests 78)
@@ -14,7 +12,7 @@ while( number LESS ${numtests})
math( EXPR number "${number} + 1" )
add_executable(test_tng_compress_gen${number} testsuite.c)
-target_link_libraries(test_tng_compress_gen${number} tng_compress)
+target_link_libraries(test_tng_compress_gen${number} tng_io)
if(UNIX)
target_link_libraries(test_tng_compress_gen${number} m)
endif()
@@ -25,7 +23,7 @@ add_dependencies(test_tng_compress_gen${number} test${number}.h)
set_property(TARGET test_tng_compress_gen${number} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/compression_tests)
add_executable(test_tng_compress_read${number} testsuite.c)
-target_link_libraries(test_tng_compress_read${number} tng_compress)
+target_link_libraries(test_tng_compress_read${number} tng_io)
if(UNIX)
target_link_libraries(test_tng_compress_read${number} m)
endif()
diff --git a/src/tests/compression/testsuite.c b/src/tests/compression/testsuite.c
index 2cfe05e..e266c11 100644
--- a/src/tests/compression/testsuite.c
+++ b/src/tests/compression/testsuite.c
@@ -8,7 +8,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include "../../../include/compression/tng_compress.h"
+#include "compression/tng_compress.h"
#include TESTPARAM
#ifdef TEST_FLOAT
diff --git a/src/tests/md_openmp.c b/src/tests/md_openmp.c
index fd9f4b0..aac8b3b 100644
--- a/src/tests/md_openmp.c
+++ b/src/tests/md_openmp.c
@@ -1,11 +1,11 @@
#ifdef TNG_BUILD_OPENMP_EXAMPLES
-# include <stdlib.h>
-# include <stdio.h>
-# include <time.h>
-# include <math.h>
-# include <omp.h>
-#include "../../include/tng_io.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+#include <omp.h>
+#include "tng/tng_io.h"
int main ();
void compute ( int np, int nd, double pos[], double vel[],
diff --git a/src/tests/md_openmp_util.c b/src/tests/md_openmp_util.c
index 8c332f3..9fe6c91 100644
--- a/src/tests/md_openmp_util.c
+++ b/src/tests/md_openmp_util.c
@@ -1,11 +1,11 @@
#ifdef TNG_BUILD_OPENMP_EXAMPLES
-# include <stdlib.h>
-# include <stdio.h>
-# include <time.h>
-# include <math.h>
-# include <omp.h>
-#include "../../include/tng_io.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include <math.h>
+#include <omp.h>
+#include "tng/tng_io.h"
int main ();
void compute ( int np, int nd, float pos[], float vel[],
diff --git a/src/tests/tng_io_read_pos.c b/src/tests/tng_io_read_pos.c
index 2a0bb09..b29cec7 100644
--- a/src/tests/tng_io_read_pos.c
+++ b/src/tests/tng_io_read_pos.c
@@ -15,7 +15,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
int main(int argc, char **argv)
{
diff --git a/src/tests/tng_io_read_pos_util.c b/src/tests/tng_io_read_pos_util.c
index 1667bae..b237dad 100644
--- a/src/tests/tng_io_read_pos_util.c
+++ b/src/tests/tng_io_read_pos_util.c
@@ -17,7 +17,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
int main(int argc, char **argv)
{
diff --git a/src/tests/tng_io_testing.c b/src/tests/tng_io_testing.c
index dd13d92..e1e2726 100644
--- a/src/tests/tng_io_testing.c
+++ b/src/tests/tng_io_testing.c
@@ -15,7 +15,8 @@
#include <stdlib.h>
#include <string.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
+#include "tng/version.h"
static tng_function_status tng_test_setup_molecules(tng_trajectory_t traj)
{
@@ -595,6 +596,17 @@ int main()
tng_trajectory_t traj;
tng_function_status stat;
char time_str[TNG_MAX_DATE_STR_LEN];
+ char version_str[TNG_MAX_STR_LEN];
+
+ tng_version(traj, version_str, TNG_MAX_STR_LEN);
+ if(strncmp(TNG_VERSION, version_str, TNG_MAX_STR_LEN) == 0)
+ {
+ printf("Test version control: \t\t\t\tSucceeded.\n");
+ }
+ else
+ {
+ printf("Test version control: \t\t\t\tFailed.\n");
+ }
if(tng_trajectory_init(&traj) != TNG_SUCCESS)
{
diff --git a/src/tests/tng_parallel_read.c b/src/tests/tng_parallel_read.c
index e2e23c6..44e8f79 100644
--- a/src/tests/tng_parallel_read.c
+++ b/src/tests/tng_parallel_read.c
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "../../include/tng_io.h"
+#include "tng/tng_io.h"
/* N.B. this code is for testing parallel reading of trajectory frame sets. The
contact: Jan Huwald // Impressum