Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…

…r-model into ccpp_error_code_in_prebuild

CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS NG-GODAS-NEMSDATM)
+list(APPEND VALID_APPS ATM ATMAERO ATMW S2S S2SW HAFS HAFSW HAFS-ALL NG-GODAS)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
@@ -30,7 +30,6 @@ set(HYCOM           OFF CACHE BOOL "Enable HYCOM")
 set(CICE6           OFF CACHE BOOL "Enable CICE6")
 set(WW3             OFF CACHE BOOL "Enable WW3")
 set(STOCH_PHYS      OFF CACHE BOOL "Enable Stochastic Physics")
-set(NEMSdatm        OFF CACHE BOOL "Enable NEMSdatm")
 set(CMEPS           OFF CACHE BOOL "Enable CMEPS")
 set(CDEPS           OFF CACHE BOOL "Enable CDEPS")
 
@@ -47,7 +46,6 @@ message("HYCOM ............ ${HYCOM}")
 message("CICE6 ............ ${CICE6}")
 message("WW3 .............. ${WW3}")
 message("STOCH_PHYS ....... ${STOCH_PHYS}")
-message("NEMSdatm ......... ${NEMSdatm}")
 message("CDEPS ............ ${CDEPS}")
 message("CMEPS ............ ${CMEPS}")
 
@@ -203,12 +201,8 @@ if(CMEPS)
 endif()
 
 ###############################################################################
-### Data Components [NEMSdatm, CDEPS]
+### Data Components [CDEPS]
 ###############################################################################
-if(NEMSdatm)
-  add_subdirectory(DATM/DATM)
-endif()
-
 if(CDEPS)
   add_subdirectory(CDEPS-interface)
 endif()
@@ -245,12 +239,6 @@ if(STOCH_PHYS)
   list(APPEND _ufs_libs_public stochastic_physics)
 endif()
 
-if(NEMSdatm)
-  add_dependencies(ufs datatm)
-  list(APPEND _ufs_defs_private FRONT_NEMS_DATM=datm)
-  list(APPEND _ufs_libs_public datatm)
-endif()
-
 if(FV3)
   add_dependencies(ufs fv3atm)
   list(APPEND _ufs_defs_private FRONT_FV3=fv3gfs_cap_mod)

cmake/configure_apps.cmake

@@ -25,19 +25,14 @@ if(APP MATCHES "^(ATM|ATMW)$")
   endif()
 endif()
 
-if(APP MATCHES "^(NG-GODAS|NG-GODAS-NEMSDATM)$")
+if(APP MATCHES "^(NG-GODAS)$")
   set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
   set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
   set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
-  if(APP MATCHES "NG-GODAS-NEMSDATM")
-    set(NEMSdatm ON  CACHE BOOL "Enable NEMS DataAtm"        FORCE)
-    message("Configuring UFS app in (NEMS) Data Atmosphere mode")
-  elseif(APP MATCHES "NG-GODAS")
-    set(CDEPS    ON  CACHE BOOL "Enable CDEPS"               FORCE)
-    message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
-  endif()
+  set(CDEPS      ON  CACHE BOOL "Enable CDEPS"               FORCE)
+  message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
 endif()
 
 if(APP MATCHES "^(S2S|S2SW)$")

driver/EARTH_GRID_COMP.F90

@@ -46,9 +46,6 @@ MODULE module_EARTH_GRID_COMP
 #ifdef FRONT_FV3
       use FRONT_FV3,        only: FV3_SS   => SetServices
 #endif
-#ifdef FRONT_NEMS_DATM
-      use FRONT_NEMS_DATM,  only: DATM_SS  => SetServices
-#endif
 #ifdef FRONT_CDEPS_DATM
       use FRONT_CDEPS_DATM, only: DATM_SS  => SetServices
 #endif
@@ -344,8 +341,8 @@ subroutine SetModelServices(driver, rc)
             found_comp = .true.
           end if
 #endif
-#if defined FRONT_NEMS_DATM || defined FRONT_CDEPS_DATM
-          if (trim(model) == "nems_datm" .or. trim(model) == "datm" ) then
+#if defined FRONT_CDEPS_DATM
+          if (trim(model) == "datm" ) then
             call NUOPC_DriverAddComp(driver, trim(prefix), DATM_SS, &
               petList=petList, comp=comp, rc=rc)
             if (ChkErr(rc,__LINE__,u_FILE_u)) return

modulefiles/ufs_hera.intel

@@ -31,5 +31,4 @@ setenv CXX mpiicpc
 setenv FC mpiifort
 setenv CMAKE_Platform hera.intel
 
-# use shared memory and OpenFabrics Alliance (OFA) fabric with Intel MPI to circumvent RDMA-related bug in DAPL.
-setenv I_MPI_FABRICS shm:ofa
+setenv I_MPI_DAPL_UD 1

modulefiles/ufs_hera.intel_debug

@@ -28,5 +28,4 @@ setenv CXX mpiicpc
 setenv FC mpiifort
 setenv CMAKE_Platform hera.intel
 
