NCAR · dustinswales · Jan 9, 2023 · Jan 12, 2023 · Jan 17, 2023 · Jan 20, 2023
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/dustinswales/fv3atm
+  branch = ufs-dev-PR30a
 [submodule "WW3"]
   path = WW3
   url = https://github.com/NOAA-EMC/WW3

diff --git a/AQM b/AQM
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt
@@ -7,7 +7,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_LINK_FLAGS "" )
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   set(CMAKE_Fortran_FLAGS "-g -traceback")
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte -xHOST")
+  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays")
   set(CMAKE_Fortran_LINK_FLAGS "")
@@ -24,7 +24,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
   set(CMAKE_C_LINK_FLAGS "")
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
   set( CMAKE_C_FLAGS "-g -traceback")
-  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -xHOST")
+  set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
   set( CMAKE_C_FLAGS_RELEASE "-O2 -fp-model precise")
   set( CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
   set( CMAKE_C_LINK_FLAGS "")

diff --git a/CICE-interface/cice_files.cmake b/CICE-interface/cice_files.cmake
@@ -13,44 +13,44 @@ list(APPEND cice_shared_files
   CICE/cicecore/shared/ice_spacecurve.F90
 
   #Analysis List:
-  CICE/cicecore/cicedynB/analysis/ice_diagnostics.F90
-  CICE/cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
-  CICE/cicecore/cicedynB/analysis/ice_history.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_bgc.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_drag.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_fsd.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_mechred.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_pond.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_shared.F90
-  CICE/cicecore/cicedynB/analysis/ice_history_snow.F90
+  CICE/cicecore/cicedyn/analysis/ice_diagnostics.F90
+  CICE/cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+  CICE/cicecore/cicedyn/analysis/ice_history.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_bgc.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_drag.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_fsd.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_mechred.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_pond.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_shared.F90
+  CICE/cicecore/cicedyn/analysis/ice_history_snow.F90
 
   #Dynamics List:
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_shared.F90
-  CICE/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
-  CICE/cicecore/cicedynB/dynamics/ice_transport_driver.F90
-  CICE/cicecore/cicedynB/dynamics/ice_transport_remap.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+  CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+  CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
+  CICE/cicecore/cicedyn/dynamics/ice_transport_remap.F90
 
   #General List:
-  CICE/cicecore/cicedynB/general/ice_flux.F90
-  CICE/cicecore/cicedynB/general/ice_flux_bgc.F90
-  CICE/cicecore/cicedynB/general/ice_forcing.F90
-  CICE/cicecore/cicedynB/general/ice_forcing_bgc.F90
-  CICE/cicecore/cicedynB/general/ice_init.F90
-  CICE/cicecore/cicedynB/general/ice_state.F90
-  CICE/cicecore/cicedynB/general/ice_step_mod.F90
+  CICE/cicecore/cicedyn/general/ice_flux.F90
+  CICE/cicecore/cicedyn/general/ice_flux_bgc.F90
+  CICE/cicecore/cicedyn/general/ice_forcing.F90
+  CICE/cicecore/cicedyn/general/ice_forcing_bgc.F90
+  CICE/cicecore/cicedyn/general/ice_init.F90
+  CICE/cicecore/cicedyn/general/ice_state.F90
+  CICE/cicecore/cicedyn/general/ice_step_mod.F90
 
   #Infrastructure List
-  CICE/cicecore/cicedynB/infrastructure/ice_blocks.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_domain.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_grid.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_read_write.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_restoring.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_memusage.F90
-  CICE/cicecore/cicedynB/infrastructure/ice_memusage_gptl.c)
+  CICE/cicecore/cicedyn/infrastructure/ice_blocks.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_domain.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_grid.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_read_write.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_restart_driver.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_restoring.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_memusage.F90
+  CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c)
 
 
 #Icepack List:
