[Dart-dev] DART/branches Revision: 12856

[dart at ucar.edu]

nancy at ucar.edu
2018-09-25 16:17:43 -0600 (Tue, 25 Sep 2018)
272
model_mod: remove string3 from an error_handler() call
when it was uninitialized.

quad_utils_mod: for the irregular case, make sure the
corners of the quad are returned in counter-clockwise
order, starting with the lower left.  the interpolation
routine counts on this.




Modified: DART/branches/roms_interpolation/models/ROMS/model_mod.f90
===================================================================
--- DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-25 20:52:36 UTC (rev 12855)
+++ DART/branches/roms_interpolation/models/ROMS/model_mod.f90	2018-09-25 22:17:43 UTC (rev 12856)
@@ -1687,15 +1687,15 @@
 if (do_output() .and. debug > 0) then
     write(string1,*)'    min/max ULON ',minval(ULON), maxval(ULON)
     write(string2,*)    'min/max ULAT ',minval(ULAT), maxval(ULAT)
-    call error_handler(E_MSG,'get_grid',string1, text2=string2, text3=string3)
+    call error_handler(E_MSG,'get_grid',string1, text2=string2)
 
     write(string1,*)'    min/max VLON ',minval(VLON), maxval(VLON)
     write(string2,*)    'min/max VLAT ',minval(VLAT), maxval(VLAT)
-    call error_handler(E_MSG,'get_grid',string1, text2=string2, text3=string3)
+    call error_handler(E_MSG,'get_grid',string1, text2=string2)
 
     write(string1,*)'    min/max TLON ',minval(TLON), maxval(TLON)
     write(string2,*)    'min/max TLAT ',minval(TLAT), maxval(TLAT)
-    call error_handler(E_MSG,'get_grid',string1, text2=string2, text3=string3)
+    call error_handler(E_MSG,'get_grid',string1, text2=string2)
 
     write(string1,*)    'min/max BATHY ',minval(BATHY), maxval(BATHY)
     call error_handler(E_MSG,'get_grid',string1)

Modified: DART/branches/roms_interpolation/models/ROMS/quad_utils_mod.f90
===================================================================
--- DART/branches/roms_interpolation/models/ROMS/quad_utils_mod.f90	2018-09-25 20:52:36 UTC (rev 12855)
+++ DART/branches/roms_interpolation/models/ROMS/quad_utils_mod.f90	2018-09-25 22:17:43 UTC (rev 12856)
@@ -75,7 +75,6 @@
 ! message strings
 character(len=512) :: string1, string2, string3
 
-character(len=*), parameter :: routine = "quad_utils_mod"
 logical, save :: module_initialized = .false.
 
 integer  :: debug = 0   ! turn up for more and more debug messages
@@ -351,7 +350,7 @@
       interp_handle%ir%lons_1D(num_lons) = MISSING_R8
 
    case(GRID_QUAD_FULLY_IRREGULAR)
-      allocate(interp_handle%ii%lats_2D(num_lons,num_lats), &
+      allocate(interp_handle%ii%lats_2D(num_lons, num_lats), &
                interp_handle%ii%lons_2D(num_lons, num_lats))
       interp_handle%ii%lats_2D(num_lons, num_lats) = MISSING_R8
       interp_handle%ii%lons_2D(num_lons, num_lats) = MISSING_R8
@@ -365,7 +364,7 @@
       if (num_lats * num_lons > 6 * 1000 * 1000) then  ! ~1/10th degree
          interp_handle%ii%num_reg_x = 900
          interp_handle%ii%num_reg_y = 900
-         interp_handle%ii%max_reg_list_num = 800   !>@TODO  what is good val?
+         interp_handle%ii%max_reg_list_num = 800   !>@todo  what is good val?
 !print *, 'case 1: ', interp_handle%ii%num_reg_x, interp_handle%ii%num_reg_y, &
 !                     interp_handle%ii%max_reg_list_num
 
@@ -1309,13 +1308,13 @@
 
 ! the 4 return values set here are:  lon_bot, lat_bot, lon_top, lat_top
 four_lons(1) = lon_bot
-four_lons(2) = lon_bot
+four_lons(2) = lon_top
 four_lons(3) = lon_top
-four_lons(4) = lon_top
+four_lons(4) = lon_bot
 
 four_lats(1) = lat_bot
-four_lats(2) = lat_top
-four_lats(3) = lat_bot
+four_lats(2) = lat_bot
+four_lats(3) = lat_top
 four_lats(4) = lat_top
 
 end subroutine quad_lon_lat_locate_ii
@@ -2283,7 +2282,6 @@
 
 real(r8) :: x_corners(4), y_corners(4)
 integer  :: e
-integer  :: lon_bot, lat_bot, lon_top, lat_top
 
 character(len=*), parameter :: routine = 'quad_lon_lat_evaluate:quad_lon_lat_evaluate_ii_array'