summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRossen Apostolov <rossen@kth.se>2014-02-04 10:33:30 (GMT)
committerRossen Apostolov <rossen@kth.se>2014-02-04 10:33:30 (GMT)
commitec9b4bd58443f295c878c5a7bf3266eb8d9a6da0 (patch)
tree5447cb539dca119f9af5b2c0888abc64d64b598e
parent60c9ea8a5f34f89b5aca3a48e5cd27351d51d610 (diff)
Cleaned up unused and non-portable /tmp invocations.
-rw-r--r--src/tests/md_openmp.c4
-rw-r--r--src/tests/md_openmp.f2
-rw-r--r--src/tests/md_openmp_util.c4
-rw-r--r--src/tests/tng_io_testing.c18
4 files changed, 2 insertions, 26 deletions
diff --git a/src/tests/md_openmp.c b/src/tests/md_openmp.c
index 449810d..b57eff4 100644
--- a/src/tests/md_openmp.c
+++ b/src/tests/md_openmp.c
@@ -127,11 +127,7 @@ int main ()
printf(" Cannot init trajectory.\n");
exit(1);
}
-#ifdef TNG_EXAMPLE_FILES_DIR
tng_output_file_set(traj, TNG_EXAMPLE_FILES_DIR "tng_md_out.tng");
-#else
- tng_output_file_set(traj, "/tmp/tng_md_out.tng");
-#endif
diff --git a/src/tests/md_openmp.f b/src/tests/md_openmp.f
index de05ca2..87b00b8 100644
--- a/src/tests/md_openmp.f
+++ b/src/tests/md_openmp.f
@@ -161,7 +161,7 @@ c
c
c N.B. The TNG output file should be modified according to needs
c
- call tng_output_file_set(traj, "/tmp/tng_md_out_f77.tng")
+ call tng_output_file_set(traj, TNG_EXAMPLE_FILES_DIR "tng_md_out_f77.tng")
write ( *, '(a)' ) ' Creating molecules in trajectory.'
tng_n_particles = np
diff --git a/src/tests/md_openmp_util.c b/src/tests/md_openmp_util.c
index 006d292..34b8964 100644
--- a/src/tests/md_openmp_util.c
+++ b/src/tests/md_openmp_util.c
@@ -120,11 +120,7 @@ int main ()
printf("\n");
printf(" Initializing trajectory storage.\n");
/* Initialize the TNG trajectory */
-#ifdef TNG_EXAMPLE_FILES_DIR
tng_util_trajectory_open(TNG_EXAMPLE_FILES_DIR "tng_md_out.tng", 'w', &traj);
-#else
- tng_util_trajectory_open("/tmp/tng_md_out.tng", 'w', &traj);
-#endif
diff --git a/src/tests/tng_io_testing.c b/src/tests/tng_io_testing.c
index 8d8a68a..973ac4f 100644
--- a/src/tests/tng_io_testing.c
+++ b/src/tests/tng_io_testing.c
@@ -474,11 +474,7 @@ static tng_function_status tng_test_write_and_read_traj(tng_trajectory_t *traj)
tng_trajectory_destroy(traj);
tng_trajectory_init(traj);
-#ifdef TNG_EXAMPLE_FILES_DIR
tng_input_file_set(*traj, TNG_EXAMPLE_FILES_DIR "tng_test.tng");
-#else
- tng_input_file_set(*traj, "/tmp/tng_test.tng");
-#endif
stat = tng_file_headers_read(*traj, TNG_SKIP_HASH);
@@ -592,13 +588,8 @@ int main()
printf("Creation time: %s\n", time_str);
-#ifdef TNG_EXAMPLE_FILES_DIR
tng_input_file_set(traj, TNG_EXAMPLE_FILES_DIR "tng_example.tng");
tng_output_file_set(traj, TNG_EXAMPLE_FILES_DIR "tng_example_out.tng");
-#else
- tng_input_file_set(traj, "tng_example.tng");
- tng_output_file_set(traj, "/tmp/tng_example_out.tng");
-#endif
if(tng_test_read_and_write_file(traj) == TNG_CRITICAL)
@@ -633,11 +624,7 @@ int main()
}
-#ifdef TNG_EXAMPLE_FILES_DIR
tng_output_file_set(traj, TNG_EXAMPLE_FILES_DIR "tng_test.tng");
-#else
- tng_output_file_set(traj, "/tmp/tng_test.tng");
-#endif
if(tng_test_write_and_read_traj(&traj) == TNG_CRITICAL)
{
@@ -671,11 +658,8 @@ int main()
}
-#ifdef TNG_EXAMPLE_FILES_DIR
stat = tng_util_trajectory_open(TNG_EXAMPLE_FILES_DIR "tng_test.tng", 'r', &traj);
-#else
- stat = tng_util_trajectory_open("/tmp/tng_test.tng", 'r', &traj);
-#endif
+
if(stat != TNG_SUCCESS)
{
printf("Test Utility function open:\t\t\tFailed. %s: %d.\n",
contact: Jan Huwald // Impressum