Merge branch 'ufs-community:develop' into RT_bmark_gefs

NickSzapiro-NOAA · Jun 6, 2024 · 611db6c · 611db6c
2 parents 3cf9825 + 485ccdf
commit 611db6c
Show file tree

Hide file tree

Showing 58 changed files with 3,668 additions and 2,907 deletions.
diff --git a/CICE-interface/CICE b/CICE-interface/CICE
diff --git a/CMEPS-interface/CMEPS b/CMEPS-interface/CMEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -73,6 +73,7 @@ set(JEDI_DRIVER     OFF CACHE BOOL "Enable JEDI as top level driver")
 set(CMEPS_AOFLUX    OFF CACHE BOOL "Enable atmosphere-ocean flux calculation in mediator")
 set(PDLIB           OFF CACHE BOOL "Enable Domain Decomposition in WW3 via PDLIB")
 set(CDEPS_INLINE    OFF CACHE BOOL "Enable CDEPS inline capability")
+set(HYDRO           OFF CACHE BOOL "Enable hydrostatic set")
 
 set(CMAKE_Platform $ENV{CMAKE_Platform})
 if(CMAKE_Platform)
@@ -122,6 +123,7 @@ message("PARALLEL_NETCDF .. ${PARALLEL_NETCDF}")
 message("JEDI_DRIVER ...... ${JEDI_DRIVER}")
 message("CMEPS_AOFLUX ..... ${CMEPS_AOFLUX}")
 message("CDEPS_INLINE ..... ${CDEPS_INLINE}")
+message("HYDRO  ........... ${HYDRO}")
 
 message("")
 

diff --git a/FV3 b/FV3
diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/NOAHMP-interface/CMakeLists.txt b/NOAHMP-interface/CMakeLists.txt
@@ -56,8 +56,10 @@ endif()
 
 #------------------------------------------------------------------------------
 # Add model-specific flags for C/C++/Fortran preprocessor
-add_definitions(-DMOIST_CAPPA -DUSE_COND -DNEMS_GSM)
-add_definitions(-DINTERNAL_FILE_NML)
+if (NOT HYDRO)
+add_definitions(-DMOIST_CAPPA -DUSE_COND)
+endif()
+add_definitions(-DINTERNAL_FILE_NML -DNEMS_GSM)
 
 #------------------------------------------------------------------------------
 # NOAHMP

diff --git a/NOAHMP-interface/noahmp b/NOAHMP-interface/noahmp
diff --git a/doc/UsersGuide/requirements.txt b/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,11 +24,7 @@ idna==3.7
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
-    # via
-    #   sphinx
-    #   sphinxcontrib-bibtex
-jinja2==3.1.3
+jinja2==3.1.4
     # via sphinx
 latexcodec==2.0.1
     # via pybtex
@@ -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
diff --git a/doc/UsersGuide/source/BuildingAndRunning.rst b/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
 ^^^^^^^^^^^^^^^^^^

diff --git a/doc/UsersGuide/source/Glossary.rst b/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. 

diff --git a/modulefiles/ufs_acorn.intel.lua b/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")

diff --git a/modulefiles/ufs_common.lua b/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"},
 }
 

diff --git a/modulefiles/ufs_gaea.intel.lua b/modulefiles/ufs_gaea.intel.lua
@@ -10,7 +10,7 @@ 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/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/modulefiles")
 
 stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
@@ -19,7 +19,7 @@ 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))
 
 load("ufs_common")

diff --git a/modulefiles/ufs_hera.gnu.lua b/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")

diff --git a/modulefiles/ufs_hera.intel.lua b/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))

diff --git a/modulefiles/ufs_hercules.gnu.lua b/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")
 

diff --git a/modulefiles/ufs_hercules.intel.lua b/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))

diff --git a/modulefiles/ufs_jet.intel.lua b/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))

diff --git a/modulefiles/ufs_noaacloud.intel.lua b/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))

diff --git a/modulefiles/ufs_orion.intel.lua b/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))

diff --git a/modulefiles/ufs_s4.intel.lua b/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))

diff --git a/modulefiles/ufs_wcoss2.intel.lua b/modulefiles/ufs_wcoss2.intel.lua
@@ -18,27 +18,28 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
 cmake_ver=os.getenv("cmake_ver") or "3.20.2"
 load(pathJoin("cmake", cmake_ver))
 
---prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/compiler/intel/19.1.3.304")
---prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
+append_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.6.0_pnetcdf/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
 
 local ufs_modules = {
-  {["jasper"]          = "2.0.25"},
-  {["zlib"]            = "1.2.11"},
-  {["libpng"]          = "1.6.37"},
-  {["hdf5-B"]          = "1.14.0"},
-  {["netcdf-B"]        = "4.9.2"},
-  {["pio-B"]           = "2.5.10"},
-  {["esmf-B"]          = "8.5.0"},
-  {["fms"]             = "2023.02.01"},
-  {["bacio"]           = "2.4.1"},
-  {["crtm"]            = "2.4.0"},
-  {["g2"]              = "3.4.5"},
-  {["g2tmpl"]          = "1.10.2"},
-  {["ip"]              = "3.3.3"},
-  {["sp"]              = "2.3.3"},
-  {["w3emc"]           = "2.9.2"},
-  {["gftl-shared"]     = "1.6.1"},
-  {["mapl-B"]          = "2.40.3"},
+  {["jasper"]      = "2.0.25"},
+  {["zlib"]        = "1.2.11"},
+  {["libpng"]      = "1.6.37"},
+  {["hdf5"]        = "1.14.0"},
+  {["netcdf"]      = "4.9.2"},
+  {["pio"]         = "2.5.10"},
+  {["esmf"]        = "8.6.0"},
+  {["fms"]         = "2023.04"},
+  {["bacio"]       = "2.4.1"},
+  {["crtm"]        = "2.4.0"},
+  {["g2"]          = "3.4.5"},
+  {["g2tmpl"]      = "1.10.2"},
+  {["ip"]          = "3.3.3"},
+  {["sp"]          = "2.3.3"},
+  {["w3emc"]       = "2.9.2"},
+  {["gftl-shared"] = "1.6.1"},
+  {["mapl"]        = "2.40.3-esmf-8.6.0"},
+  {["pnetcdf"]     = "1.12.2"},
+  {["scotch"]      = "7.0.4"},
 }
 
 for i = 1, #ufs_modules do
@@ -48,10 +49,6 @@ for i = 1, #ufs_modules do
   end
 end
 
-prepend_path("MODULEPATH", "/apps/prod/lmodules/INTEL_cray_mpich/19.1.3.304/cray-mpich/8.1.9")
-scotch_ver=os.getenv("scotch_ver") or "7.0.4"
-load(pathJoin("scotch",scotch_ver))
-
 setenv("CC", "cc")
 setenv("CXX", "CC")
 setenv("FC", "ftn")