-# use shared memory and OpenFabrics Alliance (OFA) fabric with Intel MPI to circumvent RDMA-related bug in DAPL.
-setenv I_MPI_FABRICS shm:ofa
+setenv I_MPI_DAPL_UD 1

tests/OpnReqTests_cpld_control_c96_p8_hera.intel.log

@@ -1,11 +1,11 @@
-Fri Jan  7 14:53:44 UTC 2022
+Fri Jan 21 20:09:38 UTC 2022
 Start Operation Requirement Test
 
-Compile dbg elapsed time 179 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
-Compile std elapsed time 425 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
+Compile dbg elapsed time 207 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DDEBUG=ON -DMPI=ON -DCMAKE_BUILD_TYPE=Debug -DMOM6SOLO=ON
+Compile std elapsed time 422 seconds. -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v16_coupled_nsstNoahmpUGWPv1,FV3_GFS_v16_coupled_p7_rrtmgp,FV3_GFS_v16_coupled_p8 -DMPI=ON -DCMAKE_BUILD_TYPE=Release -DMOM6SOLO=ON
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_dbg_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_6177/cpld_control_c96_p8_dbg_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_dbg_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_dbg_base
 Checking test dbg_base cpld_control_c96_p8 results ....
 Moving baseline dbg_base cpld_control_c96_p8 files ....
  Moving sfcf006.tile1.nc .........OK
@@ -56,15 +56,27 @@ Moving baseline dbg_base cpld_control_c96_p8 files ....
  Moving RESTART/iced.2021-03-22-43200.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-22-43200.nc .........OK
 
-  0: The total amount of wall time                        = 610.112995
-  0: The maximum resident set size (KB)                   = 679260
+  0: The total amount of wall time                        = 604.646137
+  0: The maximum resident set size (KB)                   = 678920
 
 Test dbg_base cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_6177/cpld_control_c96_p8_dcp
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_dcp
 Checking test dcp cpld_control_c96_p8 results ....
+ Comparing sfcf021.tile1.nc .........OK
+ Comparing sfcf021.tile2.nc .........OK
+ Comparing sfcf021.tile3.nc .........OK
+ Comparing sfcf021.tile4.nc .........OK
+ Comparing sfcf021.tile5.nc .........OK
+ Comparing sfcf021.tile6.nc .........OK
+ Comparing atmf021.tile1.nc .........OK
+ Comparing atmf021.tile2.nc .........OK
+ Comparing atmf021.tile3.nc .........OK
+ Comparing atmf021.tile4.nc .........OK
+ Comparing atmf021.tile5.nc .........OK
+ Comparing atmf021.tile6.nc .........OK
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -113,14 +125,71 @@ Checking test dcp cpld_control_c96_p8 results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 215.847555
-  0: The maximum resident set size (KB)                   = 608832
+  0: The total amount of wall time                        = 213.370759
+  0: The maximum resident set size (KB)                   = 610616
 
 Test dcp cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_6177/cpld_control_c96_p8_rst
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_fhz
+Checking test fhz cpld_control_c96_p8 results ....
+ Comparing sfcf021.tile1.nc ............ALT CHECK......OK
+ Comparing sfcf021.tile2.nc ............ALT CHECK......OK
+ Comparing sfcf021.tile3.nc ............ALT CHECK......OK
+ Comparing sfcf021.tile4.nc ............ALT CHECK......OK
+ Comparing sfcf021.tile5.nc ............ALT CHECK......OK
+ Comparing sfcf021.tile6.nc ............ALT CHECK......OK
+ Comparing atmf021.tile1.nc .........OK
+ Comparing atmf021.tile2.nc .........OK
+ Comparing atmf021.tile3.nc .........OK
+ Comparing atmf021.tile4.nc .........OK
+ Comparing atmf021.tile5.nc .........OK
+ Comparing atmf021.tile6.nc .........OK
+ Comparing RESTART/coupler.res .........OK
+ Comparing RESTART/fv_core.res.nc .........OK
+ Comparing RESTART/fv_core.res.tile1.nc .........OK
+ Comparing RESTART/fv_core.res.tile2.nc .........OK
+ Comparing RESTART/fv_core.res.tile3.nc .........OK
+ Comparing RESTART/fv_core.res.tile4.nc .........OK
+ Comparing RESTART/fv_core.res.tile5.nc .........OK
+ Comparing RESTART/fv_core.res.tile6.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile1.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile2.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile3.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile4.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile5.nc .........OK
+ Comparing RESTART/fv_srf_wnd.res.tile6.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile1.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile2.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile3.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile4.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile5.nc .........OK
+ Comparing RESTART/fv_tracer.res.tile6.nc .........OK
+ Comparing RESTART/phy_data.tile1.nc .........OK
+ Comparing RESTART/phy_data.tile2.nc .........OK
+ Comparing RESTART/phy_data.tile3.nc .........OK
+ Comparing RESTART/phy_data.tile4.nc .........OK
+ Comparing RESTART/phy_data.tile5.nc .........OK
+ Comparing RESTART/phy_data.tile6.nc .........OK
+ Comparing RESTART/sfc_data.tile1.nc .........OK
+ Comparing RESTART/sfc_data.tile2.nc .........OK
+ Comparing RESTART/sfc_data.tile3.nc .........OK
+ Comparing RESTART/sfc_data.tile4.nc .........OK
+ Comparing RESTART/sfc_data.tile5.nc .........OK
+ Comparing RESTART/sfc_data.tile6.nc .........OK
+ Comparing RESTART/MOM.res.nc .........OK
+ Comparing RESTART/iced.2021-03-23-21600.nc .........OK
+ Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
+
+  0: The total amount of wall time                        = 199.007794
+  0: The maximum resident set size (KB)                   = 616200
+
+Test fhz cpld_control_c96_p8 PASS
+
+
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_rst
 Checking test rst cpld_control_c96_p8 results ....
  Comparing atmf024.tile1.nc .........OK
  Comparing atmf024.tile2.nc .........OK