@@ -90,50 +90,50 @@ list(APPEND icepack_files
 )
 
 list(APPEND cice_shared_files_c
-  CICE/cicecore/cicedynB/infrastructure/ice_shr_reprosum86.c
+  CICE/cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c
 )
 
 #-- Using MPI
 list(APPEND cice_mpi_comm_files
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_boundary.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_broadcast.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_communicate.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_exit.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_gather_scatter.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_global_reductions.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_reprosum.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_timers.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90
 )
 
 #-- Using Serial
 list(APPEND cice_serial_comm_files
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_boundary.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_broadcast.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_communicate.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_exit.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_gather_scatter.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_global_reductions.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_reprosum.F90
-  CICE/cicecore/cicedynB/infrastructure/comm/serial/ice_timers.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_broadcast.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_communicate.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_reprosum.F90
+  CICE/cicecore/cicedyn/infrastructure/comm/serial/ice_timers.F90
 )
 
 #-- Using binary IO
 list(APPEND cice_binary_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
 )
 
 #-- Using NetCDF IO
 list(APPEND cice_netcdf_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
 )
 
 #PIO2 I/O List:
 list(APPEND cice_pio2_io_files
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_history_write.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_pio.F90
-  CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+  CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
 )
 
 #-- Using NUOPC CMEPS driver

diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/FV3 b/FV3
diff --git a/HYCOM-interface/CMakeLists.txt b/HYCOM-interface/CMakeLists.txt
@@ -9,9 +9,9 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
   set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
   set(CMAKE_Fortran_LINK_FLAGS "")
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
-  set(CMAKE_Fortran_FLAGS "-g -traceback -xSSE4.2 -mcmodel=small -r8")
+  set(CMAKE_Fortran_FLAGS "-g -traceback -mcmodel=small -r8 ${HYCOM_Extra_FORTRAN_FLAGS}")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model source -warn nogeneral")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check all -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
   set(CMAKE_Fortran_LINK_FLAGS "-V ${CMAKE_Fortran_FLAGS} -static-intel")
 else()
   message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
