From ea37ec71c2508de4adec62c6ccda7b261ca78a3f Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Thu, 6 Apr 2023 17:31:07 +0200
Subject: [PATCH] Update test descriptions to new format
Dictionary instead of list, following update of `test_compare.py`.
---
Common/Tests/tests.json | 73 +-
Convert_Matlab/Tests/short_tests.json | 97 +-
Convert_Matlab/Tests/tests_with_Matlab.json | 95 +-
Inst_eddies/Analysis/tests.json | 201 ++-
Inst_eddies/Tests/long_tests.json | 313 +++--
Inst_eddies/Tests/short_tests.json | 965 +++++++-------
Inst_eddies/Tests/test_output.json | 231 ++--
Overlap/Tests/long_tests.json | 46 +-
Overlap/Tests/short_tests.json | 1261 ++++++++++---------
Trajectories/Tests/perf_tests.json | 67 +-
Trajectories/Tests/tests.json | 260 ++--
11 files changed, 1869 insertions(+), 1740 deletions(-)
diff --git a/Common/Tests/tests.json b/Common/Tests/tests.json
index f7d77dd7..110a53e6 100644
--- a/Common/Tests/tests.json
+++ b/Common/Tests/tests.json
@@ -1,33 +1,40 @@
-[
- {
- "title": "Spher_polyline_area",
- "command": "$build_dir/Common/Tests/test_spher_polyline_area"
- },
- {
- "title": "Create_ishape_last",
- "copy": ["$tests_old_dir/Region_5_15_days/SHPC"],
- "commands":
- [
- ["rm", "SHPC/Slice_0/Anticyclones/ishape_last.txt"],
- [
- "$src_dir/Inst_eddies/Analysis/eddy_dump.py", "SHPC",
- "Anticyclones"
- ]
- ],
- "input": "20455, 1\n"
- },
- {
- "title": "Create_ishape_last_missing",
- "description": "Create ishape_last with a missing date.",
- "copy": ["$PWD/Eurec4A_Matlab"],
- "commands":
- [
- ["rm", "Eurec4A_Matlab/Slice_0/Anticyclones/ishape_last.txt"],
- [
- "$src_dir/Inst_eddies/Analysis/eddy_dump.py", "Eurec4A_Matlab",
- "Anticyclones"
- ]
- ],
- "input": "25552, 1\n"
- }
-]
+{
+ "Spher_polyline_area": {
+ "command": "$build_dir/Common/Tests/test_spher_polyline_area"
+ },
+ "Create_ishape_last": {
+ "copy": [
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ],
+ "commands": [
+ [
+ "rm",
+ "SHPC/Slice_0/Anticyclones/ishape_last.txt"
+ ],
+ [
+ "$src_dir/Inst_eddies/Analysis/eddy_dump.py",
+ "SHPC",
+ "Anticyclones"
+ ]
+ ],
+ "input": "20455, 1\n"
+ },
+ "Create_ishape_last_missing": {
+ "description": "Create ishape_last with a missing date.",
+ "copy": [
+ "$PWD/Eurec4A_Matlab"
+ ],
+ "commands": [
+ [
+ "rm",
+ "Eurec4A_Matlab/Slice_0/Anticyclones/ishape_last.txt"
+ ],
+ [
+ "$src_dir/Inst_eddies/Analysis/eddy_dump.py",
+ "Eurec4A_Matlab",
+ "Anticyclones"
+ ]
+ ],
+ "input": "25552, 1\n"
+ }
+}
\ No newline at end of file
diff --git a/Convert_Matlab/Tests/short_tests.json b/Convert_Matlab/Tests/short_tests.json
index d545f1bf..5dbdb6fc 100644
--- a/Convert_Matlab/Tests/short_tests.json
+++ b/Convert_Matlab/Tests/short_tests.json
@@ -1,52 +1,45 @@
-[
- {
- "title": "Graph_from_Matlab_v6_cyclo",
- "command": "$src_dir/Convert_Matlab/overlap_v6.py",
- "symlink":
- [
- [
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_cyclo.mat",
- "id_child_0.mat"
- ],
- [
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/Ncyclo.mat",
- "N_eddies.mat"
- ],
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/date_num.mat"
- ],
- "input": "1\n"
- },
- {
- "title": "Graph_from_Matlab_v6_anti",
- "command": "$src_dir/Convert_Matlab/overlap_v6.py",
- "symlink":
- [
- [
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_anti.mat",
- "id_child_0.mat"
- ],
- [
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/Nanti.mat",
- "N_eddies.mat"
- ],
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/date_num.mat"
- ],
- "input": "1\n"
- },
- {
- "title": "Mat_HDF5_to_shapefiles",
- "command":
- [
- "$src_dir/Convert_Matlab/inst_eddies_HDF5.py",
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/adt_2019-12-15.mat"
- ]
- },
- {
- "title": "Survival", "command": "$src_dir/Convert_Matlab/survival.py",
- "symlink":
- [
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_anti.mat",
- "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_cyclo.mat"
- ]
- }
-]
+{
+ "Graph_from_Matlab_v6_cyclo": {
+ "command": "$src_dir/Convert_Matlab/overlap_v6.py",
+ "symlink": [
+ [
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_cyclo.mat",
+ "id_child_0.mat"
+ ],
+ [
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/Ncyclo.mat",
+ "N_eddies.mat"
+ ],
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/date_num.mat"
+ ],
+ "input": "1\n"
+ },
+ "Graph_from_Matlab_v6_anti": {
+ "command": "$src_dir/Convert_Matlab/overlap_v6.py",
+ "symlink": [
+ [
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_anti.mat",
+ "id_child_0.mat"
+ ],
+ [
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/Nanti.mat",
+ "N_eddies.mat"
+ ],
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/date_num.mat"
+ ],
+ "input": "1\n"
+ },
+ "Mat_HDF5_to_shapefiles": {
+ "command": [
+ "$src_dir/Convert_Matlab/inst_eddies_HDF5.py",
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/adt_2019-12-15.mat"
+ ]
+ },
+ "Survival": {
+ "command": "$src_dir/Convert_Matlab/survival.py",
+ "symlink": [
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_anti.mat",
+ "$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_cyclo.mat"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Convert_Matlab/Tests/tests_with_Matlab.json b/Convert_Matlab/Tests/tests_with_Matlab.json
index 198463f3..f95e5fa8 100644
--- a/Convert_Matlab/Tests/tests_with_Matlab.json
+++ b/Convert_Matlab/Tests/tests_with_Matlab.json
@@ -1,50 +1,45 @@
-[
- {
- "title": "Mat_v6_to_shapefiles",
- "command":
- [
- "srun", "--quiet",
- "$src_dir/Convert_Matlab/inst_eddies_v6.py",
- "/data/lmd-oce/EUREC4A_OA/DATA_SAT_NewExport_Atalante/TOEddies/Eddies/adt_2019-12-15.mat",
- "2019-12-16"
- ],
- "symlink": ["$src_dir/Convert_Matlab/inst_eddies.m"],
- "stdout": "inst_eddies_v6_stdout.txt"
- },
- {
- "title": "Inst_eddies_v6_global",
- "description":
- "On a global file to test the processing of ghost eddies.",
- "command":
- [
- "srun", "--quiet",
- "$src_dir/Convert_Matlab/inst_eddies_v6.py",
- "/proju/lmd-oce/data/TOEddies/Global/Delayed-Time/Eddies/adt_19930102.mat"
- ],
- "symlink":
- [
- "$src_dir/Convert_Matlab/inst_eddies.m",
- "$src_dir/Convert_Matlab/Tests/node_id_param.json"
- ],
- "stdout": "inst_eddies_v6_stdout.txt"
- },
- {
- "title": "Plot_eddy_contours_Mat",
- "description":
- "plot_eddy_contours.py on a file coming from the Matlab program.",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$PWD/Mat_v6_to_shapefiles/SHPC", "--save=png"
- ]
- },
- {
- "title": "Stats_Matlab",
- "description": "With an SHPC made from conversion of Matlab data.",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/stat_SHPC.py",
- "$PWD/Inst_eddies_v6_global/SHPC", "Anticyclones"
- ]
- }
-]
+{
+ "Mat_v6_to_shapefiles": {
+ "command": [
+ "srun",
+ "--quiet",
+ "$src_dir/Convert_Matlab/inst_eddies_v6.py",
+ "/data/lmd-oce/EUREC4A_OA/DATA_SAT_NewExport_Atalante/TOEddies/Eddies/adt_2019-12-15.mat",
+ "2019-12-16"
+ ],
+ "symlink": [
+ "$src_dir/Convert_Matlab/inst_eddies.m"
+ ],
+ "stdout": "inst_eddies_v6_stdout.txt"
+ },
+ "Inst_eddies_v6_global": {
+ "description": "On a global file to test the processing of ghost eddies.",
+ "command": [
+ "srun",
+ "--quiet",
+ "$src_dir/Convert_Matlab/inst_eddies_v6.py",
+ "/proju/lmd-oce/data/TOEddies/Global/Delayed-Time/Eddies/adt_19930102.mat"
+ ],
+ "symlink": [
+ "$src_dir/Convert_Matlab/inst_eddies.m",
+ "$src_dir/Convert_Matlab/Tests/node_id_param.json"
+ ],
+ "stdout": "inst_eddies_v6_stdout.txt"
+ },
+ "Plot_eddy_contours_Mat": {
+ "description": "plot_eddy_contours.py on a file coming from the Matlab program.",
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
+ "$PWD/Mat_v6_to_shapefiles/SHPC",
+ "--save=png"
+ ]
+ },
+ "Stats_Matlab": {
+ "description": "With an SHPC made from conversion of Matlab data.",
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/stat_SHPC.py",
+ "$PWD/Inst_eddies_v6_global/SHPC",
+ "Anticyclones"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json
index 81c8611c..2d213379 100644
--- a/Inst_eddies/Analysis/tests.json
+++ b/Inst_eddies/Analysis/tests.json
@@ -1,102 +1,99 @@
-[
- {
- "title": "Plot_eddy_contours",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$tests_old_dir/Region_6/SHPC", "--save=png"
- ]
- },
- {
- "title": "Animation",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/anim_eddy_contours.py",
- "$tests_old_dir/Region_6/SHPC", "--light"
- ]
- },
- {
- "title": "Eddy_dump",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/eddy_dump.py",
- "$tests_old_dir/Inst_eddies_loop/SHPC", "Cyclones"
- ],
- "input": "20455, 3\n"
- },
- {
- "title": "Plot_eddy_contours_grid",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC", "--grid",
- "--save=png"
- ],
- "description": "With grid option.",
- "symlink": [["$src_dir/Inst_eddies/Tests/Input/h_region_4.nc", "h.nc"]]
- },
- {
- "title": "Plot_eddy_contours_window",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$tests_old_dir/Extraction_eddies_region_5/SHPC", "--window",
- "10", "-40", "15", "-35", "--save=png"
- ],
- "description": "With window option."
- },
- {
- "title": "Plot_velocity",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_velocity.py",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_4.nc",
- "--save=png"
- ]
- },
- {
- "title": "Plot_eddy_contours_2",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC", "--save=png"
- ],
- "description": "With two SHPC as command line arguments."
- },
- {
- "title": "Examine_ssh_values",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/examine_ssh_values.py", "-s",
- "$src_dir/Inst_eddies/Tests/Input/h_region_4.nc"
- ],
- "input": "17\n-37\n0.2\n"
- },
- {
- "title": "Animation_2_SHPC",
- "description": "With two orientations and no option light.",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/anim_eddy_contours.py",
- "$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- },
- {
- "title": "Stats",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/stat_SHPC.py",
- "$tests_old_dir/Inst_eddies_py/SHPC", "Anticyclones"
- ]
- },
- {
- "title": "Filter",
- "command":
- [
- "$src_dir/Inst_eddies/Analysis/filter.py",
- "$tests_old_dir/Region_5_15_days/SHPC/Slice_0/Anticyclones",
- "Plouf"
- ],
- "env": {"PYTHONPATH": "$src_dir/Inst_eddies/Tests/Input"}
- }
-]
+{
+ "Plot_eddy_contours": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
+ "$tests_old_dir/Region_6/SHPC",
+ "--save=png"
+ ]
+ },
+ "Animation": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/anim_eddy_contours.py",
+ "$tests_old_dir/Region_6/SHPC",
+ "--light"
+ ]
+ },
+ "Eddy_dump": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/eddy_dump.py",
+ "$tests_old_dir/Inst_eddies_loop/SHPC",
+ "Cyclones"
+ ],
+ "input": "20455, 3\n"
+ },
+ "Plot_eddy_contours_grid": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC",
+ "--grid",
+ "--save=png"
+ ],
+ "description": "With grid option.",
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/h_region_4.nc",
+ "h.nc"
+ ]
+ ]
+ },
+ "Plot_eddy_contours_window": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
+ "$tests_old_dir/Extraction_eddies_region_5/SHPC",
+ "--window",
+ "10",
+ "-40",
+ "15",
+ "-35",
+ "--save=png"
+ ],
+ "description": "With window option."
+ },
+ "Plot_velocity": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_velocity.py",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_4.nc",
+ "--save=png"
+ ]
+ },
+ "Plot_eddy_contours_2": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/plot_eddy_contours.py",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC",
+ "--save=png"
+ ],
+ "description": "With two SHPC as command line arguments."
+ },
+ "Examine_ssh_values": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/examine_ssh_values.py",
+ "-s",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_4.nc"
+ ],
+ "input": "17\n-37\n0.2\n"
+ },
+ "Animation_2_SHPC": {
+ "description": "With two orientations and no option light.",
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/anim_eddy_contours.py",
+ "$tests_old_dir/Inst_eddies_loop/SHPC"
+ ]
+ },
+ "Stats": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/stat_SHPC.py",
+ "$tests_old_dir/Inst_eddies_py/SHPC",
+ "Anticyclones"
+ ]
+ },
+ "Filter": {
+ "command": [
+ "$src_dir/Inst_eddies/Analysis/filter.py",
+ "$tests_old_dir/Region_5_15_days/SHPC/Slice_0/Anticyclones",
+ "Plouf"
+ ],
+ "env": {
+ "PYTHONPATH": "$src_dir/Inst_eddies/Tests/Input"
+ }
+ }
+}
\ No newline at end of file
diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index 4ff37cec..84f6178f 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -1,137 +1,176 @@
-[
- {
- "commands":
- [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
- "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
- ]
- ],
- "title": "Set_all_outerm",
- "create_file": ["config_nml.txt", "&config_nml min_radius = 20./\n"]
- },
- {
- "commands":
- [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
- ]
- ],
- "title": "Extraction_eddies_region_3",
- "create_file": ["config_nml.txt", "&config_nml min_amp = 0./\n"],
- "input": "&dates_nml date = 20454/\n",
- "description": "Larger region, 120 x 120. Includes degenerate extrema."
- },
- {
- "commands":
- [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
- ]
- ],
- "title": "Extraction_eddies_region_3_min",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "input": "&dates_nml date = 20454/\n",
- "description":
- "Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
- },
- {
- "commands":
- [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$src_dir/Inst_eddies/Tests/Input/h_region_5.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc"
- ]
- ],
- "title": "Extraction_eddies_region_5",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "input": "&dates_nml date = 20454/\n",
- "description": "Same as Extraction_eddies_region_4 with larger domain.",
- "exclude_cmp": ["n_slices.txt"]
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Extraction_eddies_region_2_noise",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "-b", "1.625", "15.625", "-38.375", "-30.375",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
- "0", "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc", "-l",
- "20060115"
- ]
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Region_6",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies.py",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
- "$large_input_dir/dt_global_allsat_phy_l4_20060102_20210726.nc",
- "-b", "5.875", "12.125", "-32.125", "-26.875"
- ],
- "input": "20454\n0\n"
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Missing_file",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "$large_input_dir/dataset-duacs-global-allsat-phy-2020-01-31.nc",
- "0", "--template=dataset-duacs-global-allsat-phy-%Y-%m-%d.nc", "-l",
- "20200202"
- ],
- "description":
- "Date 2020-02-01 is missing. Test of the script with a missing date."
- },
- {
- "title": "Greece",
- "description":
- "This is a case where the speed is not defined on a whole segment.",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
- "--last_date=1993-03-31", "--bbox", "20", "30", "35", "42",
- "$large_input_dir/dt_global_allsat_phy_l4_19930101_20210726.nc", "0"
- ],
- "create_file": ["config_nml.txt", "&config_nml /\n"]
- },
- {
- "title": "Region_5_15_days",
- "description":"This is used in several tests in Overlap.",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
- "--last_date=2006-01-15", "--bbox", "0.125", "29.875", "-59.875",
- "-15.125",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc", "0"
- ],
- "create_file": ["config_nml.txt", "&config_nml /\n"]
- }
-]
+{
+ "Set_all_outerm": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
+ ]
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml min_radius = 20./\n"
+ ]
+ },
+ "Extraction_eddies_region_3": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
+ ]
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml min_amp = 0./\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "description": "Larger region, 120 x 120. Includes degenerate extrema."
+ },
+ "Extraction_eddies_region_3_min": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_3.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc"
+ ]
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "description": "Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
+ },
+ "Extraction_eddies_region_5": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_5.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc"
+ ]
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "description": "Same as Extraction_eddies_region_4 with larger domain.",
+ "exclude_cmp": [
+ "n_slices.txt"
+ ]
+ },
+ "Extraction_eddies_region_2_noise": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "-b",
+ "1.625",
+ "15.625",
+ "-38.375",
+ "-30.375",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
+ "0",
+ "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
+ "-l",
+ "20060115"
+ ]
+ },
+ "Region_6": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies.py",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060102_20210726.nc",
+ "-b",
+ "5.875",
+ "12.125",
+ "-32.125",
+ "-26.875"
+ ],
+ "input": "20454\n0\n"
+ },
+ "Missing_file": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "$large_input_dir/dataset-duacs-global-allsat-phy-2020-01-31.nc",
+ "0",
+ "--template=dataset-duacs-global-allsat-phy-%Y-%m-%d.nc",
+ "-l",
+ "20200202"
+ ],
+ "description": "Date 2020-02-01 is missing. Test of the script with a missing date."
+ },
+ "Greece": {
+ "description": "This is a case where the speed is not defined on a whole segment.",
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
+ "--last_date=1993-03-31",
+ "--bbox",
+ "20",
+ "30",
+ "35",
+ "42",
+ "$large_input_dir/dt_global_allsat_phy_l4_19930101_20210726.nc",
+ "0"
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ]
+ },
+ "Region_5_15_days": {
+ "description": "This is used in several tests in Overlap.",
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
+ "--last_date=2006-01-15",
+ "--bbox",
+ "0.125",
+ "29.875",
+ "-59.875",
+ "-15.125",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
+ "0"
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ]
+ }
+}
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 324c7d54..ac617ad5 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -1,474 +1,503 @@
-[
- {
- "input": "&main_nml date = 20454/\n",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Get_1_outerm",
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm.csv",
- "outside_points.csv"
- ]
- ],
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
- "$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"
- ]
- ]
- },
- {
- "description":
- "Assume insufficient amplitude for extrema 2 and 8. Even if extremum 8 does not have a particularly small amplitude, we just want to see the target extremum, 6, grow its outermost contour compared to the case without minimum amplitude.",
- "input": "&main_nml date = 20454/\n",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Get_1_outerm_noise_2_8",
- "symlink":
- ["$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"],
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
- "$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"
- ]
- ]
- },
- {
- "description": "Negative value for extremum 2.",
- "input": "&main_nml date = 20454/\n",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Get_1_outerm_noise_2",
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm_noise_2.csv",
- "outside_points.csv"
- ]
- ],
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
- "$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"
- ]
- ]
- },
- {
- "description":
- "3 contours at that level. 2 contain the inside point, one of which contains the 2 outside points.",
- "symlink": [
- [
- "$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
- "outside_points.csv"
- ]
- ],
- "title": "Good_contour",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_good_contour",
- "$src_dir/Inst_eddies/Tests/Input/example.nc"
- ],
- "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour.txt"
- },
- {
- "description":
- "Select another good contour. Case where one of the contours tested does not contain inside point.",
- "symlink": [
- [
- "$src_dir/Inst_eddies/Tests/Input/outside_points_2.csv",
- "outside_points.csv"
- ]
- ],
- "title": "Good_contour_2",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_good_contour",
- "$src_dir/Inst_eddies/Tests/Input/example.nc"
- ],
- "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour_2.txt"
- },
- {
- "symlink": [
- [
- "$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
- "outside_points.csv"
- ]
- ],
- "title": "No_good_contour",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_good_contour",
- "$src_dir/Inst_eddies/Tests/Input/example.nc"
- ],
- "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/no_good_contour.txt"
- },
- {
- "stdin_filename":
- "$src_dir/Inst_eddies/Tests/Input/inside_4_true_nml.txt",
- "title": "Inside_4_true",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_inside_4",
- "$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
- ]
- },
- {
- "stdin_filename":
- "$src_dir/Inst_eddies/Tests/Input/inside_4_false_nml.txt",
- "title": "Inside_4_false",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_inside_4",
- "$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
- ]
- },
- {
- "input": "f",
- "title": "Local_extrema",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_local_extrema",
+{
+ "Get_1_outerm": {
+ "input": "&main_nml date = 20454/\n",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
+ "$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"
+ ]
+ ]
+ },
+ "Get_1_outerm_noise_2_8": {
+ "description": "Assume insufficient amplitude for extrema 2 and 8. Even if extremum 8 does not have a particularly small amplitude, we just want to see the target extremum, 6, grow its outermost contour compared to the case without minimum amplitude.",
+ "input": "&main_nml date = 20454/\n",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
+ "$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"
+ ]
+ ]
+ },
+ "Get_1_outerm_noise_2": {
+ "description": "Negative value for extremum 2.",
+ "input": "&main_nml date = 20454/\n",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm_noise_2.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
+ "$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"
- ]
- },
- {
- "description": "With a larger region than in test Local_extrema.",
- "input": "f",
- "title": "Local_extrema_larger",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_local_extrema",
- "$src_dir/Inst_eddies/Tests/Input/h_region_2.nc"
- ]
- },
- {
- "input": "f\n",
- "description": "With input file containing missing values.",
- "title": "Local_extrema_missing",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_local_extrema",
- "$src_dir/Inst_eddies/Tests/Input/h_region_4.nc"
- ]
- },
- {
- "description":
- "Same as Local_extrema but with periodicity. The data is actually regional so there is a discontinuity in the field and the longitude grid assuming periodicity is not regular.",
- "input": "t\n",
- "title": "Local_extrema_periodic",
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ ]
+ ]
+ },
+ "Good_contour": {
+ "description": "3 contours at that level. 2 contain the inside point, one of which contains the 2 outside points.",
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
+ "$src_dir/Inst_eddies/Tests/Input/example.nc"
+ ],
+ "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour.txt"
+ },
+ "Good_contour_2": {
+ "description": "Select another good contour. Case where one of the contours tested does not contain inside point.",
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/outside_points_2.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
+ "$src_dir/Inst_eddies/Tests/Input/example.nc"
+ ],
+ "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour_2.txt"
+ },
+ "No_good_contour": {
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
+ "$src_dir/Inst_eddies/Tests/Input/example.nc"
+ ],
+ "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/no_good_contour.txt"
+ },
+ "Inside_4_true": {
+ "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/inside_4_true_nml.txt",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_inside_4",
+ "$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
+ ]
+ },
+ "Inside_4_false": {
+ "stdin_filename": "$src_dir/Inst_eddies/Tests/Input/inside_4_false_nml.txt",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_inside_4",
+ "$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
+ ]
+ },
+ "Local_extrema": {
+ "input": "f",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
+ ]
+ },
+ "Local_extrema_larger": {
+ "description": "With a larger region than in test Local_extrema.",
+ "input": "f",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_2.nc"
+ ]
+ },
+ "Local_extrema_missing": {
+ "input": "f\n",
+ "description": "With input file containing missing values.",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_4.nc"
+ ]
+ },
+ "Local_extrema_periodic": {
+ "description": "Same as Local_extrema but with periodicity. The data is actually regional so there is a discontinuity in the field and the longitude grid assuming periodicity is not regular.",
+ "input": "t\n",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
+ ]
+ },
+ "Local_extrema_periodic_2": {
+ "description": "The data is really global so there is no discontinuity in the field and the longitude grid assuming periodicity is regular.",
+ "input": "t\n",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
+ "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc"
+ ]
+ },
+ "Max_speed_contour_ssh": {
+ "input": "&main_nml /\n",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
+ "$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"
+ ]
+ },
+ "Max_speed_contour_ssh_north": {
+ "description": "direction = 2",
+ "input": "&main_nml IND_EXTR= 4,14/\n",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
+ "$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"
+ ]
+ },
+ "Max_speed_contour_ssh_missing": {
+ "description": "Missing value in speed.",
+ "input": "&main_nml IND_EXTR= 3, 4/\n",
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
+ "$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc",
+ "$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc"
+ ]
+ },
+ "Mean_speed": {
+ "input": "&main_nml /\n",
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
+ "uv.nc"
+ ]
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_mean_speed",
+ "$PWD/Get_1_outerm/SHPC/Slice_0/Cyclones/outermost_contour"
+ ]
+ },
+ "Mean_speed_alt": {
+ "input": "&main_nml /\n",
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
+ "uv.nc"
+ ]
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_mean_speed",
+ "$src_dir/Inst_eddies/Tests/Input/outermost_contour_alt"
+ ]
+ },
+ "Set_max_speed": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/empty_outside_points.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
+ "$src_dir/Inst_eddies/Tests/Input/h_outermost.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_outermost.nc",
+ "$PWD/Get_1_outerm/SHPC"
+ ]
+ ],
+ "input": "t\n"
+ },
+ "Set_max_speed_noise": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
+ "$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",
+ "$PWD/Get_1_outerm_noise_2_8/SHPC"
+ ]
+ ],
+ "input": "t\n"
+ },
+ "Set_max_speed_degenerate": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/empty_outside_points.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "description": "The SSH value of the extremum is exactly equal to the SSH value of the point next to the extremum, eastward. This points is selected as the point with maximum azimuthal speed. Then good_contour returns a null polyline.",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
+ "$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
+ "$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
+ "$src_dir/Inst_eddies/Tests/Input/SHPC_degenerate"
+ ]
+ ],
+ "input": "f\n"
+ },
+ "Extraction_eddies_region_1": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml min_amp = 0./\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$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"
- ]
- },
- {
- "description":
- "The data is really global so there is no discontinuity in the field and the longitude grid assuming periodicity is regular.",
- "input": "t\n",
- "title": "Local_extrema_periodic_2",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_local_extrema",
- "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc"
- ]
- },
- {
- "input": "&main_nml /\n",
- "title": "Max_speed_contour_ssh",
- "command": [
- "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
+ ]
+ ]
+ },
+ "Extraction_eddies_region_1_noise": {
+ "description": "Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
"$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"
- ]
- },
- {
- "description": "direction = 2",
- "input": "&main_nml IND_EXTR= 4,14/\n",
- "title": "Max_speed_contour_ssh_north",
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
+ ]
+ ]
+ },
+ "Extraction_eddies_region_2": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml min_amp = 0./\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$src_dir/Inst_eddies/Tests/Input/h_region_2.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_region_2.nc"
+ ]
+ ]
+ },
+ "Extraction_eddies_region_4": {
+ "description": "Part of the domain has missing values.",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies.py",
+ "-b",
+ "16.125",
+ "20.875",
+ "-38.875",
+ "-34.125",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060102_20210726.nc"
+ ],
+ "input": "20454\n0\n"
+ },
+ "Inst_eddies_py": {
+ "description": "Like Extraction_eddies_region_4, but for a single date. This is a test of options of the wrapper script rather than a test of the Fortran executable.",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies.py",
+ "-b",
+ "16.125",
+ "20.875",
+ "-38.875",
+ "-34.125",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc"
+ ],
+ "input": "20454\n0\n"
+ },
+ "Inst_eddies_loop": {
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "--template=huv_region_1_%Y_%m_%d.nc",
+ "-l",
+ "2006-01-04",
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
+ "0"
+ ],
+ "input": "20454\n"
+ },
+ "Nearby_extr": {
+ "command": [
+ "$build_dir/Inst_eddies/Tests/test_nearby_extr",
+ "$PWD/Inst_eddies_loop/SHPC"
+ ],
+ "input": "&main_nml /\n",
+ "description": "We are using Inst_eddies_loop, which is a previous test."
+ },
+ "Set_all_outerm_periodic": {
+ "description": "test_set_all_outerm with periodicity.",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
+ "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_2006_01_01_coarse.nc"
+ ]
+ ]
+ },
+ "Extraction_eddies_periodic": {
+ "description": "Periodic domain.",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
+ ],
+ "input": "&dates_nml date = 20454/\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/inst_eddies",
+ "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
+ "$src_dir/Inst_eddies/Tests/Input/uv_2006_01_01_coarse.nc"
+ ]
+ ]
+ },
+ "Extr_proj": {
+ "description": "Create shapefile extr_proj.",
+ "input": "&main_nml date = 20454, grid_lon_lat = f/\n",
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ],
+ "symlink": [
+ [
+ "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm.csv",
+ "outside_points.csv"
+ ]
+ ],
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
"$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"
- ]
- },
- {
- "description": "Missing value in speed.",
- "input": "&main_nml IND_EXTR= 3, 4/\n",
- "title": "Max_speed_contour_ssh_missing",
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
- "$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc",
- "$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc"
- ]
- },
- {
- "input": "&main_nml /\n",
- "title": "Mean_speed",
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
- "uv.nc"
- ]
- ],
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_mean_speed",
- "$PWD/Get_1_outerm/SHPC/Slice_0/Cyclones/outermost_contour"
- ]
- },
- {
- "input": "&main_nml /\n",
- "title": "Mean_speed_alt",
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
- "uv.nc"
- ]
- ],
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_mean_speed",
- "$src_dir/Inst_eddies/Tests/Input/outermost_contour_alt"
- ]
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/empty_outside_points.csv",
- "outside_points.csv"
- ]
- ],
- "title": "Set_max_speed",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_set_max_speed",
- "$src_dir/Inst_eddies/Tests/Input/h_outermost.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_outermost.nc",
- "$PWD/Get_1_outerm/SHPC"
- ]
- ],
- "input": "t\n"
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "symlink":
- ["$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"],
- "title": "Set_max_speed_noise",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_set_max_speed",
- "$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",
- "$PWD/Get_1_outerm_noise_2_8/SHPC"
- ]
- ],
- "input": "t\n"
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/empty_outside_points.csv",
- "outside_points.csv"
- ]
- ],
- "title": "Set_max_speed_degenerate",
- "description": "The SSH value of the extremum is exactly equal to the SSH value of the point next to the extremum, eastward. This points is selected as the point with maximum azimuthal speed. Then good_contour returns a null polyline.",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Anticyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_set_max_speed",
- "$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
- "$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
- "$src_dir/Inst_eddies/Tests/Input/SHPC_degenerate"
- ]
- ],
- "input": "f\n"
- },
- {
- "create_file": ["config_nml.txt", "&config_nml min_amp = 0./\n"],
- "input": "&dates_nml date = 20454/\n",
- "title": "Extraction_eddies_region_1",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$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"
- ]
- ]
- },
- {
- "description":
- "Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "input": "&dates_nml date = 20454/\n",
- "title": "Extraction_eddies_region_1_noise",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$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"
- ]
- ]
- },
- {
- "create_file": ["config_nml.txt", "&config_nml min_amp = 0./\n"],
- "input": "&dates_nml date = 20454/\n",
- "title": "Extraction_eddies_region_2",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$src_dir/Inst_eddies/Tests/Input/h_region_2.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_region_2.nc"
- ]
- ]
- },
- {
- "description": "Part of the domain has missing values.",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Extraction_eddies_region_4",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies.py", "-b", "16.125", "20.875",
- "-38.875", "-34.125",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
- "$large_input_dir/dt_global_allsat_phy_l4_20060102_20210726.nc"
- ],
- "input": "20454\n0\n"
- },
- {
- "description":
- "Like Extraction_eddies_region_4, but for a single date. This is a test of options of the wrapper script rather than a test of the Fortran executable.",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Inst_eddies_py",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies.py", "-b", "16.125", "20.875",
- "-38.875", "-34.125",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc"
- ],
- "input": "20454\n0\n"
- },
- {
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Inst_eddies_loop",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "--template=huv_region_1_%Y_%m_%d.nc", "-l", "2006-01-04",
- "$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
- "0"
- ],
- "input": "20454\n"
- },
- {
- "title": "Nearby_extr",
- "command":
- [
- "$build_dir/Inst_eddies/Tests/test_nearby_extr",
- "$PWD/Inst_eddies_loop/SHPC"
- ],
- "input": "&main_nml /\n",
- "description": "We are using Inst_eddies_loop, which is a previous test."
- },
- {
- "description": "test_set_all_outerm with periodicity.",
- "create_file":
- [
- "config_nml.txt",
- "&config_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
- ],
- "title": "Set_all_outerm_periodic",
- "commands":
- [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
- "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_2006_01_01_coarse.nc"
- ]
- ]
- },
- {
- "description": "Periodic domain.",
- "create_file":
- [
- "config_nml.txt",
- "&config_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
- ],
- "input": "&dates_nml date = 20454/\n",
- "title": "Extraction_eddies_periodic",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Cyclones",
- "SHPC/Slice_0/Anticyclones"
- ],
- [
- "$build_dir/Inst_eddies/inst_eddies",
- "$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
- "$src_dir/Inst_eddies/Tests/Input/uv_2006_01_01_coarse.nc"
- ]
- ]
- },
- {
- "description": "Create shapefile extr_proj.",
- "input": "&main_nml date = 20454, grid_lon_lat = f/\n",
- "create_file": ["config_nml.txt", "&config_nml /\n"],
- "title": "Extr_proj",
- "symlink":
- [
- [
- "$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points_get_1_outerm.csv",
- "outside_points.csv"
- ]
- ],
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Inst_eddies/Tests/test_get_1_outerm",
- "$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"
- ]
- ]
- },
- {
- "title": "Region_4_15_days",
- "description":"This is used in several tests in Overlap.",
- "command":
- [
- "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
- "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
- "--last_date=2006-01-15",
- "--bbox", "16.125", "20.875", "-38.875", "-34.125",
- "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc", "0"
- ],
- "create_file": ["config_nml.txt", "&config_nml /\n"]
- }
-]
+ ]
+ ]
+ },
+ "Region_4_15_days": {
+ "description": "This is used in several tests in Overlap.",
+ "command": [
+ "$build_dir/Inst_eddies/inst_eddies_Aviso.py",
+ "--template=dt_global_allsat_phy_l4_%Y%m%d_20210726.nc",
+ "--last_date=2006-01-15",
+ "--bbox",
+ "16.125",
+ "20.875",
+ "-38.875",
+ "-34.125",
+ "$large_input_dir/dt_global_allsat_phy_l4_20060101_20210726.nc",
+ "0"
+ ],
+ "create_file": [
+ "config_nml.txt",
+ "&config_nml /\n"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Inst_eddies/Tests/test_output.json b/Inst_eddies/Tests/test_output.json
index dd9d0058..905d3680 100644
--- a/Inst_eddies/Tests/test_output.json
+++ b/Inst_eddies/Tests/test_output.json
@@ -1,81 +1,150 @@
-[
- {
- "title": "Medium_mix",
- "description": "Append to medium-sized SHPC, mixing output to the three shapefiles.",
- "input": "&main_nml /\n",
- "command" : ["time", "$build_dir/test_write_null"],
- "copy": [["$PWD/n_dates_14", "SHPC"]],
- "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/test_write_null"],
- "copy": [["$PWD/n_dates_1", "SHPC"]],
- "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/test_write_null"],
- "copy": [["$PWD/n_dates_14", "SHPC"]],
- "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/test_write_null"],
- "copy": [["$PWD/n_dates_1", "SHPC"]],
- "stdout": "test_write_null_stdout.txt",
- "exclude_cmp": ["test_write_null_stderr.txt"]
- },
- {
- "title": "Create_mix",
- "description": "Create SHPC, mixing output to the three shapefiles.",
- "input": "&main_nml /\n",
- "commands" :
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/test_write_null"]
- ],
- "stdout": "test_write_null_stdout.txt",
- "exclude_cmp": ["test_write_null_stderr.txt"]
- },
- {
- "title": "Create_sep",
- "description": "Create SHPC, separating output to the three shapefiles.",
- "input": "&main_nml mixed = f/\n",
- "commands" :
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/test_write_null"]
- ],
- "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/test_write_null"],
- "copy": [["$PWD/Global_1993_2021/SHPC/Slice_0", "SHPC/Slice_0"]],
- "stdout": "test_write_null_stdout.txt",
- "exclude_cmp": ["test_write_null_stderr.txt", "*.shp"]
- },
- {
- "title": "Big_sep",
- "description": "Append to big SHPC, separating output to the three shapefiles.",
- "input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/test_write_null"],
- "copy": [["$PWD/Global_1993_2021/SHPC/Slice_0", "SHPC/Slice_0"]],
- "stdout": "test_write_null_stdout.txt",
- "exclude_cmp": ["test_write_null_stderr.txt", "*.shp"]
- }
-]
+{
+ "Medium_mix": {
+ "description": "Append to medium-sized SHPC, mixing output to the three shapefiles.",
+ "input": "&main_nml /\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/n_dates_14",
+ "SHPC"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Small_mix": {
+ "description": "Append to small SHPC, mixing output to the three shapefiles.",
+ "input": "&main_nml /\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/n_dates_1",
+ "SHPC"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Medium_sep": {
+ "description": "Append to medium-sized SHPC, separating output to the three shapefiles.",
+ "input": "&main_nml mixed = f/\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/n_dates_14",
+ "SHPC"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Small_sep": {
+ "description": "Append to small SHPC, separating output to the three shapefiles.",
+ "input": "&main_nml mixed = f/\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/n_dates_1",
+ "SHPC"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Create_mix": {
+ "description": "Create SHPC, mixing output to the three shapefiles.",
+ "input": "&main_nml /\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "time",
+ "$build_dir/test_write_null"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Create_sep": {
+ "description": "Create SHPC, separating output to the three shapefiles.",
+ "input": "&main_nml mixed = f/\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "time",
+ "$build_dir/test_write_null"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt"
+ ]
+ },
+ "Big_mix": {
+ "description": "Append to big SHPC, mixing output to the three shapefiles.",
+ "input": "&main_nml /\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/Global_1993_2021/SHPC/Slice_0",
+ "SHPC/Slice_0"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt",
+ "*.shp"
+ ]
+ },
+ "Big_sep": {
+ "description": "Append to big SHPC, separating output to the three shapefiles.",
+ "input": "&main_nml mixed = f/\n",
+ "command": [
+ "time",
+ "$build_dir/test_write_null"
+ ],
+ "copy": [
+ [
+ "$PWD/Global_1993_2021/SHPC/Slice_0",
+ "SHPC/Slice_0"
+ ]
+ ],
+ "stdout": "test_write_null_stdout.txt",
+ "exclude_cmp": [
+ "test_write_null_stderr.txt",
+ "*.shp"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Overlap/Tests/long_tests.json b/Overlap/Tests/long_tests.json
index 89e1ebe5..417aca20 100644
--- a/Overlap/Tests/long_tests.json
+++ b/Overlap/Tests/long_tests.json
@@ -1,21 +1,25 @@
-[
- {
- "input": "&config_graph_nml max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 15, i_slice = 13/\n",
- "title": "EGg",
- "env": {"mpiexec": "$mpiexec"},
- "command":
- ["$build_dir/Overlap/eddy_graph.sh", "1", "$PWD/Global_1993_2021/SHPC"]
- },
- {
- "input": "&config_graph_nml max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "title": "EGg_1993",
- "env": {"mpiexec": "$mpiexec"},
- "description":
- "Global domain, from Matlab results, one year, for performance tests",
- "command":
- [
- "$build_dir/Overlap/eddy_graph.sh", "1",
- "$PWD/SHPC_Matlab_1993"
- ]
- }
-]
+{
+ "EGg": {
+ "input": "&config_graph_nml max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 15, i_slice = 13/\n",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$PWD/Global_1993_2021/SHPC"
+ ]
+ },
+ "EGg_1993": {
+ "input": "&config_graph_nml max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "description": "Global domain, from Matlab results, one year, for performance tests",
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$PWD/SHPC_Matlab_1993"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index fde720b8..39cde74b 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -1,634 +1,637 @@
-[
- {
- "title": "Spher_polygon_area",
- "command": [
- "$build_dir/Overlap/Tests/test_spher_polygon_area",
- "$src_dir/Overlap/Tests/Input/triangle"
- ]
- },
- {
- "description": "Area of a multipolygon, with a hole in one polygon.",
- "title": "Area_multi_polygon",
- "command": [
- "$build_dir/Overlap/Tests/test_spher_polygon_area",
- "$src_dir/Overlap/Tests/Input/tri_square_hole"
- ]
- },
- {
- "title": "Read_eddy",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Anticyclones"],
- [
- "$build_dir/Overlap/Tests/test_read_eddy",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- ],
- "input": "&main_nml /\n"
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&main_nml /\n",
- "title": "Read_snapshot",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$build_dir/Overlap/Tests/test_read_snapshot",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20455, k_test_2 = 20455/\n/\n/\n",
- "description": "Overlap of a snapshot with itself.",
- "title": "Successive_overlap",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20455, k_test_2 = 20455/\n/\n/\n",
- "description": "Same as Successive_overlap, but with larger domain: region 5 instead of region 4.",
- "title": "Successive_overlap_region_5_one_date",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Region_5_15_days/SHPC"
- ]
- },
- {
- "input":
- "&config_graph_nml DIST_LIM = 4/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20454/\n/\n/\n",
- "description": "Overlap of a snapshot with itself. Global coarse grid.",
- "title": "Successive_overlap_periodic",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_periodic/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
- "description": "Overlap of different snapshots.",
- "title": "Successive_overlap_different_snapshots",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
- "description":
- "Overlap of different snapshots. Same as Successive_overlap_different_snapshots, but with a larger region. The identifying numbers of the connected eddies are not the same for all edges.",
- "title": "Successive_overlap_region_2",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
- "description": "Same as Successive_overlap_region_2, but with a larger region. We get some merging and splitting.",
- "title": "Successive_overlap_region_5",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Region_5_15_days/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455, i_slice = 13/\n/\n/\n",
- "description": "Global grid, normal 0.25° resolution.",
- "title": "Successive_overlap_global",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$PWD/Global_1993_2021/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20454/\n/\n/\n",
- "description": "Overlap of a snapshot with itself. Same as Successive_overlap, except for max_delta.",
- "title": "Non_successive_overlap",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
- "description":
- "Overlap of different snapshots. Same as Successive_overlap_different_snapshots, except for max_delta.",
- "title": "NSO_different_snapshots",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
- "description":
- "Same as Successive_overlap_region_5, except for max_delta.",
- "title": "NSO_region_5",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Region_5_15_days/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455, i_slice = 13/\n/\n/\n",
- "description":
- "Same as Successive_overlap_global, except for max_delta.",
- "title": "NSO_global",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$PWD/Global_1993_2021/SHPC"
- ]
- },
- {
- "stdin_filename": "$src_dir/Overlap/Tests/Input/NSO_delta_in.txt",
- "description": "Test the logic of delta_in and delta_out. See documentation, figure 10 and comments on overlap.",
- "title": "NSO_delta",
- "command":
- [
- "$build_dir/Overlap/Tests/test_overlap",
- "$tests_old_dir/Region_6/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml /\n",
- "description": "Send and receive an eddy.",
- "title": "Send_recv",
- "stdout": "test_send_recv_stdout.txt",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$mpiexec",
- "-n",
- "2",
- "$build_dir/Overlap/Tests/test_send_recv",
- "$tests_old_dir/Extraction_eddies_region_4/SHPC"
- ]
- ]
- },
- {
- "input": "&config_graph_nml /\n&MAIN_NML k = 20454/\n",
- "title": "Get_dispatch_snap",
- "stdout": "test_get_dispatch_snap_stdout.txt",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$mpiexec",
- "-n",
- "1",
- "$build_dir/Overlap/Tests/test_get_dispatch_snap",
- "$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- ]
- },
- {
- "input": "&config_graph_nml /\n&MAIN_NML k = 20456/\n",
- "description": "Receive case for one of the processes in procedure get_snapshot.",
- "title": "Get_dispatch_snap_recv",
- "stdout": "test_get_dispatch_snap_stdout.txt",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$mpiexec",
- "-n",
- "2",
- "$build_dir/Overlap/Tests/test_get_dispatch_snap",
- "$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- ]
- },
- {
- "input": "&config_graph_nml /\n&MAIN_NML /\n",
- "title": "Eddy_graph",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml /\n&MAIN_NML /\n",
- "description": "Same as Eddy_graph but with 2 processes.",
- "title": "Eddy_graph_2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
+{
+ "Spher_polygon_area": {
+ "command": [
+ "$build_dir/Overlap/Tests/test_spher_polygon_area",
+ "$src_dir/Overlap/Tests/Input/triangle"
+ ]
+ },
+ "Area_multi_polygon": {
+ "description": "Area of a multipolygon, with a hole in one polygon.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_spher_polygon_area",
+ "$src_dir/Overlap/Tests/Input/tri_square_hole"
+ ]
+ },
+ "Read_eddy": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_eddy",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ ],
+ "input": "&main_nml /\n"
+ },
+ "Read_snapshot": {
+ "input": "&config_graph_nml cyclone = f/\n&main_nml /\n",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_snapshot",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ ]
+ },
+ "Successive_overlap": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20455, k_test_2 = 20455/\n/\n/\n",
+ "description": "Overlap of a snapshot with itself.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ },
+ "Successive_overlap_region_5_one_date": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20455, k_test_2 = 20455/\n/\n/\n",
+ "description": "Same as Successive_overlap, but with larger domain: region 5 instead of region 4.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ]
+ },
+ "Successive_overlap_periodic": {
+ "input": "&config_graph_nml DIST_LIM = 4/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20454/\n/\n/\n",
+ "description": "Overlap of a snapshot with itself. Global coarse grid.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_periodic/SHPC"
+ ]
+ },
+ "Successive_overlap_different_snapshots": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
+ "description": "Overlap of different snapshots.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ },
+ "Successive_overlap_region_2": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
+ "description": "Overlap of different snapshots. Same as Successive_overlap_different_snapshots, but with a larger region. The identifying numbers of the connected eddies are not the same for all edges.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "Successive_overlap_region_5": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
+ "description": "Same as Successive_overlap_region_2, but with a larger region. We get some merging and splitting.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ]
+ },
+ "Successive_overlap_global": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455, i_slice = 13/\n/\n/\n",
+ "description": "Global grid, normal 0.25\u00b0 resolution.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$PWD/Global_1993_2021/SHPC"
+ ]
+ },
+ "Non_successive_overlap": {
+ "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20454/\n/\n/\n",
+ "description": "Overlap of a snapshot with itself. Same as Successive_overlap, except for max_delta.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ },
+ "NSO_different_snapshots": {
+ "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
+ "description": "Overlap of different snapshots. Same as Successive_overlap_different_snapshots, except for max_delta.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ },
+ "NSO_region_5": {
+ "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455/\n/\n/\n",
+ "description": "Same as Successive_overlap_region_5, except for max_delta.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ]
+ },
+ "NSO_global": {
+ "input": "&config_graph_nml max_delta = 3, cyclone = f/\n&MAIN_NML k_test_1 = 20454, k_test_2 = 20455, i_slice = 13/\n/\n/\n",
+ "description": "Same as Successive_overlap_global, except for max_delta.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$PWD/Global_1993_2021/SHPC"
+ ]
+ },
+ "NSO_delta": {
+ "stdin_filename": "$src_dir/Overlap/Tests/Input/NSO_delta_in.txt",
+ "description": "Test the logic of delta_in and delta_out. See documentation, figure 10 and comments on overlap.",
+ "command": [
+ "$build_dir/Overlap/Tests/test_overlap",
+ "$tests_old_dir/Region_6/SHPC"
+ ]
+ },
+ "Send_recv": {
+ "input": "&config_graph_nml /\n",
+ "description": "Send and receive an eddy.",
+ "stdout": "test_send_recv_stdout.txt",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$mpiexec",
+ "-n",
"2",
- "$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml MAX_DELTA = 2/\n&MAIN_NML /\n",
- "description": "Same as Eddy_graph but with max_delta = 2.",
- "title": "Eddy_graph_md2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
+ "$build_dir/Overlap/Tests/test_send_recv",
+ "$tests_old_dir/Extraction_eddies_region_4/SHPC"
+ ]
+ ]
+ },
+ "Get_dispatch_snap": {
+ "input": "&config_graph_nml /\n&MAIN_NML k = 20454/\n",
+ "stdout": "test_get_dispatch_snap_stdout.txt",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$mpiexec",
+ "-n",
"1",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
"$tests_old_dir/Inst_eddies_loop/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
- "description": "Eddy_graph with a larger region.",
- "title": "Eddy_graph_region_2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
- "description": "Same as Eddy_graph_region_2 but with 2 processes.",
- "title": "Eddy_graph_region_2_2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
+ ]
+ ]
+ },
+ "Get_dispatch_snap_recv": {
+ "input": "&config_graph_nml /\n&MAIN_NML k = 20456/\n",
+ "description": "Receive case for one of the processes in procedure get_snapshot.",
+ "stdout": "test_get_dispatch_snap_stdout.txt",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$mpiexec",
+ "-n",
"2",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 2, cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
- "description": "Same as Eddy_graph_region_2 but with max_delta = 2.",
- "title": "Eddy_graph_r2md2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
- "description": "Same as Eddy_graph_region_2 but with max_delta = 3.",
- "title": "Eddy_graph_r2md3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML n_dates = 5, i_slice = 0/\n",
- "description": "Same as Eddy_graph_r2md3 but with n_dates = 5.",
- "title": "Eddy_graph_r2nd5md3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 5, i_slice = 0/\n",
- "description": "Same as Eddy_graph_r2nd5md3 but with max_delta = 4.",
- "title": "EGr2nd5md4",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
- "description": "Same as EGr2nd5md4 but with n_dates = 6.",
- "title": "EGr2nd6md4",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
- "description": "Same as EGr2nd6md4 but with max_delta = 1.",
- "title": "EGr2nd6md1",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
- "description": "Same as EGr2nd6md1 but with 2 processes.",
- "title": "EGr2nd6md1np2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "2",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
- "description": "Same as EGr2nd6md1 but with 3 processes.",
- "title": "EGr2nd6md1np3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "3",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd6md1 but with all the 15 dates.",
- "title": "EGr2nd15md1",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 2, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md1 but with max_delta = 2.",
- "title": "EGr2nd15md2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md1 but with max_delta = 3.",
- "title": "EGr2nd15md3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md1 but with max_delta = 4.",
- "title": "EGr2nd15md4",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md4 but with 2 processes.",
- "title": "EGr2nd15md4np2",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "2",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md4 but with 3 processes.",
- "title": "EGr2nd15md4np3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "3",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md4np3 but for cyclones.",
- "title": "EGr2nd15md4np3_cyclo",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "3",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr2nd15md4 but with a larger region.",
- "title": "EGr5np1",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "1",
- "$tests_old_dir/Region_5_15_days/SHPC"
- ]
- },
- {
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
- "description": "Same as EGr5np1 but with 3 processes.",
- "title": "EGr5np3",
- "env": {"mpiexec": "$mpiexec"},
- "command": [
- "$build_dir/Overlap/eddy_graph.sh",
- "3",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
+ "$tests_old_dir/Inst_eddies_loop/SHPC"
+ ]
+ ]
+ },
+ "Eddy_graph": {
+ "input": "&config_graph_nml /\n&MAIN_NML /\n",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Inst_eddies_loop/SHPC"
+ ]
+ },
+ "Eddy_graph_2": {
+ "input": "&config_graph_nml /\n&MAIN_NML /\n",
+ "description": "Same as Eddy_graph but with 2 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "2",
+ "$tests_old_dir/Inst_eddies_loop/SHPC"
+ ]
+ },
+ "Eddy_graph_md2": {
+ "input": "&config_graph_nml MAX_DELTA = 2/\n&MAIN_NML /\n",
+ "description": "Same as Eddy_graph but with max_delta = 2.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Inst_eddies_loop/SHPC"
+ ]
+ },
+ "Eddy_graph_region_2": {
+ "input": "&config_graph_nml cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
+ "description": "Eddy_graph with a larger region.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "Eddy_graph_region_2_2": {
+ "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
+ "description": "Same as Eddy_graph_region_2 but with 2 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "2",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "Eddy_graph_r2md2": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 2, cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
+ "description": "Same as Eddy_graph_region_2 but with max_delta = 2.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "Eddy_graph_r2md3": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML n_dates = 4, i_slice = 0/\n",
+ "description": "Same as Eddy_graph_region_2 but with max_delta = 3.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "Eddy_graph_r2nd5md3": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML n_dates = 5, i_slice = 0/\n",
+ "description": "Same as Eddy_graph_r2md3 but with n_dates = 5.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd5md4": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 5, i_slice = 0/\n",
+ "description": "Same as Eddy_graph_r2nd5md3 but with max_delta = 4.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd6md4": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
+ "description": "Same as EGr2nd5md4 but with n_dates = 6.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd6md1": {
+ "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
+ "description": "Same as EGr2nd6md4 but with max_delta = 1.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd6md1np2": {
+ "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
+ "description": "Same as EGr2nd6md1 but with 2 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "2",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd6md1np3": {
+ "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML n_dates = 6, i_slice = 0/\n",
+ "description": "Same as EGr2nd6md1 but with 3 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "3",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md1": {
+ "input": "&CONFIG_GRAPH_NML cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd6md1 but with all the 15 dates.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md2": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 2, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md1 but with max_delta = 2.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md3": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 3, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md1 but with max_delta = 3.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md4": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md1 but with max_delta = 4.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md4np2": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md4 but with 2 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "2",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md4np3": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md4 but with 3 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "3",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr2nd15md4np3_cyclo": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md4np3 but for cyclones.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "3",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC"
+ ]
+ },
+ "EGr5np1": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr2nd15md4 but with a larger region.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ]
+ },
+ "EGr5np3": {
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n",
+ "description": "Same as EGr5np1 but with 3 processes.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "3",
+ "$tests_old_dir/Region_5_15_days/SHPC"
+ ]
+ },
+ "Report_graph_cyclo": {
+ "command": [
+ "$src_dir/Overlap/report_graph.py",
+ "--gv",
+ "--merging",
+ "$PWD/EGr2nd15md4np3_cyclo/edgelist.csv"
+ ]
+ },
+ "Report_graph_anti": {
+ "command": [
+ "$src_dir/Overlap/report_graph.py",
+ "--gv",
+ "--merging",
+ "$PWD/EGr2nd15md4np3/edgelist.csv"
+ ]
+ },
+ "Plot_components": {
+ "command": [
+ "$src_dir/Overlap/plot_components.py",
+ "$PWD/EGr2nd15md4np3/edgelist.csv",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "--save=png"
+ ]
+ },
+ "Report_graph_int": {
+ "command": [
+ "$src_dir/Overlap/report_graph.py",
+ "--gv",
+ "--merging",
+ "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist.csv"
+ ]
+ },
+ "Read_eddy_missing_speed": {
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_eddy",
"$tests_old_dir/Region_5_15_days/SHPC"
- ]
- },
- {
- "title": "Report_graph_cyclo",
- "command":
- [
- "$src_dir/Overlap/report_graph.py", "--gv", "--merging",
- "$PWD/EGr2nd15md4np3_cyclo/edgelist.csv"
- ]
- },
- {
- "title": "Report_graph_anti",
- "command":
- [
- "$src_dir/Overlap/report_graph.py", "--gv", "--merging",
- "$PWD/EGr2nd15md4np3/edgelist.csv"
- ]
- },
- {
- "title": "Plot_components",
- "command":
- [
- "$src_dir/Overlap/plot_components.py",
- "$PWD/EGr2nd15md4np3/edgelist.csv",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones", "--save=png"
- ]
- },
- {
- "title": "Report_graph_int",
- "command":
- [
- "$src_dir/Overlap/report_graph.py", "--gv", "--merging",
- "$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist.csv"
- ]
- },
- {
- "title": "Read_eddy_missing_speed",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Anticyclones"],
- [
- "$build_dir/Overlap/Tests/test_read_eddy",
- "$tests_old_dir/Region_5_15_days/SHPC"
- ]
- ],
- "input": "&main_nml ishape = 330 /\n"
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&main_nml /\n",
- "title": "Read_snapshot_15",
- "description": "Read a snapshot from an SHPC on a very small region with a sufficient number of dates: 15. $tests_old_dir/Extraction_eddies_region_4/SHPC used by the test Read_snapshot has only 2 dates.",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$build_dir/Overlap/Tests/test_read_snapshot",
- "$tests_old_dir/Region_4_15_days/SHPC"
- ]
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&main_nml k = 20461/\n",
- "title": "Read_snapshot_middle",
- "description": "Like Read_snapshot_15, but we read a date other than the first date.",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$build_dir/Overlap/Tests/test_read_snapshot",
- "$tests_old_dir/Region_4_15_days/SHPC"
- ]
- ]
- },
- {
- "title": "R4_15_splitted",
- "description": "This is not really a test. Rather it creates input necessary for tests.",
- "env": {"PYTHONPATH": "$src_dir/Inst_eddies/Analysis"},
- "command":
- [
- "$src_dir/Overlap/Tests/split_SHPC.py",
- "$tests_old_dir/Region_4_15_days/SHPC"
- ]
- },
- {
- "input": "&config_graph_nml cyclone = f/\n&main_nml k = 20461/\n",
- "title": "Read_snapshot_several",
- "description": "Like Read_snapshot_middle, but we read from several slices. The 3 slices are just the result from splitting Region_4_15_days.",
- "commands": [
- [
- "mkdir", "-p", "SHPC/Slice_0/Anticyclones",
- "SHPC/Slice_0/Cyclones"
- ],
- [
- "$build_dir/Overlap/Tests/test_read_snapshot",
- "$tests_old_dir/R4_15_splitted/SHPC"
- ]
- ]
- },
- {
- "title": "EG_15_region_4",
- "description":
- "Testing eddy_graph with a sufficient number of dates, 15, on a very small region.",
- "env": {"mpiexec": "$mpiexec"},
- "command":
- [
- "$build_dir/Overlap/eddy_graph.sh", "1",
- "$tests_old_dir/Region_4_15_days/SHPC"
- ],
- "input": "&CONFIG_GRAPH_NML MAX_DELTA=4, cyclone = f/\n&MAIN_NML /\n"
- },
- {
- "title": "EG_15_3_SHPC",
- "description":
- "As EG_15_region_4 but with 3 slices which are just the result of splitting Region_4_15_days.",
- "env": {"mpiexec": "$mpiexec"},
- "command":
- [
- "$build_dir/Overlap/eddy_graph.sh", "1",
- "$tests_old_dir/R4_15_splitted/SHPC"
- ],
- "input": "&CONFIG_GRAPH_NML MAX_DELTA=4, cyclone = f/\n&MAIN_NML /\n"
- },
- {
- "title": "Plot_components_date",
- "description": "plot_components.py with option node and option label with an integer value, so is_node_type is called with an integer value for label.",
- "command":
- [
- "$src_dir/Overlap/plot_components.py",
- "$PWD/EGr2nd15md4np3/edgelist.csv",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones", "--save=png", "--node=204618", "--label_date=20461"
- ]
- },
- {
- "title": "Greece_graph",
- "description":
- "This is a case where the speed is not defined on a whole segment.",
- "command":
- [
- "$build_dir/Overlap/eddy_graph.sh", "1",
- "$tests_old_dir/Greece/SHPC"
- ],
- "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n"
- },
- {
- "title": "Report_graph_node",
- "description": "Test option --node of report_graph.py.",
- "command":
- [
- "$src_dir/Overlap/report_graph.py", "--gv", "--merging",
- "--node=286461", "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv"
- ]
- },
- {
- "title": "Read_extr_proj",
- "description": "Read shapefile extr_proj.",
- "commands":
- [
- ["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- [
- "$build_dir/Overlap/Tests/test_read_eddy",
- "$tests_old_dir/Extr_proj/SHPC"
- ]
- ],
- "input": "&main_nml cyclone = t, grid_lon_lat = f/\n"
- }
-]
+ ]
+ ],
+ "input": "&main_nml ishape = 330 /\n"
+ },
+ "Read_snapshot_15": {
+ "input": "&config_graph_nml cyclone = f/\n&main_nml /\n",
+ "description": "Read a snapshot from an SHPC on a very small region with a sufficient number of dates: 15. $tests_old_dir/Extraction_eddies_region_4/SHPC used by the test Read_snapshot has only 2 dates.",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_snapshot",
+ "$tests_old_dir/Region_4_15_days/SHPC"
+ ]
+ ]
+ },
+ "Read_snapshot_middle": {
+ "input": "&config_graph_nml cyclone = f/\n&main_nml k = 20461/\n",
+ "description": "Like Read_snapshot_15, but we read a date other than the first date.",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_snapshot",
+ "$tests_old_dir/Region_4_15_days/SHPC"
+ ]
+ ]
+ },
+ "R4_15_splitted": {
+ "description": "This is not really a test. Rather it creates input necessary for tests.",
+ "env": {
+ "PYTHONPATH": "$src_dir/Inst_eddies/Analysis"
+ },
+ "command": [
+ "$src_dir/Overlap/Tests/split_SHPC.py",
+ "$tests_old_dir/Region_4_15_days/SHPC"
+ ]
+ },
+ "Read_snapshot_several": {
+ "input": "&config_graph_nml cyclone = f/\n&main_nml k = 20461/\n",
+ "description": "Like Read_snapshot_middle, but we read from several slices. The 3 slices are just the result from splitting Region_4_15_days.",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Anticyclones",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_snapshot",
+ "$tests_old_dir/R4_15_splitted/SHPC"
+ ]
+ ]
+ },
+ "EG_15_region_4": {
+ "description": "Testing eddy_graph with a sufficient number of dates, 15, on a very small region.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Region_4_15_days/SHPC"
+ ],
+ "input": "&CONFIG_GRAPH_NML MAX_DELTA=4, cyclone = f/\n&MAIN_NML /\n"
+ },
+ "EG_15_3_SHPC": {
+ "description": "As EG_15_region_4 but with 3 slices which are just the result of splitting Region_4_15_days.",
+ "env": {
+ "mpiexec": "$mpiexec"
+ },
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/R4_15_splitted/SHPC"
+ ],
+ "input": "&CONFIG_GRAPH_NML MAX_DELTA=4, cyclone = f/\n&MAIN_NML /\n"
+ },
+ "Plot_components_date": {
+ "description": "plot_components.py with option node and option label with an integer value, so is_node_type is called with an integer value for label.",
+ "command": [
+ "$src_dir/Overlap/plot_components.py",
+ "$PWD/EGr2nd15md4np3/edgelist.csv",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "--save=png",
+ "--node=204618",
+ "--label_date=20461"
+ ]
+ },
+ "Greece_graph": {
+ "description": "This is a case where the speed is not defined on a whole segment.",
+ "command": [
+ "$build_dir/Overlap/eddy_graph.sh",
+ "1",
+ "$tests_old_dir/Greece/SHPC"
+ ],
+ "input": "&CONFIG_GRAPH_NML max_delta = 4, cyclone = f/\n&MAIN_NML /\n"
+ },
+ "Report_graph_node": {
+ "description": "Test option --node of report_graph.py.",
+ "command": [
+ "$src_dir/Overlap/report_graph.py",
+ "--gv",
+ "--merging",
+ "--node=286461",
+ "$tests_old_dir/EGr2nd15md4np3_cyclo/edgelist.csv"
+ ]
+ },
+ "Read_extr_proj": {
+ "description": "Read shapefile extr_proj.",
+ "commands": [
+ [
+ "mkdir",
+ "-p",
+ "SHPC/Slice_0/Cyclones"
+ ],
+ [
+ "$build_dir/Overlap/Tests/test_read_eddy",
+ "$tests_old_dir/Extr_proj/SHPC"
+ ]
+ ],
+ "input": "&main_nml cyclone = t, grid_lon_lat = f/\n"
+ }
+}
\ No newline at end of file
diff --git a/Trajectories/Tests/perf_tests.json b/Trajectories/Tests/perf_tests.json
index 1896728b..3a2b5552 100644
--- a/Trajectories/Tests/perf_tests.json
+++ b/Trajectories/Tests/perf_tests.json
@@ -1,34 +1,33 @@
-[
- {
- "title": "Perf_segments",
- "description": "Performance test with adjustable size of input. edgelist_head comes from head of Global_1993_2020_graph_anti/edgelist.csv.",
- "command":
- [
- "$src_dir/Trajectories/segments.py",
- "$large_input_dir/edgelist_head.csv", "segments.gt"
- ]
- },
- {
- "title": "Perf_cost_function",
- "description":
- "Performance test with adjustable size of input.",
- "command":
- [
- "$src_dir/Trajectories/cost_function.py",
- "$PWD/Global_1993_2020_SHPC", "Anticyclones",
- "$tests_old_dir/Perf_segments/segments.gt",
- "segments_cost_functions.gt"
- ],
- "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
- "symlink": ["$PWD/Global_1993_2020_graph_anti/e_overestim.txt"]
- },
- {
- "title": "Perf_trajectories",
- "description": "Performance test with adjustable size of input.",
- "command":
- [
- "$src_dir/Trajectories/trajectories.py",
- "$tests_old_dir/Perf_cost_function/segments_cost_functions.gt"
- ]
- }
-]
+{
+ "Perf_segments": {
+ "description": "Performance test with adjustable size of input. edgelist_head comes from head of Global_1993_2020_graph_anti/edgelist.csv.",
+ "command": [
+ "$src_dir/Trajectories/segments.py",
+ "$large_input_dir/edgelist_head.csv",
+ "segments.gt"
+ ]
+ },
+ "Perf_cost_function": {
+ "description": "Performance test with adjustable size of input.",
+ "command": [
+ "$src_dir/Trajectories/cost_function.py",
+ "$PWD/Global_1993_2020_SHPC",
+ "Anticyclones",
+ "$tests_old_dir/Perf_segments/segments.gt",
+ "segments_cost_functions.gt"
+ ],
+ "env": {
+ "PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"
+ },
+ "symlink": [
+ "$PWD/Global_1993_2020_graph_anti/e_overestim.txt"
+ ]
+ },
+ "Perf_trajectories": {
+ "description": "Performance test with adjustable size of input.",
+ "command": [
+ "$src_dir/Trajectories/trajectories.py",
+ "$tests_old_dir/Perf_cost_function/segments_cost_functions.gt"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/Trajectories/Tests/tests.json b/Trajectories/Tests/tests.json
index 9dc5acdf..3e8dfb5a 100644
--- a/Trajectories/Tests/tests.json
+++ b/Trajectories/Tests/tests.json
@@ -1,133 +1,127 @@
-[
- {
- "title": "Edgelist_Isic_1",
- "command":
- [
- "$src_dir/Trajectories/segments.py",
- "$src_dir/Trajectories/Tests/edgelist_Isic_1.csv",
- "segments.graphml"
- ]
- },
- {
- "title": "Edgelist_Isic_2",
- "command":
- [
- "$src_dir/Trajectories/segments.py",
- "$src_dir/Trajectories/Tests/edgelist_Isic_2.csv",
- "segments.graphml"
- ]
- },
- {
- "title": "Edgelist_Isic_1_nx",
- "description": "Same as Edgelist_Isic_1, except with networkx instead of graph-tool.",
- "command":
- [
- "$src_dir/Trajectories/Tests/segments_networkx.py",
- "$src_dir/Trajectories/Tests/edgelist_Isic_1.csv",
- "segments.gv"
- ]
- },
- {
- "title": "Edgelist_Isic_2_nx",
- "command":
- [
- "$src_dir/Trajectories/Tests/segments_networkx.py",
- "$src_dir/Trajectories/Tests/edgelist_Isic_2.csv",
- "segments.gv"
- ]
- },
- {
- "title": "Segments",
- "command":
- [
- "$src_dir/Trajectories/segments.py", "$tests_old_dir/EGr2nd15md4/edgelist.csv",
- "segments.graphml"
- ]
- },
- {
- "title": "Cost_functions",
- "command":
- [
- "$src_dir/Trajectories/cost_function.py",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones", "$tests_old_dir/Segments/segments.graphml",
- "segments_cost_functions.graphml"
- ],
- "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
- "symlink": ["$tests_old_dir/EGr2nd15md4/e_overestim.txt"],
- "exclude_cmp": ["timings.txt"]
- },
- {
- "title": "Greece_segments",
- "description":
- "This is a case where the speed is not defined on a whole segment.",
- "command":
- [
- "$src_dir/Trajectories/segments.py", "$tests_old_dir/Greece_graph/edgelist.csv",
- "segments.graphml"
- ]
- },
- {
- "title": "Greece_cost_function",
- "description":
- "This is a case where the speed is not defined on a whole segment.",
- "command":
- [
- "$src_dir/Trajectories/cost_function.py",
- "$tests_old_dir/Greece/SHPC", "Anticyclones",
- "$tests_old_dir/Greece_segments/segments.graphml",
- "segments_cost_functions.graphml"
- ],
- "env": {"PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"},
- "symlink": ["$tests_old_dir/Greece_graph/e_overestim.txt"],
- "exclude_cmp": ["timings.txt"]
- },
- {
- "title": "Trajectories",
- "command":
- [
- "$src_dir/Trajectories/trajectories.py",
- "$tests_old_dir/Cost_functions/segments_cost_functions.graphml"
- ]
- },
- {
- "title": "Greece_trajectories",
- "description": "A larger case than Trajectories.",
- "command":
- [
- "$src_dir/Trajectories/trajectories.py",
- "$tests_old_dir/Greece_cost_function/segments_cost_functions.graphml"
- ]
- },
- {
- "title": "Draw_segments",
- "command":
- [
- "$src_dir/Trajectories/draw_segments.py",
- "$PWD/Eurec4A_graph_anti/segments_cost_functions.gt",
- "segments.gv", "-t", "$PWD/Eurec4A_graph_anti/traj_segm.json"
- ]
- },
- {
- "title": "Plot_traj",
- "command":
- [
- "$src_dir/Trajectories/plot_traj.py",
- "$tests_old_dir/Trajectories/expanded_traj.json",
- "$tests_old_dir/Cost_functions/e_overestim.txt",
- "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
- "Anticyclones", "--save=png", "--annotate"
- ]
- },
- {
- "title": "Plot_traj_Greece",
- "command":
- [
- "$src_dir/Trajectories/plot_traj.py",
- "$tests_old_dir/Greece_trajectories/expanded_traj.json",
- "$tests_old_dir/Greece_cost_function/e_overestim.txt",
- "$tests_old_dir/Greece/SHPC", "Anticyclones", "--save=png",
- "--annotate"
- ]
- }
-]
+{
+ "Edgelist_Isic_1": {
+ "command": [
+ "$src_dir/Trajectories/segments.py",
+ "$src_dir/Trajectories/Tests/edgelist_Isic_1.csv",
+ "segments.graphml"
+ ]
+ },
+ "Edgelist_Isic_2": {
+ "command": [
+ "$src_dir/Trajectories/segments.py",
+ "$src_dir/Trajectories/Tests/edgelist_Isic_2.csv",
+ "segments.graphml"
+ ]
+ },
+ "Edgelist_Isic_1_nx": {
+ "description": "Same as Edgelist_Isic_1, except with networkx instead of graph-tool.",
+ "command": [
+ "$src_dir/Trajectories/Tests/segments_networkx.py",
+ "$src_dir/Trajectories/Tests/edgelist_Isic_1.csv",
+ "segments.gv"
+ ]
+ },
+ "Edgelist_Isic_2_nx": {
+ "command": [
+ "$src_dir/Trajectories/Tests/segments_networkx.py",
+ "$src_dir/Trajectories/Tests/edgelist_Isic_2.csv",
+ "segments.gv"
+ ]
+ },
+ "Segments": {
+ "command": [
+ "$src_dir/Trajectories/segments.py",
+ "$tests_old_dir/EGr2nd15md4/edgelist.csv",
+ "segments.graphml"
+ ]
+ },
+ "Cost_functions": {
+ "command": [
+ "$src_dir/Trajectories/cost_function.py",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "$tests_old_dir/Segments/segments.graphml",
+ "segments_cost_functions.graphml"
+ ],
+ "env": {
+ "PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"
+ },
+ "symlink": [
+ "$tests_old_dir/EGr2nd15md4/e_overestim.txt"
+ ],
+ "exclude_cmp": [
+ "timings.txt"
+ ]
+ },
+ "Greece_segments": {
+ "description": "This is a case where the speed is not defined on a whole segment.",
+ "command": [
+ "$src_dir/Trajectories/segments.py",
+ "$tests_old_dir/Greece_graph/edgelist.csv",
+ "segments.graphml"
+ ]
+ },
+ "Greece_cost_function": {
+ "description": "This is a case where the speed is not defined on a whole segment.",
+ "command": [
+ "$src_dir/Trajectories/cost_function.py",
+ "$tests_old_dir/Greece/SHPC",
+ "Anticyclones",
+ "$tests_old_dir/Greece_segments/segments.graphml",
+ "segments_cost_functions.graphml"
+ ],
+ "env": {
+ "PYTHONPATH": "$src_dir/Overlap:$src_dir/Common"
+ },
+ "symlink": [
+ "$tests_old_dir/Greece_graph/e_overestim.txt"
+ ],
+ "exclude_cmp": [
+ "timings.txt"
+ ]
+ },
+ "Trajectories": {
+ "command": [
+ "$src_dir/Trajectories/trajectories.py",
+ "$tests_old_dir/Cost_functions/segments_cost_functions.graphml"
+ ]
+ },
+ "Greece_trajectories": {
+ "description": "A larger case than Trajectories.",
+ "command": [
+ "$src_dir/Trajectories/trajectories.py",
+ "$tests_old_dir/Greece_cost_function/segments_cost_functions.graphml"
+ ]
+ },
+ "Draw_segments": {
+ "command": [
+ "$src_dir/Trajectories/draw_segments.py",
+ "$PWD/Eurec4A_graph_anti/segments_cost_functions.gt",
+ "segments.gv",
+ "-t",
+ "$PWD/Eurec4A_graph_anti/traj_segm.json"
+ ]
+ },
+ "Plot_traj": {
+ "command": [
+ "$src_dir/Trajectories/plot_traj.py",
+ "$tests_old_dir/Trajectories/expanded_traj.json",
+ "$tests_old_dir/Cost_functions/e_overestim.txt",
+ "$tests_old_dir/Extraction_eddies_region_2_noise/SHPC",
+ "Anticyclones",
+ "--save=png",
+ "--annotate"
+ ]
+ },
+ "Plot_traj_Greece": {
+ "command": [
+ "$src_dir/Trajectories/plot_traj.py",
+ "$tests_old_dir/Greece_trajectories/expanded_traj.json",
+ "$tests_old_dir/Greece_cost_function/e_overestim.txt",
+ "$tests_old_dir/Greece/SHPC",
+ "Anticyclones",
+ "--save=png",
+ "--annotate"
+ ]
+ }
+}
\ No newline at end of file
--
GitLab