From c7faaba20cc6c330f70365c74b9d4cc556c9a827 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 22 Nov 2022 12:34:34 +0100
Subject: [PATCH] Rename to `test_write_null.f90`
Rename file `test_write_eddy.f90` to `test_write_null.f90`. The name
was badly chosen because the program is not a unit test of procedure
`write_eddy`. In fact, it does not even call `write_eddy`.
---
CMakeLists.txt | 10 ++---
Common/CMakeLists.txt | 2 +-
Inst_eddies/CMakeLists.txt | 2 +-
Inst_eddies/Tests/test_output.json | 48 +++++++++++-----------
test_write_eddy.f90 => test_write_null.f90 | 0
5 files changed, 31 insertions(+), 31 deletions(-)
rename test_write_eddy.f90 => test_write_null.f90 (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dfa4f8de..6fecda29 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,13 +30,13 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
endif()
endif()
-# test_write_eddy
-add_executable(test_write_eddy test_write_eddy.f90)
-target_link_libraries(test_write_eddy PRIVATE Shapelib_03::shapelib_03
+# test_write_null
+add_executable(test_write_null test_write_null.f90)
+target_link_libraries(test_write_null PRIVATE Shapelib_03::shapelib_03
Contour_531::contour_531 Jumble::jumble)
-set_target_properties(test_write_eddy PROPERTIES Fortran_MODULE_DIRECTORY
+set_target_properties(test_write_null PROPERTIES Fortran_MODULE_DIRECTORY
${CMAKE_CURRENT_BINARY_DIR}/${my_target}_modules)
-target_include_directories(test_write_eddy PRIVATE
+target_include_directories(test_write_null PRIVATE
${CMAKE_CURRENT_BINARY_DIR}/${my_target}_modules)
add_subdirectory(Inst_eddies)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 9971726e..1cb30051 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -13,7 +13,7 @@ target_sources(test_spher_polyline_area PRIVATE spher_polyline_area.f90)
target_sources(inst_eddies PRIVATE spher_polyline_area.f90
derived_types.f90 shpc_close.f90 shpc_open.f90
get_slice_dir.f90 read_field_indices.f90)
-target_sources(test_write_eddy PRIVATE derived_types.f90 shpc_open.f90
+target_sources(test_write_null PRIVATE derived_types.f90 shpc_open.f90
shpc_close.f90 read_field_indices.f90 get_slice_dir.f90)
if(MPI_Fortran_HAVE_F08_MODULE)
diff --git a/Inst_eddies/CMakeLists.txt b/Inst_eddies/CMakeLists.txt
index 8ef85e08..d3808689 100644
--- a/Inst_eddies/CMakeLists.txt
+++ b/Inst_eddies/CMakeLists.txt
@@ -35,4 +35,4 @@ target_sources(test_local_extrema PRIVATE local_extrema.f90)
target_sources(test_set_max_speed PRIVATE set_max_speed.f90 good_contour.f90
max_speed_contour_ssh.f90 mean_speed.f90 inside_4.f90 get_var.f90 config.f90
input_ssh.f90 shpc_create.f90 ccw_orient.f90 write_eddy.f90)
-target_sources(test_write_eddy PRIVATE shpc_create.f90)
+target_sources(test_write_null PRIVATE shpc_create.f90)
diff --git a/Inst_eddies/Tests/test_output.json b/Inst_eddies/Tests/test_output.json
index 591b771a..f8517bcb 100644
--- a/Inst_eddies/Tests/test_output.json
+++ b/Inst_eddies/Tests/test_output.json
@@ -3,38 +3,38 @@
"title": "Medium_mix",
"description": "Append to medium-sized SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": [["$PWD/n_dates_14", "SHPC"]],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Small_mix",
"description": "Append to small SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": [["$PWD/n_dates_1", "SHPC"]],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Medium_sep",
"description": "Append to medium-sized SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": [["$PWD/n_dates_14", "SHPC"]],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Small_sep",
"description": "Append to small SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": [["$PWD/n_dates_1", "SHPC"]],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Create_mix",
@@ -43,10 +43,10 @@
"commands" :
[
["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"]
+ ["time", "$build_dir/Inst_eddies/Tests/test_write_null"]
],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Create_sep",
@@ -55,27 +55,27 @@
"commands" :
[
["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"]
+ ["time", "$build_dir/Inst_eddies/Tests/test_write_null"]
],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Big_mix",
"description": "Append to big SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": ["$PWD/Inst_eddies_9/SHPC"],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
},
{
"title": "Big_sep",
"description": "Append to big SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_eddy"],
+ "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
"copy": ["$PWD/Inst_eddies_9/SHPC"],
- "stdout": "test_write_eddy_stdout.txt",
- "exclude_cmp": ["test_write_eddy_stderr.txt"]
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": ["test_write_null_stderr.txt"]
}
]
diff --git a/test_write_eddy.f90 b/test_write_null.f90
similarity index 100%
rename from test_write_eddy.f90
rename to test_write_null.f90
--
GitLab