Merge conflict resolution

CDEPS-interface/cdeps_files.cmake

@@ -56,6 +56,7 @@ list(APPEND cdeps_datm_files
 list(APPEND cdeps_dice_files
  CDEPS/dice/dice_datamode_ssmi_mod.F90
  CDEPS/dice/dice_flux_atmice_mod.F90
+ CDEPS/dice/dice_datamode_cplhist_mod.F90
  CDEPS/dice/ice_comp_nuopc.F90
 )
 

CICE-interface/CMakeLists.txt

@@ -51,7 +51,8 @@ list(APPEND lib_src_files
  ${cice_shared_files_c}
  ${icepack_files}
  ${cice_mpi_comm_files}
- ${cice_nuopc_cmeps_driver_files})
+ ${cice_nuopc_cmeps_driver_files}
+ ${cice_cdeps_inline_files})
 
 list(APPEND _cice_defs FORTRANUNDERSCORE
  coupled)
@@ -84,6 +85,11 @@ if(OpenMP_Fortran_FOUND)
  target_link_libraries(cice PRIVATE OpenMP::OpenMP_Fortran)
 endif()
 
+# ice prescribed
+add_dependencies(cice cdeps::cdeps)
+target_compile_definitions(cice PUBLIC "DISABLE_FoX")
+target_link_libraries(cice PUBLIC cdeps::cdeps)
+
 ###############################################################################
 ### Install
 ###############################################################################

CICE-interface/cice_files.cmake

@@ -150,3 +150,22 @@ list(APPEND cice_nuopc_cmeps_driver_files
  CICE/cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90
  CICE/cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90
 )
+
+#-- Using ice prescribed ifndef cesmcoupled
+list(APPEND cice_cdeps_inline_files
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_orb_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_const_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_abort_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_strconvert_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_log_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_sys_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_kind_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_nl_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_cal_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_string_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/share/shr_timer_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/streams/dshr_strdata_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/streams/dshr_stream_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/streams/dshr_methods_mod.F90
+ ${PROJECT_SOURCE_DIR}/CDEPS-interface/CDEPS/dshr/dshr_mod.F90
+)

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 ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-MOM6 HAFS-MOM6W HAFS-ALL NG-GODAS)
+list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL ATM_DS2S ATM_DS2S-PCICE HAFS HAFSW HAFS-MOM6 HAFS-MOM6W 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}")
@@ -152,7 +152,7 @@ if(FMS)
  find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
  if(APP MATCHES "^(HAFSW)$")
  add_library(fms ALIAS FMS::fms_r4)
- elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|NG-GODAS|HAFS-MOM6|HAFS-MOM6W)$")
+ elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|ATM_DS2S|ATM_DS2S-PCICE|NG-GODAS|HAFS-MOM6|HAFS-MOM6W)$")
  add_library(fms ALIAS FMS::fms_r8)
  endif()
  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|HAFS|HAFS-ALL)$")
@@ -329,6 +329,7 @@ if(CDEPS)
  add_dependencies(ufs cdeps::cdeps)
  list(APPEND _ufs_defs_private FRONT_CDEPS_DATM=cdeps_datm_comp)
  list(APPEND _ufs_defs_private FRONT_CDEPS_DOCN=cdeps_docn_comp)
+ list(APPEND _ufs_defs_private FRONT_CDEPS_DICE=cdeps_dice_comp)
  target_link_libraries(ufs PUBLIC cdeps::cdeps)
 endif()
 

cmake/configure_apps.cmake

@@ -53,6 +53,7 @@ if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
  set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
  set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
  set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
+ set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
  set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
  if(APP MATCHES "^(S2SW|S2SWA|S2SWAL)")
  set(WW3 ON CACHE BOOL "Enable WAVEWATCH III" FORCE)
@@ -68,6 +69,20 @@ if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
  message("${APP_MSG} mode")
 endif()
 
+if(APP MATCHES "^(ATM_DS2S|ATM_DS2S-PCICE)$")
+ set(APP_MSG "Configuring UFS app in ATM_DS2S with CDEPS data")
+ set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
+ set(FMS ON CACHE BOOL "Enable FMS" FORCE)
+ set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
+ set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
+ set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)
+ if (APP MATCHES "^(ATM_DS2S-PCICE)$")
+ set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
+ string(CONCAT APP_MSG ${APP_MSG} " with prescribed ice sea ice")
+ endif()
+ message("${APP_MSG} mode")
+endif()
+
 if(APP MATCHES "^(HAFS|HAFSW|HAFS-MOM6|HAFS-MOM6W|HAFS-ALL)$")
  set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
  set(CDEPS ON CACHE BOOL "Enable CDEPS" FORCE)

cmake/configure_noaacloud.intel.cmake

@@ -0,0 +1 @@
+set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)

doc/UsersGuide/requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 # pip-compile requirements.in
@@ -12,6 +12,8 @@ certifi==2024.2.2
  # via requests
 charset-normalizer==3.3.2
  # via requests
+colorama==0.4.6
+ # via sphinx
 docutils==0.20.1
  # via
  # pybtex-docutils
@@ -22,10 +24,6 @@ idna==3.7
  # via requests
 imagesize==1.4.1
  # via sphinx
-importlib-metadata==7.0.1
- # via
- # sphinx
- # sphinxcontrib-bibtex
 jinja2==3.1.4
  # via sphinx
 latexcodec==2.0.1
@@ -44,7 +42,7 @@ pygments==2.17.2
  # via sphinx
 pyyaml==6.0.1
  # via pybtex
-requests==2.31.0
+requests==2.32.0
  # via sphinx
 six==1.16.0
  # via
@@ -78,5 +76,3 @@ sphinxcontrib-serializinghtml==1.1.10
  # via sphinx
 urllib3==2.2.1
  # via requests
-zipp==3.17.0
- # via importlib-metadata

doc/UsersGuide/source/BuildingAndRunning.rst

@@ -582,7 +582,9 @@ To run a single test, users can try the following command instead of creating a
 
 .. code-block:: console
 
- ./rt.sh -r -k -n control_p8
+ ./rt.sh -r -k -n "control_p8 <compiler>"
+
+where ``<compiler>`` is ``gnu`` or ``intel``. 
 
 Troubleshooting
 ^^^^^^^^^^^^^^^^^^

doc/UsersGuide/source/CodeOverview.rst

@@ -108,7 +108,8 @@ The umbrella repository for the UFS WM is named ``ufs-weather-model``. Under thi
  ├── CDEPS-interface
  │ └── CDEPS
  │ ├── (datm) -------- CDEPS DATM
- │ └── (docn) -------- CDEPS DOCN
+ │ ├── (docn) -------- CDEPS DOCN
+ │ └── (dice) -------- CDEPS DICE
  ├── CICE-interface
  │ └── CICE -------- CICE6 sea ice model
  │ ├── (icepack) -------- Sea ice column physics
@@ -161,4 +162,4 @@ The umbrella repository for the UFS WM is named ``ufs-weather-model``. Under thi
  │ └── fv3_conf 
  └── WW3
  └── (model) -------- WW3 model
- └── (src) -------- NUOPC WW3 caps
+ └── (src) -------- NUOPC WW3 caps

doc/UsersGuide/source/Glossary.rst

@@ -68,7 +68,7 @@ Glossary
  Global atmospheric model based on fluid dynamics principles, including Euler's equations of motion.
 
  EMC
- The `Environmental Modeling Center <https://www.emc.ncep.noaa.gov/emc_new.php>`__ is one of :term:`NCEP`'s nine centers and leads the :term:`National Weather Service <NWS>`'s modeling efforts.
+ The `Environmental Modeling Center <https://www.emc.ncep.noaa.gov/emc.php>`_ is one of :term:`NCEP`'s nine centers and leads the :term:`National Weather Service <NWS>`'s modeling efforts.
 
  ESMF
  `Earth System Modeling Framework <https://earthsystemmodeling.org/docs/release/latest/ESMF_usrdoc/>`__. The ESMF defines itself as "a suite of software tools for developing high-performance, multi-component Earth science modeling applications." It is a community-developed software infrastructure for building and coupling models. 

driver/UFSDriver.F90

@@ -61,6 +61,9 @@ MODULE UFSDriver
 #endif
 #ifdef FRONT_CDEPS_DOCN
  use FRONT_CDEPS_DOCN, only: DOCN_SS => SetServices
+#endif
+#ifdef FRONT_CDEPS_DICE
+ use FRONT_CDEPS_DICE, only: DICE_SS => SetServices
 #endif
  ! - Handle build time ICE options:
 #ifdef FRONT_CICE6
@@ -410,6 +413,23 @@ subroutine SetModelServices(driver, rc)
  found_comp = .true.
  end if
 #endif
