Merge branch 'develop' into feature/sfcsub_ccpp

Fixes ufs-community#424

sorc/chgres_cube.fd/search_util.F90

@@ -118,7 +118,7 @@ subroutine search (field, mask, idim, jdim, tile, field_num, latitude, terrain_l
    case (230) ! soil type on the input grid
      default_value = 11.0
    case default
-     print*,'- FATAL ERROR.  UNIDENTIFIED FIELD NUMBER : ', field
+     print*,'- FATAL ERROR.  UNIDENTIFIED FIELD NUMBER : ', field_num
      call mpi_abort(mpi_comm_world, 77, ierr)
  end select
 
@@ -230,7 +230,7 @@ subroutine sst_guess(latitude, sst)
 
  real(esmf_kind_r8), intent(out) :: sst
 
- if (latitude >= 60.0) then
+ if (abs(latitude) >= 60.0) then
    sst = 273.16
  elseif (abs(latitude) <= 30.0) then
    sst = 300.0

tests/CMakeLists.txt

@@ -4,6 +4,6 @@
 # Ed Hartnett 2/11/21
 
 # Add the test subdirecotries.
-add_subdirectory(chres_cube)
+add_subdirectory(chgres_cube)
 add_subdirectory(fre-nctools)
 

tests/chres_cube/CMakeLists.txt → tests/chgres_cube/CMakeLists.txt

@@ -77,4 +77,20 @@ add_mpi_test(ftst_program_setup
   NUMPROCS 4
   TIMEOUT 60)
 
+add_executable(ftst_search_util
+  "${CMAKE_SOURCE_DIR}/sorc/chgres_cube.fd/search_util.F90"
+  ftst_search_util.F90)
+target_link_libraries(
+  ftst_search_util
+  esmf
+  MPI::MPI_Fortran)
+if(OpenMP_Fortran_FOUND)
+  target_link_libraries(ftst_search_util OpenMP::OpenMP_Fortran)
+endif()
 
+# Cause test to be run with MPI. The search routine was
+# written to work on a single task. So set NUMPROCS to 1.
+add_mpi_test(ftst_search_util
+  EXECUTABLE ${CMAKE_CURRENT_BINARY_DIR}/ftst_search_util
+  NUMPROCS 1
+  TIMEOUT 60)

tests/chgres_cube/ftst_search_util.F90

@@ -0,0 +1,192 @@
+ program test_search_util
+
+! Test search_util using a simple 3x3 fv3 tile. Two types
+! of tests are performed. First, a missing value is 
+! replaced with a valid neighboring value. Second, a missing
+! value is replaced by a default value. This can happen
+! for an isolated island located far from a valid neighbor.
+!
+! author: George Gayno (george.gayno@noaa.gov)
+
+ use mpi
+ use esmf
+ use search_util
+
+ implicit none
+
+ integer, parameter :: idim = 3
+ integer, parameter :: jdim = 3
+ integer, parameter :: tile = 1
+ integer, parameter :: num_default_tests = 20
+ integer, parameter :: num_default_sst_tests = 4
+
+ integer :: field_num, ierr, i
+ integer(esmf_kind_i8) :: mask_search1(idim,jdim)
+ integer(esmf_kind_i8) :: mask_search2(idim,jdim)
+ integer(esmf_kind_i8) :: mask_default(idim,jdim)
+ integer :: default_field_num(num_default_tests)
+
+ real(esmf_kind_r8) :: default_field_val(num_default_tests)
+ real(esmf_kind_r8) :: default_sst_val(num_default_sst_tests)
+ real(esmf_kind_r8) :: field_default(idim,jdim)
+ real(esmf_kind_r8) :: field_updated(idim,jdim)
+ real(esmf_kind_r8) :: field_search1(idim,jdim)
+ real(esmf_kind_r8) :: field_search2(idim,jdim)
+ real(esmf_kind_r8) :: latitude(idim,jdim)
+ real(esmf_kind_r8) :: latitude_sst(num_default_sst_tests)
+ real(esmf_kind_r8) :: terrain_land(idim,jdim)
+ real(esmf_kind_r8) :: soilt_climo(idim,jdim)
+
+!--------------------------------------------------------
+! These variables are used to test the 'default'
+! search routine option (i.e., when the search
+! fails, a default must be used)
+!--------------------------------------------------------
+
+! Definition of the mask. The '1' indicates an isolated
+! island or lake depending on the field type.
+
+ data mask_default /0, 0, 0,  0, 1, 0, 0, 0, 0/
+
+ data latitude /-30.0, -30.0, -30.0, 0., 0., 0., 25.0, 25.0, 25.0/
+
+ data terrain_land /0., 0., 0., 0., 75.0, 0., 0., 0., 0./
+
+ data soilt_climo /0., 0., 0., 0., 2., 0., 0., 0., 0./ ! soil type
+
+! The field values input to the search routine. The
+! flag value (-9999.9) indicates an unmapped point that must
+! be replaced.
+
+ data field_default/0., 0., 0.,  0., -9999.9, 0.,  0., 0., 0./
+
+! A list of field numbers the default search
+! works for. SST is handled with separate data statements
+! below.
+
+ data default_field_num /0, 1, 7, 21, &
+                         30, 65, 66, 83, 85, &
+                         86, 91, 92, 223, 224, &
+                         225, 226, 227, 228, 229, 230/
+
+! The field value that should be returned by the 
+! search routine for each field value. If the returned
+! value does not match this value, the test fails.
+
+ data default_field_val /0.0, 1.0, 75.0, 265.0, &
+                         30.0, 0.0, 0.0, 0.01, 280.0, &
+                         0.18, 0.0, 1.0, 0.0, 2.0, &
+                         -99999.9, 0.5, 0.5, 0.5, 1.0, 11.0/
+
+! For SST, test the default for four latitudes to ensure
+! all 'if' branches of routine 'sst_guess' are invoked.
+! If the returned value does not match "default_sst_val",
+! the test failes.
+
+ data default_sst_val /273.16, 286.5785, 300.0, 273.16/
+
+ data latitude_sst /75.0, 45.0, 0.0, -65.0/
+
+!--------------------------------------------------------
+! These variables are used for the two search option 
+! tests. Both tests use vegetation greenness. For this
+! test, the logic is is independent of the field type.
+!--------------------------------------------------------
+
+! Test 1 - The missing value at (2,2) should be replaced
+! with the valid value at (1,1).
+
+ data mask_search1 /1, 0, 0,  0, 1, 0, 0, 0, 0/
+ data field_search1 /.88, 0., 0.,  0., -9999.9, 0.,  0., 0., 0./
+
+! Test 2 - The missing value at (3,3) should be replaced
+! with the valid value at (2,2).
+
+ data mask_search2 /0, 0, 0,  0, 1, 0, 0, 0, 1/
+ data field_search2 /0., 0., 0.,  0., .88, 0.,  0., 0., -9999.9/
+
+ print*,"Starting test of search util."
+
+ call mpi_init(ierr)
+
+ print*,'Run test 1 to check search logic.'
+
+ field_num = 226 ! veg greenness
+ field_updated = field_search1
+
+ call search (field_updated, mask_search1, idim, jdim, tile, field_num)
+
+ if (field_updated(2,2) /= field_updated(1,1)) then
+   print*,'TEST FAILED ',field_updated(2,2), field_updated(1,1)
+   stop 2
+ endif
+
+ print*,'Run test 2 to check search logic.'
+
+ field_num = 226
+ field_updated = field_search2
+
+ call search (field_updated, mask_search2, idim, jdim, tile, field_num)
+
+ if (field_updated(2,2) /= field_updated(3,3)) then
+   print*,'TEST FAILED ',field_updated(2,2), field_updated(3,3)
+   stop 3
+ else
+   print*,'OK'
+ endif
+
+ print*,'Run tests to check default logic.'
+
+ do i = 1, num_default_tests
+
+   field_num = default_field_num(i)
+   field_updated = field_default
+
+   print*,'CHECK DEFAULT LOGIC FOR FIELD NUMBER ',field_num
+
+   call search (field_updated, mask_default, idim, jdim, tile, field_num, &
+                latitude, terrain_land, soilt_climo)
+
+   if (abs(field_updated(2,2)-default_field_val(i)) > 0.00001) then
+     print*,'TEST FAILED '
+     print*,'VALUE SHOULD BE:', default_sst_val(i) 
+     print*,'VALUE FROM TEST:', field_updated(2,2)
+     stop 4
+   else
+     print*,'OK'
+   endif
+
+ enddo
+
+ print*,'Run tests to check default logic for SST.'
+
+ do i = 1, num_default_sst_tests
+
+   field_num = 11
+   field_updated = field_default
+
+   latitude(2,2) = latitude_sst(i)
+
+   print*,'CHECK DEFAULT LOGIC FOR FIELD NUMBER ',field_num
+   print*,'AT LATITUDE ',latitude_sst(i)
+
+   call search (field_updated, mask_default, idim, jdim, tile, field_num, &
+                latitude, terrain_land, soilt_climo)
+
+   if (abs(field_updated(2,2)-default_sst_val(i)) > 0.00001) then
+     print*,'TEST FAILED '
+     print*,'SST SHOULD BE:', default_sst_val(i) 
+     print*,'SST FROM TEST:', field_updated(2,2)
+     stop 5
+   else
+
+   print*,'OK'
+   endif
+
+ enddo
+
+ call mpi_finalize(ierr)
+
+ print*,"SUCCESS!"
+
+ end program test_search_util