diff --git a/stochastic_physics b/stochastic_physics
diff --git a/tests/bl_date.conf b/tests/bl_date.conf
@@ -1 +1 @@
-export BL_DATE=20240430
+export BL_DATE=20240603
diff --git a/tests/ci/Jenkinsfile.combined b/tests/ci/Jenkinsfile.combined
@@ -69,6 +69,10 @@ def generateStage(nodeLabel) {
                             cd $WORKSPACE/tests/
                           elif [[ $machine =~ "Orion" ]]
                           then
+                            cd ..
+                            module load git/2.28.0
+                            git submodule update --init --recursive
+                            cd tests
                             echo "Creating baselines on $machine"
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed -i 's|/work/noaa/stmp/${USER}|/work/noaa/epic/stmp/role-epic/|g' rt.sh
@@ -214,6 +218,10 @@ def generateStage(nodeLabel) {
                           elif [[ $machine =~ "Orion" ]]
                           then
                            echo "Running regression tests on $machine"
+                            cd ..
+                            module load git/2.28.0
+                            git submodule update --init --recursive
+                            cd tests
                             export dprefix=/work2/noaa/$ACCNR/$USER
                             sed "s|/noaa/stmp/|/noaa/$ACCNR/stmp/|g" -i rt.sh
                             ./rt.sh -a ${ACCNR} -e -l rt.conf | tee $WORKSPACE/tests/logs/RT-run-$machine.log

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -556,6 +556,14 @@ export EXTERNAL_IC=.true.
 export MAKE_NH=.true.
 export MOUNTAIN=.false.
 export NA_INIT=1
+export DO_VORT_DAMP=.true.
+export HYDROSTATIC=.false.
+export KORD_XX=9
+export KORD_TM=-9
+export D_CON=1.
+export HORD_XX=5
+export HORD_DP=-5
+export HORD_TR=8
 
 # Radiation
 export DO_RRTMGP=.false.
@@ -910,10 +918,6 @@ export_cice6() {
   export CICE_RESTART_DEFLATE=0
 
   export CICE_HISTORY_FORMAT='pnetcdf2'
-  if [[ ${MACHINE_ID} == wcoss2 ]]; then
-    export CICE_RESTART_FORMAT='hdf5'
-    export CICE_HISTORY_FORMAT='hdf5'
-  fi
   export CICE_HISTORY_IOTASKS=-99
   export CICE_HISTORY_REARR='box'
   export CICE_HISTORY_ROOT=-99

diff --git a/tests/fv3_conf/control_run.IN b/tests/fv3_conf/control_run.IN
@@ -133,7 +133,7 @@ fi
 #merra2
 if [ $USE_MERRA2 = .true. ]; then
   for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
+    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
   done
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat

diff --git a/tests/fv3_conf/cpld_control_run.IN b/tests/fv3_conf/cpld_control_run.IN
@@ -173,7 +173,7 @@ fi
 #merra2
 if [ $IAER = 1011 ]; then
   for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2.aerclim.2003-2014.m${n}.nc aeroclim.m${n}.nc
+    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
   done
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_BC.v1_3.dat  optics_BC.dat
   cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/aer_data/LUTS/optics_OC.v1_3.dat  optics_OC.dat

diff --git a/tests/fv3_conf/fv3_gocart.IN b/tests/fv3_conf/fv3_gocart.IN
@@ -7,9 +7,8 @@ else
   cp -r @[INPUTDATA_ROOT]/FV3_input_data/RESTART/* ./INPUT
 fi
 cp    @[INPUTDATA_ROOT]/FV3_input_data/*grb .
-cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2/merra2C.aerclim.2003-2014.*nc .
 for n in 01 02 03 04 05 06 07 08 09 10 11 12; do
-ln -sf merra2C.aerclim.2003-2014.m${n}.nc  aeroclim.m${n}.nc
+    cp @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/MERRA2_y14_24/merra2_1423_${n}.nc aeroclim.m${n}.nc
 done
 cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NAAI_monclimo2.nc cam5_4_143_NAAI_monclimo2.nc
 cp    @[INPUTDATA_ROOT]/FV3_input_data_INCCN_aeroclim/mg2_IN_CCN/cam5_4_143_NPCCN_monclimo2.nc cam5_4_143_NPCCN_monclimo2.nc
+1 −2		.github/workflows/test-cice.yml
+51 −4		cicecore/cicedyn/analysis/ice_history.F90
+53 −11		cicecore/cicedyn/analysis/ice_history_shared.F90
+8 −2		cicecore/cicedyn/general/ice_flux.F90
+1 −1		cicecore/cicedyn/general/ice_init.F90
+22 −20		cicecore/cicedyn/general/ice_step_mod.F90
+8 −8		cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
+97 −93		cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+87 −83		cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+1 −1		cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+5 −3		cicecore/drivers/direct/hadgem3/CICE_RunMod.F90
+5 −3		cicecore/drivers/direct/nemo_concepts/CICE_RunMod.F90
+6 −4		cicecore/drivers/mct/cesm1/CICE_RunMod.F90
+6 −4		cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+20 −5		cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+6 −4		cicecore/drivers/nuopc/dmi/CICE_RunMod.F90
+6 −4		cicecore/drivers/standalone/cice/CICE_RunMod.F90
+2 −1		cicecore/drivers/unittest/opticep/CICE_InitMod.F90
+6 −4		cicecore/drivers/unittest/opticep/CICE_RunMod.F90
+22 −20		cicecore/drivers/unittest/opticep/ice_step_mod.F90
+1 −1		configuration/scripts/cice.batch.csh
+20 −0		configuration/scripts/cice.launch.csh
+8 −0		configuration/scripts/ice_in
+60 −0		configuration/scripts/machines/Macros.carpenter_cray
+69 −0		configuration/scripts/machines/Macros.carpenter_gnu
+69 −0		configuration/scripts/machines/Macros.carpenter_gnuimpi
+59 −0		configuration/scripts/machines/Macros.carpenter_intel
+59 −0		configuration/scripts/machines/Macros.carpenter_intelimpi
+2 −1		configuration/scripts/machines/Macros.conda_macos
+54 −0		configuration/scripts/machines/env.carpenter_cray
+58 −0		configuration/scripts/machines/env.carpenter_gnu
+58 −0		configuration/scripts/machines/env.carpenter_gnuimpi
+57 −0		configuration/scripts/machines/env.carpenter_intel
+57 −0		configuration/scripts/machines/env.carpenter_intelimpi
+1 −0		configuration/scripts/options/set_nml.histinst
+1 −1		doc/source/user_guide/ug_case_settings.rst
+75 −75		doc/source/user_guide/ug_implementation.rst
+2 −3		.github/workflows/GCC.yml
+8 −1		CMakeLists.txt
+1 −1		atmos_cubed_sphere
+60 −12		atmos_model.F90
+4 −2		ccpp/CMakeLists.txt
+30 −0		ccpp/data/CCPP_typedefs.F90
+68 −20		ccpp/data/CCPP_typedefs.meta
+31 −13		ccpp/data/GFS_typedefs.F90
+6 −37		ccpp/data/GFS_typedefs.meta
+7 −3		ccpp/driver/CCPP_driver.F90
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+17 −0		fv3_cap.F90
+3 −2		io/fv3atm_history_io.F90
+31 −29		io/module_fv3_io_def.F90
+1 −1		io/module_write_internal_state.F90
+189 −170		io/module_wrt_grid_comp.F90
+82 −60		io/post_fv3.F90
+38 −0		module_fcst_grid_comp.F90
+1 −0		stochastic_physics/stochastic_physics_wrapper.F90
+1 −1		upp
+21 −2		config_src/drivers/nuopc_cap/mom_cap.F90
+8 −8		config_src/external/database_comms/database_client_interface.F90
+19 −3		drivers/ccpp/noahmpdrv.F90
+8 −0		drivers/ccpp/noahmpdrv.meta
+39 −15		drivers/ccpp/sfc_diff.f
+1 −1		drivers/nuopc/lnd_comp_driver.F90
+3 −0		drivers/nuopc/lnd_comp_types.F90
+7 −3		src/module_sf_noahmplsm.F90