diff --git a/Inst_eddies/Tests/Input/Region_1/h.nc b/Inst_eddies/Tests/Input/Region_1/h.nc
deleted file mode 100644
index ebdef98d17d8e1d8c49df1037b9fde437e432bb7..0000000000000000000000000000000000000000
Binary files a/Inst_eddies/Tests/Input/Region_1/h.nc and /dev/null differ
diff --git a/Inst_eddies/Tests/Input/Region_1/uv.nc b/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc
similarity index 54%
rename from Inst_eddies/Tests/Input/Region_1/uv.nc
rename to Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc
index df11254a6ce78b5fc543dbd0e1cdcdcdadc4eb85..6dfa88f573bbfa80e308e27c8573e87df4565373 100644
Binary files a/Inst_eddies/Tests/Input/Region_1/uv.nc and b/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc differ
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index e3f5a0508087d96e2526707721910972d73c5e7d..568b3e45cd73c703c44b15eb98ca8fff5e134d7c 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -3,7 +3,7 @@
"input": "&main_nml /\n",
"title": "Get_1_outerm",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm.csv",
"outside_points.csv"
@@ -16,7 +16,7 @@
"input": "&main_nml /\n",
"title": "Get_1_outerm_noise_2_8",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
"$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"
],
"command": "$build_dir/Inst_eddies/test_get_1_outerm"
@@ -26,7 +26,7 @@
"input": "&main_nml /\n",
"title": "Get_1_outerm_noise_2",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm_noise_2.csv",
"outside_points.csv"
@@ -99,7 +99,7 @@
"title": "Local_extrema",
"command": [
"$build_dir/Inst_eddies/test_local_extrema",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc"
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
{
@@ -126,7 +126,7 @@
"title": "Local_extrema_periodic",
"command": [
"$build_dir/Inst_eddies/test_local_extrema",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc"
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
{
@@ -143,8 +143,8 @@
"title": "Max_speed_contour_ssh",
"command": [
"$build_dir/Inst_eddies/test_max_speed_contour_ssh",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc"
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
{
@@ -153,8 +153,8 @@
"title": "Max_speed_contour_ssh_north",
"command": [
"$build_dir/Inst_eddies/test_max_speed_contour_ssh",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc"
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
{
@@ -171,7 +171,7 @@
"input": "&main_nml /\n",
"title": "Mean_speed",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"],
["$PWD/Get_1_outerm/test_get_1_outerm.shp", "contour.shp"],
["$PWD/Get_1_outerm/test_get_1_outerm.dbf", "contour.dbf"],
["$PWD/Get_1_outerm/test_get_1_outerm.shx", "contour.shx"]
@@ -182,7 +182,7 @@
"input": "&main_nml /\n",
"title": "Mean_speed_alt",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"],
[
"$src_dir/Inst_eddies/Tests/Input/outermost_contour_alt.shp",
"contour.shp"
@@ -221,8 +221,8 @@
{
"input": "&MAIN_NML IND_TARG_EXTR=19,11 /\n",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc",
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"],
"$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv",
"$PWD/Get_1_outerm_noise_2_8/test_get_1_outerm.*"
],
@@ -232,8 +232,8 @@
{
"input": "&main_nml min_amp = 0./\n",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc"
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
],
"title": "Extraction_eddies_region_1",
"commands": [
@@ -249,8 +249,8 @@
"Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
"input": "&main_nml /\n",
"required": [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/h.nc",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/uv.nc"
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
+ ["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
],
"title": "Extraction_eddies_region_1_noise",
"commands": [