Shapefile test_max_speed_contour no longer exists. Values of points in

test_set_outermost_contour are in degrees.

Sources/Tests/test_mean_speed.f

@@ -30,7 +30,7 @@ program test_mean_speed
 
   call nf95_close(ncid)
 
-  call shp_open_03("test_max_speed_contour_ssh", "rb", hshp)
+  call shp_open_03("test_set_outermost_contour", "rb", hshp)
   call shp_read_object_03(hshp, 0, psobject)
   ! Note: this is the outermost contour, not the maximum speed contour.
   CALL shpclose(hshp)
@@ -38,8 +38,8 @@ program test_mean_speed
   p%n_points = psobject%nvertices
   p%closed = .true.
   allocate(p%points(2, p%n_points))
-  p%points(1, :) = psobject%padfx
-  p%points(2, :) = psobject%padfy
+  p%points(1, :) = psobject%padfx * radian_per_degree
+  p%points(2, :) = psobject%padfy * radian_per_degree
   
   m = mean_speed(u(21:49, 215:231, 1), v(21:49, 215:231, 1), p, &
        center = [9.625, - 33.875] * radian_per_degree, &

Sources/Tests/test_mean_speed.py

@@ -21,16 +21,16 @@ lat_rad = lat * np.pi / 180
 
 values = np.stack((u, v), axis = -1)
 
-sf = shapefile.Reader("test_max_speed_contour_ssh")
+sf = shapefile.Reader("test_set_outermost_contour")
 # This is the outermost contour, not the maximum speed contour.
 p = sf.shape(0)
 p = np.array(p.points)
 
-lon_interp_rad = p[:, 0]
-lat_interp_rad = p[:, 1]
+lon_interp = p[:, 0]
+lat_interp = p[:, 1]
 
-lon_interp = lon_interp_rad * 180 / np.pi
-lat_interp = lat_interp_rad * 180 / np.pi
+lon_interp_rad = lon_interp / 180 * np.pi
+lat_interp_rad = lat_interp / 180 * np.pi
 
 xi = np.column_stack((lat_interp_rad, lon_interp_rad))
 values_x = interpolate.interpn((lat_rad, lon_rad), values, xi)

Sources/Tests/tests_detection_eddies.sh

-set -xe
+set -e
 
 compil_prod_dir=~/Downloads/Compil_prod/Detection_eddies
 
-src_tests_dir=~/Documents/Informatique_fonctionnement/Programs/Detection_eddies/Sources/Tests
+src_tests_dir=`dirname $0`
 
 # From low-level to high-level tests, minding that some tests use
 # output from previous tests:
 
 $compil_prod_dir/test_good_contour
+for suffix in dbf shp shx
+do
+    diff Old/test_good_contour.$suffix test_good_contour.$suffix
+done
 
 $compil_prod_dir/test_local_extrema h_2006_01_01.nc <<EOF
 &main_nml /
 EOF
-$src_tests_dir/test_local_extrema.py h_2006_01_01.nc
-
-$compil_prod_dir/test_inside
-$src_tests_dir/test_inside.py
-
-$compil_prod_dir/test_outermost_contour >test_outermost_contour_stdout.txt
-
-$compil_prod_dir/test_max_speed_contour_ssh \
-    >test_max_speed_contour_ssh_stdout.txt
+for suffix in nc csv
+do
+    diff Old/test_local_extrema.$suffix test_local_extrema.$suffix
+done
+##$src_tests_dir/test_local_extrema.py h_2006_01_01.nc
+
+$compil_prod_dir/test_inside >test_inside_stdout.txt
+diff Old/test_inside_stdout.txt test_inside_stdout.txt
+##$src_tests_dir/test_inside.py
+
+$compil_prod_dir/test_set_outermost_contour h_2006_01_01.nc \
+					    Old/test_local_extrema.nc \
+    >test_set_outermost_contour_stdout.txt <<EOF
+&MAIN_NML /
+EOF
+for suffix in _stdout.txt .dbf .shp .shx
+do
+    diff Old/test_set_outermost_contour$suffix test_set_outermost_contour$suffix
+done
+
+$compil_prod_dir/test_max_speed_contour_ssh h_2006_01_01.nc uv_2006_01_01.nc \
+    >test_max_speed_contour_ssh_stdout.txt <<EOF
+&MAIN_NML /
+EOF
+diff Old/test_max_speed_contour_ssh_stdout.txt \
+     test_max_speed_contour_ssh_stdout.txt
 
 $compil_prod_dir/test_mean_speed >test_mean_speed_stdout.txt
-$src_tests_dir/test_mean_speed.py
+##$src_tests_dir/test_mean_speed.py
 
-$compil_prod_dir/test_get_eddy >test_get_eddy_stdout.txt
-$src_tests_dir/test_get_eddy.py
+##$src_tests_dir/test_get_eddy.py
 
-$compil_prod_dir/test_get_snapshot
-$src_tests_dir/test_get_snapshot.py
+##$compil_prod_dir/test_get_snapshot
+##$src_tests_dir/test_get_snapshot.py