+#ifdef FRONT_CDEPS_DICE
+ if (trim(model) == "dice") then
+ !TODO: Remove bail code and pass info and SetVM to DriverAddComp
+ !TODO: once component supports threading.
+ if (ompNumThreads > 1) then
+ write (msg, *) "ESMF-aware threading NOT implemented for model: "//&
+ trim(model)
+ call ESMF_LogSetError(ESMF_RC_NOT_VALID, msg=msg,line=__LINE__, &
+ file=__FILE__, rcToReturn=rc)
+ return ! bail out
+ endif
+ call NUOPC_DriverAddComp(driver, trim(prefix), DICE_SS, &
+ petList=petList, comp=comp, rc=rc)
+ if (ChkErr(rc,__LINE__,u_FILE_u)) return
+ found_comp = .true.
+ end if
+#endif
 #ifdef FRONT_CICE6
  if (trim(model) == "cice6") then
  call NUOPC_DriverAddComp(driver, trim(prefix), CICE6_SS, &

modulefiles/ufs_acorn.intel.lua

@@ -2,7 +2,7 @@ help([[
 Load environment to build UFS on Acorn with Intel compiler
 ]])
 
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 load("stack-intel")
 load("stack-cray-mpich")

modulefiles/ufs_common.lua

@@ -8,19 +8,19 @@ local ufs_modules = {
  {["libpng"] = "1.6.37"},
  {["hdf5"] = "1.14.0"},
  {["netcdf-c"] = "4.9.2"},
- {["netcdf-fortran"] = "4.6.0"},
+ {["netcdf-fortran"] = "4.6.1"},
  {["parallelio"] = "2.5.10"},
- {["esmf"] = "8.5.0"},
- {["fms"] = "2023.02.01"},
+ {["esmf"] = "8.6.0"},
+ {["fms"] = "2023.04"},
  {["bacio"] = "2.4.1"},
  {["crtm"] = "2.4.0"},
  {["g2"] = "3.4.5"},
  {["g2tmpl"] = "1.10.2"},
  {["ip"] = "4.3.0"},
- {["sp"] = "2.3.3"},
+ {["sp"] = "2.5.0"},
  {["w3emc"] = "2.10.0"},
  {["gftl-shared"] = "1.6.1"},
- {["mapl"] = "2.40.3-esmf-8.5.0"},
+ {["mapl"] = "2.40.3-esmf-8.6.0"},
  {["scotch"] = "7.0.4"},
 }
 

modulefiles/ufs_gaea.intel.lua

@@ -5,25 +5,24 @@ help([[
 
 whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])
 
-load("PrgEnv-intel/8.3.3")
-load("intel-classic/2023.1.0")
-load("cray-mpich/8.1.25")
-load("python/3.9.12")
-
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/modulefiles")
+prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
 load(pathJoin("stack-intel", stack_intel_ver))
 
 stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
 load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))
 
-stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
+stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
 load(pathJoin("stack-python", stack_python_ver))
 
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
+load(pathJoin("cmake", cmake_ver))
+
 load("ufs_common")
-load("nccmp/1.9.0.1")
+
+nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
+load(pathJoin("nccmp", nccmp_ver))
 
 unload("darshan-runtime")
 unload("cray-libsci")

modulefiles/ufs_hera.gnu.lua

@@ -2,12 +2,14 @@ help([[
 loads UFS Model prerequisites for Hera/GNU
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles")
+prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/ufs-wm-srw-rocky8/install/modulefiles/Core")
 
-stack_gnu_ver=os.getenv("stack_gnu_ver") or "9.2.0"
+stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.0"
 load(pathJoin("stack-gcc", stack_gnu_ver))
 
-stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.5"
+stack_openmpi_ver=os.getenv("stack_openmpi_ver") or "4.1.6"
 load(pathJoin("stack-openmpi", stack_openmpi_ver))
 
 cmake_ver=os.getenv("cmake_ver") or "3.23.1"
@@ -18,6 +20,9 @@ load("ufs_common")
 nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
 load(pathJoin("nccmp", nccmp_ver))
 
+prepend_path("CPPFLAGS", " -I/apps/slurm_hera/23.11.3/include/slurm"," ")
+prepend_path("LD_LIBRARY_PATH", "/apps/slurm_hera/23.11.3/lib")
+
 setenv("CC", "mpicc")
 setenv("CXX", "mpic++")
 setenv("FC", "mpif90")

modulefiles/ufs_hera.intel.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Hera/Intel
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))

modulefiles/ufs_hercules.gnu.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Hercules/GNU
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 -- for mvapich2, need:
 prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles")
 

modulefiles/ufs_hercules.intel.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Hercules/Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
 load(pathJoin("stack-intel", stack_intel_ver))

modulefiles/ufs_jet.intel.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Jet/Intel
 ]])
 
-prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))

modulefiles/ufs_noaacloud.intel.lua

@@ -2,8 +2,7 @@ help([[
 loads UFS Model prerequisites for NOAA Parallelworks/Intel
 ]])
 
-
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
 load(pathJoin("stack-intel", stack_intel_ver))

modulefiles/ufs_orion.intel.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for Orion/Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
 load(pathJoin("stack-intel", stack_intel_ver))

modulefiles/ufs_s4.intel.lua

@@ -2,7 +2,7 @@ help([[
 loads UFS Model prerequisites for S4/Intel
 ]])
 
-prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
 load(pathJoin("stack-intel", stack_intel_ver))