Change default values of min_amp and min_radius in program extraction_eddies.

Tests/long_tests.json

@@ -10,7 +10,7 @@
 	"title": "Extraction_eddies_region_3",
 	"required": [["$input_dir/h_region_3.nc", "h.nc"],
 		     ["$input_dir/uv_region_3.nc", "uv.nc"]],
-	"input": "&main_nml /\n",
+	"input": "&main_nml min_amp = 0., min_radius = 20. /\n",
 	"description": "Larger region, 120 x 120. Includes degenerate extrema."
     },
     {
@@ -18,7 +18,7 @@
 	"title": "Extraction_eddies_region_3_min",
 	"required": [["$input_dir/h_region_3.nc", "h.nc"],
 		     ["$input_dir/uv_region_3.nc", "uv.nc"]],
-	"input": "&main_nml min_amp = 1e-3/\n",
+	"input": "&main_nml min_radius = 20./\n",
 	"description": "Same as Extraction_eddies_region_3 except with 1 mm minimum amplitude."
     },
     {
@@ -26,7 +26,7 @@
 	"title": "Extraction_eddies_region_5",
 	"required": [["$input_dir/h_region_5.nc", "h.nc"],
 		     ["$input_dir/uv_region_5.nc", "uv.nc"]],
-	"input": "&main_nml min_amp = 1e-3/\n",
+	"input": "&main_nml min_radius = 20./\n",
 	"description": "Same as Extraction_eddies_region_4 with larger domain."
     }
 ]

Tests/short_tests.json

@@ -141,14 +141,14 @@
 	"title": "Extraction_eddies_region_1",
 	"required": [["$input_dir/h_region_1.nc", "h.nc"],
 		     ["$input_dir/uv_region_1.nc", "uv.nc"]],
-	"input": "&main_nml /\n"
+	"input": "&main_nml min_amp = 0., min_radius = 20./\n"
     },
     {
 	"args": "$compil_prod_dir/extraction_eddies",
 	"title": "Extraction_eddies_region_1_noise",
 	"required": [["$input_dir/h_region_1.nc", "h.nc"],
 		     ["$input_dir/uv_region_1.nc", "uv.nc"]],
-	"input": "&main_nml min_amp = 1e-3/\n",
+	"input": "&main_nml min_radius = 20./\n",
 	"description" : "Same as Extraction_eddies_region_1 but with non-zero minimal amplitude."
     },
     {
@@ -156,14 +156,14 @@
 	"title": "Extraction_eddies_region_2",
 	"required": [["$input_dir/h_region_2.nc", "h.nc"],
 		     ["$input_dir/uv_region_2.nc", "uv.nc"]],
-	"input": "&main_nml /\n"
+	"input": "&main_nml min_amp = 0., min_radius = 20. /\n"
     },
     {
 	"args": "$compil_prod_dir/extraction_eddies",
 	"title": "Extraction_eddies_region_2_noise",
 	"required": [["$input_dir/h_region_2.nc", "h.nc"],
 		     ["$input_dir/uv_region_2.nc", "uv.nc"]],
-	"input": "&main_nml min_amp = 1e-3/\n"
+	"input": "&main_nml min_radius = 20./\n"
     },
     {
 	"args": ["$compil_prod_dir/test_inside_4",
@@ -181,7 +181,7 @@
 	"args": "$compil_prod_dir/extraction_eddies",
 	"title": "Extraction_eddies_region_4",
 	"required": ["$input_dir/Region_4/h.nc", "$input_dir/Region_4/uv.nc"],
-	"input": "&main_nml min_amp = 1e-3/\n",
+	"input": "&main_nml min_radius = 20./\n",
 	"description": "Part of the domain has missing values."
     },
     {"args": "$compil_prod_dir/test_weight", "title": "Weight"},
@@ -349,7 +349,7 @@
 	"title": "Extraction_eddies_periodic",
 	"required": [["$input_dir/h_2006_01_01_coarse.nc", "h.nc"],
 		     ["$input_dir/uv_2006_01_01_coarse.nc", "uv.nc"]],
-	"input": "&main_nml MAX_RADIUS = 4, 4/\n",
+	"input": "&main_nml min_amp = 0., min_radius = 20., MAX_RADIUS = 4, 4/\n",
 	"description": "Periodic domain."
     }
 ]

extraction_eddies.f

@@ -28,11 +28,11 @@ program extraction_eddies
   TYPE(shpfileobject) hshp_max_speed ! shapefile max_speed_contour_$m
   integer i, k
 
-  real:: min_amp = 0.
+  real:: min_amp = 0.001
   ! minimum amplitude of ssh, between extremum and outermost contour,
   ! in m
 
-  real:: min_radius = 20.
+  real:: min_radius = 25.
   ! minimum radius of the equal-area disk for an outermost contour, in km
 
   integer ncid, dimid, varid, nlon, nlat, copy