@@ -170,16 +239,28 @@ Checking test rst cpld_control_c96_p8 results ....
  Comparing sfcf024.tile5.nc .........OK
  Comparing sfcf024.tile6.nc .........OK
 
-  0: The total amount of wall time                        = 110.291314
-  0: The maximum resident set size (KB)                   = 424660
+  0: The total amount of wall time                        = 106.597575
+  0: The maximum resident set size (KB)                   = 376192
 
 Test rst cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_6177/cpld_control_c96_p8_std_base
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_std_base
 Checking test std_base cpld_control_c96_p8 results ....
 Moving baseline std_base cpld_control_c96_p8 files ....
+ Moving sfcf021.tile1.nc .........OK
+ Moving sfcf021.tile2.nc .........OK
+ Moving sfcf021.tile3.nc .........OK
+ Moving sfcf021.tile4.nc .........OK
+ Moving sfcf021.tile5.nc .........OK
+ Moving sfcf021.tile6.nc .........OK
+ Moving atmf021.tile1.nc .........OK
+ Moving atmf021.tile2.nc .........OK
+ Moving atmf021.tile3.nc .........OK
+ Moving atmf021.tile4.nc .........OK
+ Moving atmf021.tile5.nc .........OK
+ Moving atmf021.tile6.nc .........OK
  Moving sfcf024.tile1.nc .........OK
  Moving sfcf024.tile2.nc .........OK
  Moving sfcf024.tile3.nc .........OK
@@ -228,15 +309,27 @@ Moving baseline std_base cpld_control_c96_p8 files ....
  Moving RESTART/iced.2021-03-23-21600.nc .........OK
  Moving RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 200.753089
-  0: The maximum resident set size (KB)                   = 617236
+  0: The total amount of wall time                        = 199.095277
+  0: The maximum resident set size (KB)                   = 619248
 
 Test std_base cpld_control_c96_p8 PASS
 
 
-baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
-working dir  = /scratch1/NCEPDEV/stmp2/Denise.Worthen/FV3_OPNREQ_TEST/opnReqTest_6177/cpld_control_c96_p8_thr
+baseline dir = /scratch1/NCEPDEV/stmp4/Minsuk.Ji/FV3_OPNREQ_TEST/OPNREQ_TEST/cpld_control_c96_p8_std_base
+working dir  = /scratch1/NCEPDEV/stmp2/Minsuk.Ji/FV3_OPNREQ_TEST/opnReqTest_29460/cpld_control_c96_p8_thr
 Checking test thr cpld_control_c96_p8 results ....
+ Comparing sfcf021.tile1.nc .........OK
+ Comparing sfcf021.tile2.nc .........OK
+ Comparing sfcf021.tile3.nc .........OK
+ Comparing sfcf021.tile4.nc .........OK
+ Comparing sfcf021.tile5.nc .........OK
+ Comparing sfcf021.tile6.nc .........OK
+ Comparing atmf021.tile1.nc .........OK
+ Comparing atmf021.tile2.nc .........OK
+ Comparing atmf021.tile3.nc .........OK
+ Comparing atmf021.tile4.nc .........OK
+ Comparing atmf021.tile5.nc .........OK
+ Comparing atmf021.tile6.nc .........OK
  Comparing sfcf024.tile1.nc .........OK
  Comparing sfcf024.tile2.nc .........OK
  Comparing sfcf024.tile3.nc .........OK
@@ -285,11 +378,11 @@ Checking test thr cpld_control_c96_p8 results ....
  Comparing RESTART/iced.2021-03-23-21600.nc .........OK
  Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .........OK
 
-  0: The total amount of wall time                        = 233.384680
-  0: The maximum resident set size (KB)                   = 688392
+  0: The total amount of wall time                        = 232.469343
+  0: The maximum resident set size (KB)                   = 683036
 
 Test thr cpld_control_c96_p8 PASS
 
 OPERATION REQUIREMENT TEST WAS SUCCESSFUL
-Fri Jan  7 15:23:27 UTC 2022
-Elapsed time: 00h:29m:43s. Have a nice day!
+Fri Jan 21 20:43:28 UTC 2022
+Elapsed time: 00h:33m:51s. Have a nice day!