From 7506392faceac263d4ffd4c498d3729c747cf252 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Wed, 6 Apr 2022 14:51:18 +0200
Subject: [PATCH] Replace keyword `required` by `symlink`
Following update of `test_compare.py`.
---
Convert_Matlab/Tests/long_tests.json | 4 ++--
Convert_Matlab/Tests/short_tests.json | 6 +++---
Inst_eddies/Analysis/tests.json | 2 +-
Inst_eddies/Tests/long_tests.json | 6 +++---
Inst_eddies/Tests/short_tests.json | 30 +++++++++++++--------------
Overlap/Tests/short_tests.json | 8 +++----
6 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Convert_Matlab/Tests/long_tests.json b/Convert_Matlab/Tests/long_tests.json
index 7283c026..24312986 100644
--- a/Convert_Matlab/Tests/long_tests.json
+++ b/Convert_Matlab/Tests/long_tests.json
@@ -7,7 +7,7 @@
"/data/lmd-oce/EUREC4A_OA/DATA_SAT_NewExport_Atalante/TOEddies/Eddies/adt_2019-12-15.mat",
"2019-12-16"
],
- "required": ["$src_dir/Convert_Matlab/inst_eddies.m"]
+ "symlink": ["$src_dir/Convert_Matlab/inst_eddies.m"]
},
{
"title": "Inst_eddies_v6_global",
@@ -18,7 +18,7 @@
"$src_dir/Convert_Matlab/inst_eddies_v6.py",
"/proju/lmd-oce/data/TOEddies/Global/Delayed-Time/Eddies/adt_19930102.mat"
],
- "required":
+ "symlink":
[
"$src_dir/Convert_Matlab/inst_eddies.m",
"$src_dir/Convert_Matlab/Tests/node_id_param.json"
diff --git a/Convert_Matlab/Tests/short_tests.json b/Convert_Matlab/Tests/short_tests.json
index af697d72..d545f1bf 100644
--- a/Convert_Matlab/Tests/short_tests.json
+++ b/Convert_Matlab/Tests/short_tests.json
@@ -2,7 +2,7 @@
{
"title": "Graph_from_Matlab_v6_cyclo",
"command": "$src_dir/Convert_Matlab/overlap_v6.py",
- "required":
+ "symlink":
[
[
"$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_cyclo.mat",
@@ -19,7 +19,7 @@
{
"title": "Graph_from_Matlab_v6_anti",
"command": "$src_dir/Convert_Matlab/overlap_v6.py",
- "required":
+ "symlink":
[
[
"$src_dir/Convert_Matlab/Tests/Eurec4A_OA/id_child_anti.mat",
@@ -43,7 +43,7 @@
},
{
"title": "Survival", "command": "$src_dir/Convert_Matlab/survival.py",
- "required":
+ "symlink":
[
"$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_anti.mat",
"$src_dir/Convert_Matlab/Tests/Eurec4A_OA/traj_cyclo.mat"
diff --git a/Inst_eddies/Analysis/tests.json b/Inst_eddies/Analysis/tests.json
index e751b6f8..97d10423 100644
--- a/Inst_eddies/Analysis/tests.json
+++ b/Inst_eddies/Analysis/tests.json
@@ -46,7 +46,7 @@
"--grid", "--save=png"
],
"description": "With grid option.",
- "required": [["$src_dir/Inst_eddies/Tests/Input/h_region_4.nc", "h.nc"]]
+ "symlink": [["$src_dir/Inst_eddies/Tests/Input/h_region_4.nc", "h.nc"]]
},
{
"title": "Plot_eddy_contours_wind",
diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index aafedadf..51293c10 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -18,7 +18,7 @@
"$build_dir/Inst_eddies/inst_eddies"
],
"title": "Extraction_eddies_region_3",
- "required":
+ "symlink":
[
["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
@@ -34,7 +34,7 @@
"$build_dir/Inst_eddies/inst_eddies"
],
"title": "Extraction_eddies_region_3_min",
- "required":
+ "symlink":
[
["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
@@ -51,7 +51,7 @@
"$build_dir/Inst_eddies/inst_eddies"
],
"title": "Extraction_eddies_region_5",
- "required":
+ "symlink":
[
["$src_dir/Inst_eddies/Tests/Input/h_region_5.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc", "uv.nc"]
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 668552f6..12833e5d 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -2,7 +2,7 @@
{
"input": "&main_nml /\n20454\n",
"title": "Get_1_outerm",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"h.nc"
@@ -20,7 +20,7 @@
"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 /\n20454\n",
"title": "Get_1_outerm_noise_2_8",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"h.nc"
@@ -34,7 +34,7 @@
"description": "Negative value for extremum 2.",
"input": "&main_nml /\n20454\n",
"title": "Get_1_outerm_noise_2",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"h.nc"
@@ -50,7 +50,7 @@
{
"description":
"3 contours at that level. 2 contain the inside point, one of which contains the 2 outside points.",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
"outside_points.csv"
@@ -66,7 +66,7 @@
{
"description":
"Select another good contour. Case where one of the contours tested does not contain inside point.",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/outside_points_2.csv",
"outside_points.csv"
@@ -80,7 +80,7 @@
"stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour_2.txt"
},
{
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/outside_points_1.csv",
"outside_points.csv"
@@ -192,7 +192,7 @@
{
"input": "&main_nml /\n",
"title": "Mean_speed",
- "required":
+ "symlink":
[
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
@@ -208,7 +208,7 @@
{
"input": "&main_nml /\n",
"title": "Mean_speed_alt",
- "required":
+ "symlink":
[
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
@@ -222,7 +222,7 @@
]
},
{
- "required":
+ "symlink":
[
[
"$src_dir/Inst_eddies/Tests/Input/h_outermost.nc",
@@ -248,7 +248,7 @@
]
},
{
- "required":
+ "symlink":
[
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
@@ -271,7 +271,7 @@
]
},
{
- "required":
+ "symlink":
[
["$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc", "uv.nc"],
@@ -294,7 +294,7 @@
{
"create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
"input": "20454\n",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"h.nc"
@@ -315,7 +315,7 @@
"Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
"create_file": ["main_nml.txt", "&main_nml /\n"],
"input": "20454\n",
- "required":
+ "symlink":
[
[
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
@@ -335,7 +335,7 @@
{
"create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
"input": "20454\n",
- "required": [
+ "symlink": [
["$src_dir/Inst_eddies/Tests/Input/h_region_2.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_2.nc", "uv.nc"]
],
@@ -416,7 +416,7 @@
"&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
],
"input": "20454\n",
- "required": [
+ "symlink": [
[
"$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
"h.nc"
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index 31bead8c..ed03d812 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -472,7 +472,7 @@
[
"$src_dir/Overlap/report_graph.py", "--gv", "--merging"
],
- "required":
+ "symlink":
[
"$PWD/EGr2nd15md4np3_cyclo/edgelist.csv",
"$PWD/EGr2nd15md4np3_cyclo/node_id_param.json"
@@ -484,7 +484,7 @@
[
"$src_dir/Overlap/report_graph.py", "--gv", "--merging"
],
- "required":
+ "symlink":
[
"$PWD/EGr2nd15md4np3/edgelist.csv",
"$PWD/EGr2nd15md4np3/node_id_param.json"
@@ -498,7 +498,7 @@
"$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti",
"--save=png"
],
- "required":
+ "symlink":
[
"$PWD/EGr2nd15md4np3/edgelist.csv",
"$PWD/EGr2nd15md4np3/node_id_param.json"
@@ -508,7 +508,7 @@
"title": "Report_graph_int",
"command":
["$src_dir/Overlap/report_graph.py", "--gv", "--merging"],
- "required":
+ "symlink":
[
"$tests_old_dir/Graph_from_Matlab_v6_anti/edgelist.csv",
"$tests_old_dir/Graph_from_Matlab_v6_anti/node_id_param.json"
--
GitLab