diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index ea8f7c77558b5c29b79d90ceed6e59df280543c4..172eb47e24b997f20ac04fa8a94793230bb1dd4f 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -6,7 +6,7 @@
"$build_dir/Inst_eddies/Tests/test_set_all_outerm"
],
"title": "Set_all_outerm",
- "create_file": ["main_nml.txt", "&main_nml min_radius = 20./\n"],
+ "create_file": ["config_nml.txt", "&config_nml min_radius = 20./\n"],
"symlink":
[
["$src_dir/Inst_eddies/Tests/Input/h_region_3.nc", "h.nc"],
@@ -25,7 +25,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"]
],
- "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
+ "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."
},
@@ -41,7 +41,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"]
],
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "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."
@@ -58,12 +58,12 @@
["$src_dir/Inst_eddies/Tests/Input/h_region_5.nc", "h.nc"],
["$src_dir/Inst_eddies/Tests/Input/uv_region_5.nc", "uv.nc"]
],
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"input": "&dates_nml date = 20454/\n",
"description": "Same as Extraction_eddies_region_4 with larger domain."
},
{
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Extraction_eddies_region_2_noise",
"command":
[
@@ -76,7 +76,7 @@
"input": "20454\n"
},
{
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Region_6",
"command":
[
@@ -88,7 +88,7 @@
"input": "20454\n"
},
{
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Missing_file",
"command":
[
@@ -112,6 +112,6 @@
"--last_date=1993-03-31", "--bbox", "20", "30", "35", "42",
"$large_input_dir/dt_global_allsat_phy_l4_19930101_20210726.nc"
],
- "create_file": ["main_nml.txt", "&main_nml /\n"]
+ "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 adad7bac5ada615e9b37fa2e4391a93a72197e3d..5891356c76a570eb7a9ed170cec4bce95e730d65 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -310,7 +310,7 @@
]
},
{
- "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
+ "create_file": ["config_nml.txt", "&config_nml min_amp = 0./\n"],
"input": "&dates_nml date = 20454/\n",
"symlink": [
[
@@ -331,7 +331,7 @@
{
"description":
"Same as Extraction_eddies_region_1 but with non-zero minimal amplitude.",
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"input": "&dates_nml date = 20454/\n",
"symlink":
[
@@ -351,7 +351,7 @@
]
},
{
- "create_file": ["main_nml.txt", "&main_nml min_amp = 0./\n"],
+ "create_file": ["config_nml.txt", "&config_nml min_amp = 0./\n"],
"input": "&dates_nml date = 20454/\n",
"symlink": [
["$src_dir/Inst_eddies/Tests/Input/h_region_2.nc", "h.nc"],
@@ -365,7 +365,7 @@
},
{
"description": "Part of the domain has missing values.",
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Extraction_eddies_region_4",
"command":
[
@@ -379,7 +379,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.",
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Inst_eddies_py",
"command":
[
@@ -390,7 +390,7 @@
"input": "20454\n"
},
{
- "create_file": ["main_nml.txt", "&main_nml /\n"],
+ "create_file": ["config_nml.txt", "&config_nml /\n"],
"title": "Inst_eddies_loop",
"command":
[
@@ -413,8 +413,8 @@
"description": "test_set_all_outerm with periodicity.",
"create_file":
[
- "main_nml.txt",
- "&main_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
+ "config_nml.txt",
+ "&config_nml MAX_RADIUS_deg = 80., 72., min_radius = 20./\n"
],
"title": "Set_all_outerm_periodic",
"commands":
@@ -435,8 +435,8 @@
"description": "Periodic domain.",
"create_file":
[
- "main_nml.txt",
- "&main_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
+ "config_nml.txt",
+ "&config_nml min_amp = 0., MAX_RADIUS_deg = 80., 72./\n"
],
"input": "&dates_nml date = 20454/\n",
"symlink": [
diff --git a/Inst_eddies/config.f90 b/Inst_eddies/config.f90
index 5854cebd7234fce9a3b4bb28211c50ebf0f513df..216360ac8c4ec671644a4446253c0836225d9cab 100644
--- a/Inst_eddies/config.f90
+++ b/Inst_eddies/config.f90
@@ -12,8 +12,8 @@ module config_m
real, protected:: min_radius = 25.
! minimum radius of the equal-area disk for an outermost contour, in km
- namelist /main_nml/ min_amp, max_radius_deg, min_radius
- private main_nml, write_nml
+ namelist /config_nml/ min_amp, max_radius_deg, min_radius
+ private config_nml, write_nml
contains
@@ -34,12 +34,12 @@ contains
if (exist) then
open(unit, file = "SHPC_cyclo/used_nml.txt", status = "old", &
action = "read", position = "rewind")
- read(unit, nml = main_nml)
+ read(unit, nml = config_nml)
close(unit)
else
- open(unit, file = "main_nml.txt", status = "old", action = "read", &
+ open(unit, file = "config_nml.txt", status = "old", action = "read", &
position = "rewind")
- read(unit, nml = main_nml)
+ read(unit, nml = config_nml)
close(unit)
call write_nml(shpc_dir = "SHPC_cyclo")
call write_nml(shpc_dir = "SHPC_anti")
@@ -76,7 +76,7 @@ contains
stop 1
end if
- write(unit, nml = main_nml)
+ write(unit, nml = config_nml)
close(unit)
end subroutine write_nml
diff --git a/Inst_eddies/inst_eddies.py.in b/Inst_eddies/inst_eddies.py.in
index ad8a5e5c63070ffbd9871959f8fa57b46ee7e609..8cc6cc9061e204e571c4147d509f5ea82f06e368 100644
--- a/Inst_eddies/inst_eddies.py.in
+++ b/Inst_eddies/inst_eddies.py.in
@@ -27,10 +27,10 @@ def loop_inst_eddies(files, bbox, d):
if not os.access(inst_eddies_exe, os.X_OK):
sys.exit(inst_eddies_exe + " not found or not executable")
- if os.access("main_nml.txt", os.R_OK):
- print("Will use main_nml.txt.")
+ if os.access("config_nml.txt", os.R_OK):
+ print("Will use config_nml.txt.")
else:
- sys.exit('inst_eddies.py: "main_nml.txt" not found')
+ sys.exit('inst_eddies.py: "config_nml.txt" not found')
nco_instance = nco.Nco()