E3SM-Ocean-Discussion · cbegeman · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025
diff --git a/.github/actions/test-all-eamxx/action.yml b/.github/actions/test-all-eamxx/action.yml
@@ -135,8 +135,8 @@ runs:
       with:
         name: log-files-${{ inputs.build_type }}-${{ inputs.machine }}
         path: |
-          components/eamxx/ctest-build/*/Testing/Temporary/Last*.log
-          components/eamxx/ctest-build/*/ctest_resource_file.json
-          components/eamxx/ctest-build/*/CMakeCache.txt
+          components/eamxx/ctest-build/**/Testing/Temporary/Last*.log
+          components/eamxx/ctest-build/**/ctest_resource_file.json
+          components/eamxx/ctest-build/**/CMakeCache.txt
       env:
         NODE_EXTRA_CA_CERTS: ${{ env.NODE_EXTRA_CA_CERTS }}
diff --git a/.github/workflows/e3sm-gh-ci-cime-tests.yml b/.github/workflows/e3sm-gh-ci-cime-tests.yml
@@ -47,7 +47,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           show-progress: false
           submodules: recursive
@@ -58,7 +58,7 @@ jobs:
           ./create_test ${{ matrix.test }} --wait --debug
       -
         name: Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ always() }}
         with:
           name: ${{ matrix.test }}

diff --git a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
       - 
         name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           show-progress: false
           submodules: recursive
@@ -46,7 +46,7 @@ jobs:
           ./create_test ${{ matrix.test }} --wait --debug
       - 
         name: Artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         if: ${{ always() }}
         with:
           name: ${{ matrix.test }}

