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

…r-model into revert_iovr4

* 'develop' of https://github.com/ufs-community/ufs-weather-model:
  Use 'model set run clock' routine in FV3 NUOPC cap. (ufs-community#967)
  Wrapper for ccpp-physics ufs-community#808 and 816 (roughness length over ice and NoahMP tsurf bugfix) (ufs-community#971)
  ccpp-physics ufs-community#806, #807, ufs-community#813, and ort modifications (ufs-community#970)
  CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts (ufs-community#962)
  fv3atm cap cleanup (ufs-community#954)
  Add ufs driver. Remove NEMS submodule. Update CMEPS. Update CDEPS. Feature/ort addition.  (ufs-community#931)

.gitmodules

@@ -1,11 +1,7 @@
 [submodule "FV3"]
   path = FV3
   url = https://github.com/mzhangw/fv3atm
-  branch = revert_iovr4 
-[submodule "NEMS"]
-  path = NEMS
-  url = https://github.com/NOAA-EMC/NEMS
-  branch = develop
+  branch = revert_iovr4
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

CDEPS-interface/cdeps_files.cmake

@@ -44,6 +44,7 @@ list(APPEND cdeps_datm_files
   CDEPS/datm/datm_datamode_cplhist_mod.F90
   CDEPS/datm/datm_datamode_era5_mod.F90
   CDEPS/datm/datm_datamode_gefs_mod.F90
+  CDEPS/datm/datm_datamode_gfs_mod.F90
   CDEPS/datm/datm_datamode_jra_mod.F90
 )
 

CMEPS-interface/CMakeLists.txt

@@ -19,16 +19,11 @@ else()
 endif()
 
 list(APPEND _nems_util_files
-  CMEPS/util/shr_abort_mod.F90
-  CMEPS/util/shr_log_mod.F90
-  CMEPS/util/shr_sys_mod.F90
-  CMEPS/util/shr_flux_mod.F90
-  CMEPS/util/shr_mpi_mod.F90
-  CMEPS/util/glc_elevclass_mod.F90
-  CMEPS/util/shr_mem_mod.F90
-  CMEPS/util/shr_kind_mod.F90
-  CMEPS/util/perf_mod.F90
-  CMEPS/util/shr_const_mod.F90)
+  CMEPS/ufs/flux_atmocn_mod.F90
+  CMEPS/ufs/glc_elevclass_mod.F90
+  CMEPS/ufs/ufs_kind_mod.F90
+  CMEPS/ufs/perf_mod.F90
+  CMEPS/ufs/ufs_const_mod.F90)
 
 list(APPEND _mediator_files
   CMEPS/mediator/med_phases_restart_mod.F90

CMakeLists.txt

@@ -81,7 +81,7 @@ endif()
 message("")
 message("32BIT ............ ${32BIT}")
 message("AVX2 ............. ${AVX2}")
-message("SIMDMULTIARCH ...  ${SIMDMULTIARCH}")
+message("SIMDMULTIARCH .... ${SIMDMULTIARCH}")
 message("DEBUG ............ ${DEBUG}")
 message("DEBUG_LINKMPI .... ${DEBUG_LINKMPI}")
 message("INLINE_POST ...... ${INLINE_POST}")
@@ -214,13 +214,9 @@ if(CDEPS)
 endif()
 
 ###############################################################################
-### UFS Library [NEMS]
+### UFS Library
 ###############################################################################
-list(APPEND _nems_srcs NEMS/src/module_EARTH_GRID_COMP.F90
-                       NEMS/src/module_NEMS_Rusage.F90
-                       NEMS/src/nems_c_rusage.c)
-
-add_library(ufs ${_nems_srcs})
+add_library(ufs driver/EARTH_GRID_COMP.F90)
 set_target_properties(ufs PROPERTIES Fortran_MODULE_DIRECTORY
                                      ${CMAKE_CURRENT_BINARY_DIR}/mod)
 target_include_directories(ufs INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
@@ -298,7 +294,7 @@ target_link_libraries(ufs PUBLIC "${_ufs_libs_public}")
 ###############################################################################
 ### UFS executable
 ###############################################################################
-add_executable(ufs_model NEMS/src/MAIN_NEMS.F90)
+add_executable(ufs_model driver/UFS.F90)
 add_dependencies(ufs_model ufs)
 target_link_libraries(ufs_model ufs esmf w3nco::w3nco_d)
 

build.sh

@@ -11,13 +11,9 @@ export CC=${CC:-mpicc}
 export CXX=${CXX:-mpicxx}
 export FC=${FC:-mpif90}
 
-export ESMFMKFILE=${ESMFMKFILE:?"Please set ESMFMKFILE environment variable"}
-
 BUILD_DIR=${BUILD_DIR:-${UFS_MODEL_DIR}/build}
 mkdir -p ${BUILD_DIR}
 
-[[ -n "${MAPL_ROOT:-""}" ]] && CMAKE_FLAGS+=" -DCMAKE_MODULE_PATH=${MAPL_ROOT}/share/MAPL/cmake"
-
 cd ${BUILD_DIR}
 cmake ${UFS_MODEL_DIR} ${CMAKE_FLAGS}
 # Turn off OpenMP threading for parallel builds

doc/UsersGuide/source/InputsOutputs.rst

@@ -1146,10 +1146,6 @@ shows the following parameters that can be set in *model_configure* at run-time.
      - frequency to output restart file or forecast hours to write out restart file
      - integer
      - 0 (0: write restart file at the end of integration; 12, -1: write out restart every 12 hours; 12 24 write out restart files at fh=12 and 24)
-   * - atm_coupling_interval_sec
-     - fast coupling interval in seconds for atmosphere
-     - real(8)
-     - 900
    * - quilting
      - flag to turn on quilt
      - logical