diff --git a/Inst_eddies/Tests/test_mean_speed.f90 b/Inst_eddies/Tests/test_mean_speed.f90 index 258e0e00186462d12752b58870cace7923e36721..3c78bd8868e2c0d1555d52834c61ffad4d8e5cea 100644 --- a/Inst_eddies/Tests/test_mean_speed.f90 +++ b/Inst_eddies/Tests/test_mean_speed.f90 @@ -13,7 +13,7 @@ program test_mean_speed implicit none real corner(2) ! in degrees - real:: center(2) = [9.625, - 33.875] ! longitude and latitude, in degrees + real:: center_deg(2) = [9.625, - 33.875] ! longitude and latitude, in degrees integer ncid, varid, dimid integer:: ishape = 0 integer nlon, nlat, i @@ -29,7 +29,7 @@ program test_mean_speed character(len = :), allocatable:: contour_filename real min_lon_p ! minimum longitude of p, in degrees - namelist /main_nml/ center, ishape + namelist /main_nml/ center_deg, ishape !--------------------------------------------------------------------- @@ -78,11 +78,11 @@ program test_mean_speed + ceiling((corner(1) - min_lon_p) / 360.) * 360. ! Check that extremum is in polyline and grid: - if (corner(1) > center(1) .or. center(1) > lon_max & - .or. minval(p%part(1)%points(1, :)) > center(1) & - .or. center(1) > maxval(p%part(1)%points(1, :))) then + if (corner(1) > center_deg(1) .or. center_deg(1) > lon_max & + .or. minval(p%part(1)%points(1, :)) > center_deg(1) & + .or. center_deg(1) > maxval(p%part(1)%points(1, :))) then print *, "corner(1) = ", corner(1) - print *, "center(1) = ", center(1) + print *, "center_deg(1) = ", center_deg(1) print *, "lon_max = ", lon_max print *, "minval(p%part(1)%points(1, :)) = ", & minval(p%part(1)%points(1, :)) @@ -97,6 +97,6 @@ program test_mean_speed forall (i = 1:p%part(1)%n_points) points_xy(:, i) = (p%part(1)%points(:, i) & - corner) / step + 1. print *, "mean azimuthal speed = ", mean_speed(u, v, p%part(1), points_xy, & - center * deg_to_rad, corner * deg_to_rad, step * deg_to_rad), "m s-1" + center_deg * deg_to_rad, corner * deg_to_rad, step * deg_to_rad), "m s-1" end program test_mean_speed