diff --git a/.github/workflows/e3sm-gh-md-linter.yml b/.github/workflows/e3sm-gh-md-linter.yml
@@ -17,15 +17,15 @@ jobs:
     if: ${{ github.repository == 'E3SM-Project/E3SM' }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - uses: tj-actions/changed-files@v47
       id: changed-files
       with:
         files: '**/*.md'
         separator: ","
-    - uses: DavidAnson/markdownlint-cli2-action@v21
+    - uses: DavidAnson/markdownlint-cli2-action@v22
       if: steps.changed-files.outputs.any_changed == 'true'
       with:
         config: 'docs/.markdownlint.json'

diff --git a/.github/workflows/e3sm-gh-pages.yml b/.github/workflows/e3sm-gh-pages.yml
@@ -39,7 +39,7 @@ jobs:
         shell: bash -leo pipefail {0}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false

diff --git a/.github/workflows/eamxx-gh-clang-format.yml b/.github/workflows/eamxx-gh-clang-format.yml
@@ -34,7 +34,7 @@ jobs:
   clang-format-linter:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v5
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 0
     - uses: tj-actions/changed-files@v47
@@ -138,7 +138,7 @@ jobs:
         fi
     - name: upload diff patch
       if: ${{ env.status_fail == 'true' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       with:
         name: ${{ env.fname }}
         path: "components/eamxx/${{ env.fname }}"

diff --git a/.github/workflows/eamxx-sa-coverage.yml b/.github/workflows/eamxx-sa-coverage.yml
@@ -27,7 +27,7 @@ jobs:
     name: gcc-openmp / cov
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false
@@ -47,7 +47,7 @@ jobs:
     name: gcc-cuda / cov
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false

diff --git a/.github/workflows/eamxx-sa-sanitizer.yml b/.github/workflows/eamxx-sa-sanitizer.yml
@@ -27,7 +27,7 @@ jobs:
     name: gcc-openmp / valg
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false
@@ -51,7 +51,7 @@ jobs:
     name: gcc-cuda / ${{ matrix.build_type }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false

diff --git a/.github/workflows/eamxx-sa-testing.yml b/.github/workflows/eamxx-sa-testing.yml
@@ -86,7 +86,7 @@ jobs:
     name: gcc-openmp / ${{ matrix.build_type }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false
@@ -126,7 +126,7 @@ jobs:
     name: gcc-cuda / ${{ matrix.test.build_type }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false

diff --git a/.github/workflows/eamxx-scripts-tests.yml b/.github/workflows/eamxx-scripts-tests.yml
@@ -40,7 +40,7 @@ jobs:
     runs-on:  [self-hosted, gcc, ghci-snl-cpu]
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false

diff --git a/.github/workflows/eamxx-v1-testing.yml b/.github/workflows/eamxx-v1-testing.yml
@@ -83,7 +83,7 @@ jobs:
     name: cpu-gcc / ${{ matrix.test.short_name }}
     steps:
       - name: Check out the repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
           show-progress: false
@@ -112,7 +112,7 @@ jobs:
           ./cime/scripts/create_test ${{ matrix.test.full_name }} ${{ env.flags }} --wait
       - name: Upload log files
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: logs.${{ matrix.test.short_name }}
           path: |
@@ -126,7 +126,7 @@ jobs:
           NODE_EXTRA_CA_CERTS: ${{ env.NODE_EXTRA_CA_CERTS }}
       - name: Upload nc files
         if: ${{ failure() && steps.run-tests.outcome == 'failure' }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: outputs.${{ matrix.test.short_name }}
           path: |

diff --git a/.gitignore b/.gitignore
@@ -55,3 +55,6 @@ components/eamxx/docs/_presentations_html/
 components/eamxx/src/python/build
 components/eamxx/src/python/build_src
 components/eamxx/src/python/dist
+
+# Emulator Components
+components/emulators/build
diff --git a/cime b/cime
diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
@@ -411,6 +411,11 @@
   <lname>1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>CRYO1850-CMIP7</alias>
+  <lname>1850SOI%CMIP7_EAM_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>CRYO1850-4xCO2</alias>
   <lname>1850SOI_EAM%CMIP6-4xCO2_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
@@ -421,6 +426,11 @@
   <lname>1850SOI_EAM%CMIP6-1pctCO2_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>CRYO1850-CMIP7-1pctCO2</alias>
+  <lname>1850SOI%CMIP7-1pctCO2_EAM_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>CRYO1950</alias>
   <lname>1950SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
@@ -431,6 +441,11 @@
   <lname>1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>CRYO1850-DISMF-CMIP7</alias>
+  <lname>1850SOI%CMIP7_EAM_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>CRYO1950-DISMF</alias>
   <lname>1950SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBDISMF_MOSART_SGLC_SWAV</lname>
@@ -441,6 +456,11 @@
   <lname>20TRSOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<compset>
+  <alias>CRYO20TR-CMIP7</alias>
+  <lname>20TRSOI%CMIP7_EAM_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>CRYOSSP245</alias>
   <lname>SSP245SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
+9 −8		CIME/Servers/wget.py
+5 −1		CIME/SystemTests/eri.py
+5 −0		CIME/SystemTests/erp.py
+10 −2		CIME/SystemTests/funit.py
+4 −0		CIME/SystemTests/pet.py
+2 −2		CIME/Tools/Makefile
+27 −8		CIME/Tools/pelayout
+44 −9		CIME/XML/namelist_definition.py
+30 −1		CIME/XML/pes.py
+9 −2		CIME/XML/tests.py
+9 −0		CIME/case/case.py
+8 −1		CIME/case/case_clone.py
+12 −14		CIME/case/case_st_archive.py
+2 −0		CIME/data/config/cesm/config_files.xml
+1 −0		CIME/data/config/config_headers.xml
+0 −2		CIME/data/config/config_tests.xml
+2 −2		CIME/data/templates/gitignore.template
+1 −1		CIME/non_py/cprnc
+17 −11		CIME/non_py/src/CMake/CIME_initial_setup.cmake
+28 −14		CIME/non_py/src/CMake/CIME_utils.cmake
+35 −0		CIME/non_py/src/CMake/Sourcelist_utils.cmake
+4 −1		CIME/test_scheduler.py
+41 −0		CIME/tests/test_sys_cime_case.py
+13 −14		CIME/tests/test_unit_baselines_performance.py
+125 −12		CIME/tests/test_unit_xml_namelist_definition.py
+43 −21		CIME/tests/test_unit_xml_tests.py
+6 −1		CIME/utils.py
+2 −0		doc/source/ccs/model-configuration/variables/pes.rst
+1 −1		doc/source/system_testing.rst
+16 −6		scripts/fortran_unit_testing/run_tests.py