From 46f0bb3252336840d9ed4509b7f9eb98c84a7def Mon Sep 17 00:00:00 2001
From: Naser Mahfouz <naser.mahfouz@pnnl.gov>
Date: Tue, 16 Apr 2024 09:32:50 -0400
Subject: [PATCH 1/3] add WCYCL2010NS compset

---
 cime_config/allactive/config_compsets.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml
index 637facc327d7..0d0bcb11af00 100755
--- a/cime_config/allactive/config_compsets.xml
+++ b/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>

From d46acbf9b7f4229131fd5cdeb4bd60a861866565 Mon Sep 17 00:00:00 2001
From: Naser Mahfouz <naser.mahfouz@pnnl.gov>
Date: Tue, 16 Apr 2024 09:54:55 -0400
Subject: [PATCH 2/3] add gh/ci-w tests

---
 .github/workflows/e3sm-gh-ci-w-cime-tests.yml | 59 +++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/workflows/e3sm-gh-ci-w-cime-tests.yml

diff --git a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
new file mode 100644
index 000000000000..9701bedb1381
--- /dev/null
+++ b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
@@ -0,0 +1,59 @@
+name: gh
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:
+      # no to these
+      - '!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

From 3318f32b7860557c34aa51dbfddbee060f369d15 Mon Sep 17 00:00:00 2001
From: Naser Mahfouz <naser.mahfouz@pnnl.gov>
Date: Tue, 16 Apr 2024 09:59:40 -0400
Subject: [PATCH 3/3] exclude paths properly via paths-ignore

---
 .github/workflows/e3sm-gh-ci-w-cime-tests.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
index 9701bedb1381..7d31767b11c1 100644
--- a/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
+++ b/.github/workflows/e3sm-gh-ci-w-cime-tests.yml
@@ -3,11 +3,10 @@ name: gh
 on:
   pull_request:
     branches: [ master ]
-    paths:
-      # no to these
-      - '!docs/**'
-      - '!components/*/docs/**'
-      - '!components/*/mkdocs.yml'
+    paths-ignore:
+      - 'docs/**'
+      - 'components/*/docs/**'
+      - 'components/*/mkdocs.yml'
 
   workflow_dispatch: