diff --git a/CMakeLists.txt b/CMakeLists.txt
index a74dc2929bbfe4b07dd8ea208a856093fdf02f4b..2cde5dea935c62f4fb79b858960e7da148d7bab8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,16 +17,16 @@ pkg_check_modules(netcdf-fortran IMPORTED_TARGET netcdf-fortran)
find_path(fortrangis_INCLUDE_DIR shapelib.mod REQUIRED)
-add_executable(extraction_eddies extraction_eddies.f90 write_eddy.f90
+add_executable(inst_eddies inst_eddies.f90 write_eddy.f90
local_extrema.f90 set_max_speed.f90 get_1_outerm.f90 max_speed_contour_ssh.f90
good_contour.f90 spher_polyline_area.f90 mean_speed.f90 inside_4.f90
set_all_outerm.f90 derived_types.f90 shp_tr_create.f90 nearby_extr.f90
get_var.f90 shp_tr_close.f90)
-target_include_directories(extraction_eddies PRIVATE
+target_include_directories(inst_eddies PRIVATE
${fortrangis_INCLUDE_DIR})
-target_link_libraries(extraction_eddies PRIVATE contour_531 geometry netcdf95
+target_link_libraries(inst_eddies PRIVATE contour_531 geometry netcdf95
shapelib_03 numer_rec_95 nr_util jumble)
add_executable(eddy_graph eddy_graph.f90 shp_tr_open.f90
diff --git a/Tests/long_tests.json b/Tests/long_tests.json
index 6475eaea5b076150170694185240544310694d4f..193c3e7558b7d090f255ec9b7e8a4e9faab9b93c 100644
--- a/Tests/long_tests.json
+++ b/Tests/long_tests.json
@@ -6,7 +6,7 @@
"input": "&main_nml min_amp = 0.001/\n"
},
{
- "commands": [["mkdir", "SHP_triplet"], "$build_dir/extraction_eddies"],
+ "commands": [["mkdir", "SHP_triplet"], "$build_dir/inst_eddies"],
"title": "Extraction_eddies_region_3",
"required": [["$src_dir/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Tests/Input/uv_region_3.nc", "uv.nc"]],
@@ -14,7 +14,7 @@
"description": "Larger region, 120 x 120. Includes degenerate extrema."
},
{
- "commands": [["mkdir", "SHP_triplet"], "$build_dir/extraction_eddies"],
+ "commands": [["mkdir", "SHP_triplet"], "$build_dir/inst_eddies"],
"title": "Extraction_eddies_region_3_min",
"required": [["$src_dir/Tests/Input/h_region_3.nc", "h.nc"],
["$src_dir/Tests/Input/uv_region_3.nc", "uv.nc"]],
@@ -23,7 +23,7 @@
"Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
},
{
- "commands": [["mkdir", "SHP_triplet"], "$build_dir/extraction_eddies"],
+ "commands": [["mkdir", "SHP_triplet"], "$build_dir/inst_eddies"],
"title": "Extraction_eddies_region_5",
"required": ["$src_dir/Tests/Input/Region_5/h.nc",
"$src_dir/Tests/Input/Region_5/uv.nc"],
diff --git a/Tests/short_tests.json b/Tests/short_tests.json
index d39fe27a3c05c324668ffe516ee9151d60dc8492..e16eebc7fd6c6dbe913df1521fea9d222b56055f 100644
--- a/Tests/short_tests.json
+++ b/Tests/short_tests.json
@@ -207,7 +207,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
@@ -223,7 +223,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
@@ -238,7 +238,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
@@ -253,7 +253,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
@@ -285,7 +285,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
@@ -453,7 +453,7 @@
"mkdir",
"SHP_triplet"
],
- "$build_dir/extraction_eddies"
+ "$build_dir/inst_eddies"
]
},
{
diff --git a/extraction_eddies.f90 b/inst_eddies.f90
similarity index 96%
rename from extraction_eddies.f90
rename to inst_eddies.f90
index af4f7dde027b3aca2dc7da1812fda6b91f3298e7..c820d754972b394db6b0174a5b59539b76ca4002 100644
--- a/extraction_eddies.f90
+++ b/inst_eddies.f90
@@ -1,4 +1,4 @@
-program extraction_eddies
+program inst_eddies
use, intrinsic:: ieee_arithmetic, only: IEEE_SUPPORT_DATATYPE, &
ieee_support_nan, ieee_value, IEEE_QUIET_NAN
@@ -80,7 +80,7 @@ program extraction_eddies
!--------------------------------------------------------------
call assert(IEEE_SUPPORT_DATATYPE(0.), ieee_support_nan(0.), &
- "extraction_eddies: not enough IEEE support")
+ "inst_eddies: not enough IEEE support")
! Trick to verify that the directory "SHP_triplet" exists:
call new_unit(unit)
@@ -124,7 +124,7 @@ program extraction_eddies
call nf95_get_var(ncid, varid, lat_max, start = [nlat])
call assert(lon_max > lon_min .and. lat_max > lat_min, &
- "extraction_eddies coordinate order")
+ "inst_eddies coordinate order")
step = [(lon_max - lon_min) / (nlon - 1), (lat_max - lat_min) / (nlat - 1)] &
* deg_to_rad
@@ -133,7 +133,7 @@ program extraction_eddies
periodic = nint(twopi / step(1)) == nlon
print *, "periodic = ", periodic
- call assert(2 * max_radius(1) * step(1) < pi, "extraction_eddies max_radius")
+ call assert(2 * max_radius(1) * step(1) < pi, "inst_eddies max_radius")
! (Let us require this even if not periodic. This is clearer.)
copy = merge(max_radius(1), 0, periodic)
@@ -212,4 +212,4 @@ program extraction_eddies
CALL shp_tr_close(hshp)
print *, 'Created shapefiles in SHP_triplet.'
-end program extraction_eddies
+end program inst_eddies