@@ -24,7 +24,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "GNU")
   set(CMAKE_C_FLAGS_DEBUG "-O0")
   set(CMAKE_C_LINK_FLAGS "")
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
-  set(CMAKE_C_FLAGS "-g -traceback -xSSE4.2 -mcmodel=small")
+  set(CMAKE_C_FLAGS "-g -traceback -mcmodel=small ${HYCOM_Extra_C_FLAGS}")
   set(CMAKE_C_FLAGS_RELEASE "-O")
   set(CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
   set(CMAKE_C_LINK_FLAGS "-V ${CMAKE_C_FLAGS} -static-intel")

diff --git a/HYCOM-interface/HYCOM b/HYCOM-interface/HYCOM
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp
diff --git a/cmake/Intel.cmake b/cmake/Intel.cmake
@@ -17,10 +17,15 @@ if(DEBUG)
     endif()
     set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
 else()
-    set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -qoverride-limits")
-    set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fp-model consistent")
-    set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal")
-    set(FAST "-fast-transcendentals")
+    if(FASTER)
+      set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model precise -assume buffered_stdout -fno-alias -align all -debug minimal -qoverride-limits -ftz -no-ip")
+      set(CMAKE_C_FLAGS_RELEASE       "-O3 -fp-model precise -debug minimal -qoverride-limits -ftz")
+    else()
+      set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -qoverride-limits")
+      set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -fp-model consistent")
+      set(CMAKE_C_FLAGS_RELEASE       "-O2 -debug minimal")
+      set(FAST "-fast-transcendentals")
+    endif()
     if(AVX2)
         set(CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE} -march=core-avx2")
         set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=core-avx2")

diff --git a/cmake/configure_gaea.intel.cmake b/cmake/configure_gaea.intel.cmake
@@ -1,3 +1,5 @@
 set(PARALLEL_NETCDF ON  CACHE BOOL "Enable parallel NetCDF" FORCE)
 set(DEBUG_LINKMPI   OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
 set(MOM6_Extra_FORTRAN_FLAGS "-xsse2")
+set(HYCOM_Extra_FORTRAN_FLAGS "-xSSE4.2")
+set(HYCOM_Extra_C_FLAGS "-xSSE4.2")
diff --git a/modulefiles/ufs_cheyenne.gnu.lua b/modulefiles/ufs_cheyenne.gnu.lua
@@ -14,23 +14,23 @@ load(pathJoin("ncarenv", ncarenv_ver))
 gnu_ver=os.getenv("gnu_ver") or "10.1.0"
 load(pathJoin("gnu", gnu_ver))
 
-mpt_ver=os.getenv("mpt_ver") or "2.22"
+mpt_ver=os.getenv("mpt_ver") or "2.25"
 load(pathJoin("mpt", mpt_ver))
 
 ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
 load(pathJoin("ncarcompilers", ncarcompilers_ver))
 
 unload("netcdf")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu10.1.0/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
 
 hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "10.1.0"
 load(pathJoin("hpc-gnu", hpc_gnu_ver))
 
-hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.22"
+hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
 load(pathJoin("hpc-mpt", hpc_mpt_ver))
 
 load("ufs_common")

diff --git a/modulefiles/ufs_cheyenne.gnu_debug.lua b/modulefiles/ufs_cheyenne.gnu_debug.lua
@@ -1,5 +1,5 @@
 help([[
-loads UFS Model prerequisites for Cheyenne/GNU
+loads UFS Model prerequisites for Cheyenne/GNU Debugging
 ]])
 
 cmake_ver=os.getenv("cmake_ver") or "3.22.0"
@@ -14,23 +14,23 @@ load(pathJoin("ncarenv", ncarenv_ver))
 gnu_ver=os.getenv("gnu_ver") or "10.1.0"
 load(pathJoin("gnu", gnu_ver))
 
-mpt_ver=os.getenv("mpt_ver") or "2.22"
+mpt_ver=os.getenv("mpt_ver") or "2.25"
 load(pathJoin("mpt", mpt_ver))
 
 ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
 load(pathJoin("ncarcompilers", ncarcompilers_ver))
 
 unload("netcdf")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/gnu/10.1.0/hpc-stack-v1.2.0/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu10.1.0/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
 
 hpc_gnu_ver=os.getenv("hpc_gnu_ver") or "10.1.0"
 load(pathJoin("hpc-gnu", hpc_gnu_ver))
 
-hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.22"
+hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
 load(pathJoin("hpc-mpt", hpc_mpt_ver))
 
 load("ufs_common_debug")

diff --git a/modulefiles/ufs_cheyenne.intel.lua b/modulefiles/ufs_cheyenne.intel.lua
@@ -23,7 +23,7 @@ load(pathJoin("ncarcompilers", ncarcompilers_ver))
 
 unload("netcdf")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
@@ -41,4 +41,4 @@ setenv("CXX", "mpicxx")
 setenv("FC", "mpif90")
 setenv("CMAKE_Platform", "cheyenne.intel")
 
-whatis("Description: UFS build environment")
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_cheyenne.intel_debug.lua b/modulefiles/ufs_cheyenne.intel_debug.lua
@@ -1,5 +1,5 @@
 help([[
-loads UFS Model prerequisites for Cheyenne/Intel
+loads UFS Model prerequisites for Cheyenne/Intel Debugging
 ]])
 
 cmake_ver=os.getenv("cmake_ver") or "3.22.0"
@@ -23,7 +23,7 @@ load(pathJoin("ncarcompilers", ncarcompilers_ver))
 
 unload("netcdf")
 
-prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
+prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack")
 
 hpc_ver=os.getenv("hpc_ver") or "1.2.0"
 load(pathJoin("hpc", hpc_ver))
@@ -41,4 +41,4 @@ setenv("CXX", "mpicxx")
 setenv("FC", "mpif90")
 setenv("CMAKE_Platform", "cheyenne.intel")
 
-whatis("Description: UFS build environment")
+whatis("Description: UFS build environment")
diff --git a/modulefiles/ufs_common.lua b/modulefiles/ufs_common.lua
@@ -35,7 +35,7 @@ load(pathJoin("crtm", crtm_ver))
 g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
 load(pathJoin("g2tmpl", g2tmpl_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/modulefiles/ufs_common_debug.lua b/modulefiles/ufs_common_debug.lua
@@ -35,7 +35,7 @@ load(pathJoin("crtm", crtm_ver))
 g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
 
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.0"
+g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
 load(pathJoin("g2tmpl", g2tmpl_ver))
 
 ip_ver=os.getenv("ip_ver") or "3.3.3"

diff --git a/modulefiles/ufs_gaea.intel b/modulefiles/ufs_gaea.intel
@@ -42,7 +42,7 @@ module load fms/2022.04
 module load bacio/2.4.1
 module load crtm/2.4.0
 module load g2/3.4.5
-module load g2tmpl/1.10.0
+module load g2tmpl/1.10.2
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3emc/2.9.2

diff --git a/modulefiles/ufs_gaea.intel_debug b/modulefiles/ufs_gaea.intel_debug
@@ -39,7 +39,7 @@ module load fms/2022.04
 module load bacio/2.4.1
 module load crtm/2.4.0
 module load g2/3.4.5
-module load g2tmpl/1.10.0
+module load g2tmpl/1.10.2
 module load ip/3.3.3
 module load sp/2.3.3
 module load w3emc/2.9.2

diff --git a/modulefiles/ufs_hera.gnu.lua b/modulefiles/ufs_hera.gnu.lua
@@ -2,8 +2,8 @@ help([[
 loads UFS Model prerequisites for Hera/GNU
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles")
-miniconda3_ver=os.getenv("miniconda3_ver") or "3.7.3"
+prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
+miniconda3_ver=os.getenv("miniconda3_ver") or "4.12.0"
 load(pathJoin("miniconda3", miniconda3_ver))
 
 prepend_path("MODULEPATH", "/contrib/sutils/modulefiles")
+36 −0		.github/ISSUE_TEMPLATE/bug_report.md
+22 −0		.github/ISSUE_TEMPLATE/feature_request.md
+24 −0		.github/pull_request_template.md
+4 −1		aqm_files.cmake
+5 −0		examples/aqm.rc
+28 −12		src/aqm_cap.F90
+6 −0		src/aqm_comp_mod.F90
+4 −3		src/drv/cmaq_mod.F90
+259 −19		src/io/aqmio/aqmio.F90
+30 −18		src/model/Makefile.am
+128 −86		src/model/Makefile.in
+30 −0		src/model/src/ASX_DATA_MOD.F
+14 −0		src/model/src/PT3D_DATA_MOD.F
+44 −263		src/model/src/PT3D_DEFN.F
+294 −0		src/model/src/PT3D_FIRE_DEFN.F
+501 −0		src/model/src/PT3D_STKS_DEFN.F
+213 −29		src/model/src/PTMAP.F
+894 −0		src/model/src/aero_depv.F
+35 −25		src/model/src/vdiffacmx.F
+4 −0		src/shr/aqm_const_mod.F90
+989 −52		src/shr/aqm_emis_mod.F90
+17 −6		src/shr/aqm_fires_mod.F90
+24 −0		src/shr/aqm_internal_mod.F90
+25 −6		src/shr/aqm_methods.F90
+35 −10		src/shr/aqm_model_mod.F90
+1 −1		src/shr/aqm_prod_mod.F90
+1 −0		src/shr/aqm_state_mod.F90
+211 −1		src/shr/aqm_tools_mod.F90
+14 −0		.github/workflows/test-cice.yml
+16 −1		cice.setup
+37 −8		cicecore/cicedyn/analysis/ice_diagnostics.F90
+0 −0		cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
+48 −17		cicecore/cicedyn/analysis/ice_history.F90
+25 −6		cicecore/cicedyn/analysis/ice_history_bgc.F90
+24 −6		cicecore/cicedyn/analysis/ice_history_drag.F90
+24 −6		cicecore/cicedyn/analysis/ice_history_fsd.F90
+24 −6		cicecore/cicedyn/analysis/ice_history_mechred.F90
+27 −9		cicecore/cicedyn/analysis/ice_history_pond.F90
+1 −1		cicecore/cicedyn/analysis/ice_history_shared.F90
+27 −7		cicecore/cicedyn/analysis/ice_history_snow.F90
+51 −78		cicecore/cicedyn/dynamics/ice_dyn_eap.F90
+347 −270		cicecore/cicedyn/dynamics/ice_dyn_evp.F90
+1 −1		cicecore/cicedyn/dynamics/ice_dyn_evp_1d.F90
+24 −21		cicecore/cicedyn/dynamics/ice_dyn_shared.F90
+8 −12		cicecore/cicedyn/dynamics/ice_dyn_vp.F90
+0 −0		cicecore/cicedyn/dynamics/ice_transport_driver.F90
+0 −0		cicecore/cicedyn/dynamics/ice_transport_remap.F90
+0 −0		cicecore/cicedyn/general/ice_flux.F90
+0 −0		cicecore/cicedyn/general/ice_flux_bgc.F90
+8 −8		cicecore/cicedyn/general/ice_forcing.F90
+0 −0		cicecore/cicedyn/general/ice_forcing_bgc.F90
+193 −78		cicecore/cicedyn/general/ice_init.F90
+0 −0		cicecore/cicedyn/general/ice_state.F90
+0 −0		cicecore/cicedyn/general/ice_step_mod.F90
+0 −3		cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90
+0 −3		cicecore/cicedyn/infrastructure/comm/serial/ice_boundary.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_broadcast.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_communicate.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_exit.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_gather_scatter.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_global_reductions.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_reprosum.F90
+0 −0		cicecore/cicedyn/infrastructure/comm/serial/ice_timers.F90
+0 −0		cicecore/cicedyn/infrastructure/ice_blocks.F90
+25 −9		cicecore/cicedyn/infrastructure/ice_domain.F90
+55 −54		cicecore/cicedyn/infrastructure/ice_grid.F90
+0 −0		cicecore/cicedyn/infrastructure/ice_memusage.F90
+1 −1		cicecore/cicedyn/infrastructure/ice_memusage_gptl.c
+0 −0		cicecore/cicedyn/infrastructure/ice_read_write.F90
+91 −65		cicecore/cicedyn/infrastructure/ice_restart_driver.F90
+0 −0		cicecore/cicedyn/infrastructure/ice_restoring.F90
+0 −0		cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c
+0 −0		cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+0 −0		cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+0 −0		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+0 −0		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+0 −0		cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+0 −0		cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+2 −13		cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+1 −0		cicecore/cicedynB
+7 −7		cicecore/drivers/direct/hadgem3/CICE_InitMod.F90
+7 −7		cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90
+6 −6		cicecore/drivers/mct/cesm1/CICE_InitMod.F90
+6 −7		cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+3 −3		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+2 −2		cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+21 −10		cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+6 −6		cicecore/drivers/standalone/cice/CICE_InitMod.F90
+6 −6		cicecore/drivers/unittest/gridavgchk/CICE_InitMod.F90
+7 −6		cicecore/drivers/unittest/sumchk/CICE_InitMod.F90
+62 −2		cicecore/shared/ice_fileunits.F90
+9 −0		cicecore/shared/ice_init_column.F90
+1 −1		cicecore/version.txt
+6 −6		configuration/scripts/cice.build
+2 −0		configuration/scripts/ice_in
+1 −0		configuration/scripts/options/set_nml.dyneap
+2 −0		configuration/scripts/options/set_nml.saltflux
+1 −2		configuration/scripts/tests/base_suite.ts
+2 −0		configuration/scripts/tests/decomp_suite.ts
+14 −1		configuration/scripts/tests/first_suite.ts
+7 −6		configuration/scripts/tests/gridsys_suite.ts
+58 −54		configuration/scripts/tests/omp_suite.ts
+16 −17		configuration/scripts/tests/perf_suite.ts
+2 −1		doc/source/cice_index.rst
+2 −2		doc/source/conf.py
+11 −11		doc/source/developer_guide/dg_dynamics.rst
+1 −1		doc/source/developer_guide/dg_forcing.rst
+6 −3		doc/source/science_guide/sg_horiztrans.rst
+1 −1		doc/source/science_guide/sg_tracers.rst
+12 −9		doc/source/user_guide/ug_case_settings.rst
+1 −1		doc/source/user_guide/ug_implementation.rst
+63 −20		doc/source/user_guide/ug_testing.rst
+20 −0		doc/source/user_guide/ug_troubleshooting.rst
+1 −1		icepack
+1 −1		.github/workflows/bumpversion.yml
+41 −90		.github/workflows/extbuild.yml
+131 −104		.github/workflows/srt.yml
+24 −0		.pre-commit-config.yaml
+73 −56		cesm/driver/ensemble_driver.F90
+24 −48		cesm/driver/esm.F90
+14 −16		cesm/driver/esm_time_mod.F90
+0 −1		cesm/driver/t_driver_timers_mod.F90
+2 −1		cesm/flux_atmocn/shr_flux_mod.F90
+6 −7		cesm/nuopc_cap_share/driver_pio_mod.F90
+1 −1		cesm/nuopc_cap_share/esm_utils_mod.F90
+12 −10		cesm/nuopc_cap_share/nuopc_shr_methods.F90
+3 −1		cesm/nuopc_cap_share/shr_carma_mod.F90
+7 −4		cesm/nuopc_cap_share/shr_drydep_mod.F90
+3 −2		cesm/nuopc_cap_share/shr_megan_mod.F90
+4 −4		cesm/nuopc_cap_share/shr_ndep_mod.F90
+3 −3		cesm/nuopc_cap_share/shr_ozone_coupling_mod.F90
+327 −240		cime_config/buildnml
+2 −2		cime_config/config_component.xml
+1 −1		cime_config/config_component_cesm.xml
+2 −2		cime_config/namelist_definition_drv.xml
+1 −1		doc/source/addendum/req_attributes.rst
+8 −8		doc/source/conf.py
+1 −1		doc/source/index.rst
+2 −2		mediator/CMakeLists.txt
+25 −35		mediator/esmFlds.F90
+21 −23		mediator/esmFldsExchange_cesm_mod.F90
+4 −10		mediator/esmFldsExchange_hafs_mod.F90
+1 −4		mediator/esmFldsExchange_nems_mod.F90
+38 −47		mediator/med.F90
+34 −46		mediator/med_diag_mod.F90
+2 −5		mediator/med_fraction_mod.F90
+7 −10		mediator/med_internalstate_mod.F90
+60 −45		mediator/med_io_mod.F90
+27 −35		mediator/med_map_mod.F90
+7 −12		mediator/med_merge_mod.F90
+11 −15		mediator/med_methods_mod.F90
+14 −28		mediator/med_phases_aofluxes_mod.F90
+18 −32		mediator/med_phases_history_mod.F90
+21 −26		mediator/med_phases_ocnalb_mod.F90
+1 −1		mediator/med_phases_post_atm_mod.F90
+6 −15		mediator/med_phases_post_glc_mod.F90
+2 −2		mediator/med_phases_post_ice_mod.F90
+1 −1		mediator/med_phases_post_lnd_mod.F90
+1 −1		mediator/med_phases_post_ocn_mod.F90
+2 −2		mediator/med_phases_post_rof_mod.F90
+1 −1		mediator/med_phases_post_wav_mod.F90
+3 −4		mediator/med_phases_prep_atm_mod.F90
+13 −32		mediator/med_phases_prep_glc_mod.F90
+5 −8		mediator/med_phases_prep_ice_mod.F90
+3 −6		mediator/med_phases_prep_lnd_mod.F90
+7 −11		mediator/med_phases_prep_ocn_mod.F90
+5 −16		mediator/med_phases_prep_rof_mod.F90
+3 −4		mediator/med_phases_prep_wav_mod.F90
+7 −5		mediator/med_phases_profile_mod.F90
+9 −14		mediator/med_phases_restart_mod.F90
+2 −3		mediator/med_time_mod.F90
+10 −8		mediator/med_utils_mod.F90
+5 −5		ufs/flux_atmocn_ccpp_mod.F90
+2 −6		ufs/flux_atmocn_mod.F90
+2 −1		ufs/glc_elevclass_mod.F90
+5 −5		ufs/ufs_io_mod.F90
+2 −2		.gitmodules
+1 −1		atmos_cubed_sphere
+7 −9		atmos_model.F90
+3 −37		ccpp/config/ccpp_prebuild_config.py
+33 −168		ccpp/data/CCPP_typedefs.F90
+45 −137		ccpp/data/CCPP_typedefs.meta
+61 −16		ccpp/data/GFS_typedefs.F90
+74 −8		ccpp/data/GFS_typedefs.meta
+83 −0		ccpp/driver/GFS_diagnostics.F90
+9 −0		ccpp/driver/GFS_restart.F90
+1 −1		ccpp/physics
+3 −12		ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_thompson_noahmp_nonsst.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+2 −2		ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+0 −97		ccpp/suites/suite_FV3_RAP_RRTMGP.xml
+2 −2		io/FV3GFS_io.F90
+53 −40		io/module_wrt_grid_comp.F90
+68 −1		io/post_fv3.F90
+265 −38		moving_nest/fv_moving_nest.F90
+24 −8		moving_nest/fv_moving_nest_main.F90
+2 −2		moving_nest/fv_moving_nest_types.F90
+1 −1		moving_nest/fv_moving_nest_utils.F90
+1 −1		upp
+43 −261		.github/workflows/datm_noahmp.yaml
+0 −159		.github/workflows/scripts/gen_config.py
+0 −64		.github/workflows/scripts/gen_runseq.py
+0 −202		.github/workflows/scripts/get_input.py
+0 −19		.github/workflows/spack/spack.yaml
+0 −129		.github/workflows/tests/lnd.yaml
+9 −2		.github/workflows/tests/test_datm_lnd.yaml
+28 −26		.github/workflows/tests/test_datm_lnd/datm.yaml
+141 −0		.github/workflows/tests/test_datm_lnd/lnd.yaml
+1 −1		README.md
+3 −2		drivers/ccpp/noahmpdrv.F90
+8 −0		drivers/ccpp/noahmpdrv.meta
+1 −0		drivers/nuopc/lnd_comp_driver.F90
+3 −0		drivers/nuopc/lnd_comp_types.F90
+4 −2		src/module_sf_noahmplsm.f90