From a308c4b0bafa5f8548799130c364236d4457b3c4 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Fri, 22 Oct 2021 23:25:19 +0200
Subject: [PATCH] "create_file" instead of "input" for config
Following commit b0e3ce55.
---
Inst_eddies/Tests/long_tests.json | 14 +++++++-------
Inst_eddies/Tests/short_tests.json | 24 ++++++++++++++++--------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index dd6ca63a..48fab7d6 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -9,7 +9,7 @@
]
],
"title": "Set_all_outerm",
- "input": "&main_nml min_radius = 20./\n"
+ "create_file": ["main_nml.txt", "&main_nml min_radius = 20./\n"]
},
{
"commands":
@@ -23,7 +23,7 @@
["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
],
- "input": "&main_nml min_amp = 0./\n",
+ "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
"description": "Larger region, 120 x 120. Includes degenerate extrema."
},
{
@@ -38,7 +38,7 @@
["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_3.nc", "uv.nc"]
],
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"description":
"Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
},
@@ -54,11 +54,11 @@
["$src_dir/Inst_eddies/Tests/Input/h_region_5.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc", "uv.nc"]
],
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"description": "Same as Extraction_eddies_region_4 with larger domain."
},
{
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Extraction_eddies_region_2_noise",
"command":
[
@@ -70,7 +70,7 @@
]
},
{
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Region_6",
"command":
[
@@ -81,7 +81,7 @@
]
},
{
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Missing_file",
"command":
[
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index fc0bb380..7a955b80 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -253,7 +253,7 @@
]
},
{
- "input": "&main_nml min_amp = 0./\n",
+ "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
"required": [
["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
@@ -267,7 +267,7 @@
{
"description":
"Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"required": [
["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc", "uv.nc"]
@@ -279,7 +279,7 @@
]
},
{
- "input": "&main_nml min_amp = 0./\n",
+ "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
"required": [
["$src_dir/Inst_eddies/Tests/Input/h_region_2.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_2.nc", "uv.nc"]
@@ -292,7 +292,7 @@
},
{
"description": "Part of the domain has missing values.",
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Extraction_eddies_region_4",
"command":
[
@@ -306,7 +306,7 @@
{
"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.",
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Inst_eddies_py",
"command":
[
@@ -316,7 +316,7 @@
]
},
{
- "input": "&main_nml /\n",
+ "create_file": ["main_nml.txt", "&main_nml /\n"],
"title": "Inst_eddies_loop",
"command":
[
@@ -335,7 +335,11 @@
},
{
"description": "test_set_all_outerm with periodicity.",
- "input": "&main_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n",
+ "create_file":
+ [
+ "main_nml.txt",
+ "&main_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
+ ],
"title": "Set_all_outerm_periodic",
"commands":
[
@@ -348,7 +352,11 @@
},
{
"description": "Periodic domain.",
- "input": "&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n",
+ "create_file":
+ [
+ "main_nml.txt",
+ "&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
+ ],
"required": [
[
"$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc",
--
GitLab