Merge remote-tracking branch 'upstream/master' into bartgol/upstream-…

…merge-20240515

.github/workflows/e3sm-gh-ci-cime-tests.yml

@@ -3,6 +3,18 @@ name: gh
 on:
   pull_request:
     branches: [ master ]
+    paths:
+      # first, yes to these
+      - 'cime_config/**'
+      - 'components/eam/**'
+      - 'components/elm/**'
+      - 'driver-moab/**'
+      - 'driver-mct/**'
+      # second, no to these
+      - '!components/eam/docs/**'
+      - '!components/eam/mkdocs.yml'
+      - '!components/elm/docs/**'
+      - '!components/elm/mkdocs.yml'
 
   workflow_dispatch:
 

.github/workflows/e3sm-gh-ci-w-cime-tests.yml

@@ -0,0 +1,59 @@
+name: gh
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths-ignore:
+      - 'mkdocs.yaml'
+      - 'docs/**'
+      - 'components/*/docs/**'
+      - 'components/*/mkdocs.yml'
+
+  workflow_dispatch:
+
+jobs:
+
+  ci-w:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        test: 
+          - SMS_D_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - SMS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - REP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu.allactive-wcprod_1850
+          - ERP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - PET_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+          - PEM_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
+    container: 
+      image: ghcr.io/mahf708/e3sm-imgs:v0.0.6
+
+    steps:
+      - 
+        name: Checkout
+        uses: actions/checkout@v4
+        with:
+          show-progress: false
+          submodules: recursive
+      - 
+        name: CIME
+        working-directory: cime/scripts
+        run: |
+          mkdir -p $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
+          wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/physprops/p3_lookup_table_1.dat-v4.1.2
+          mv p3_lookup_table_1.dat-v4.1.2 $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
+          export USER=test
+          ./create_test ${{ matrix.test }} --wait --debug
+      - 
+        name: Artifacts
+        uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: ${{ matrix.test }}
+          path: |
+            ~/projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
+            ~/projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
+            ~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
+            ~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out

.github/workflows/e3sm-gh-md-linter.yml

@@ -0,0 +1,28 @@
+name: markdown
+
+# if .md files are touched in a PR, lint them!
+
+on:
+  pull_request:
+    branches: ["master"]
+    paths:
+        - '**/*.md'
+
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - uses: tj-actions/changed-files@v44
+      id: changed-files
+      with:
+        files: '**/*.md'
+        separator: ","
+    - uses: DavidAnson/markdownlint-cli2-action@v16
+      if: steps.changed-files.outputs.any_changed == 'true'
+      with:
+        config: 'docs/.markdownlint.json'
+        globs: ${{ steps.changed-files.outputs.all_changed_files }}
+        separator: ","

.gitignore

@@ -30,6 +30,13 @@ site
 # Ignore emacs backup files
 *~
 
+#Ignore Mac folder files
+.DS_Store
+
+#Ignore vscode dir
+.vscode
+
+
 # Ignore mkdocs site-generated files in eamxx
 components/eamxx/site/*
 # Ignore auto-generated eamxx_params.md file

cime_config/allactive/config_compsets.xml

@@ -70,6 +70,12 @@
   <lname>1850_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
+<!-- Same as WCYCL1850NS but for 2010 (to avoid needing transient files). Mainly for testing. -->
+<compset>
+  <alias>WCYCL2010NS</alias>
+  <lname>2010_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
 <compset>
   <alias>WCYCL1950</alias>
   <lname>1950SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
@@ -113,12 +119,17 @@
 
 <compset>
   <alias>WCYCLSSP585</alias>
-  <lname>SSP585SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  <lname>SSP585SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>
   <alias>WCYCLSSP370</alias>
-  <lname>SSP370SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  <lname>SSP370SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+</compset>
+
+<compset>
+  <alias>WCYCLSSP245</alias>
+  <lname>SSP245SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <!-- E3SM v1 science compsets -->
@@ -393,7 +404,7 @@
 
 <compset>
   <alias>BGWCYCL1850</alias>
-  <lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI%STATIC_SWAV</lname>
+  <lname>1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_MALI_SWAV</lname>
 </compset>
 
 <!-- EAMXX fully coupled compset -->
@@ -443,6 +454,7 @@
       <value  compset="20TR_EAM">1850-01-01</value>
       <value  compset="SSP585.*_EAM">2015-01-01</value>
       <value  compset="SSP370.*_EAM">2015-01-01</value>
+      <value  compset="SSP245.*_EAM">2015-01-01</value>
     </values>
   </entry>