Skip to content

Commit

Permalink
Merge pull request #307 from jedwards4b/preview_namelist_CI
Browse files Browse the repository at this point in the history
Preview namelist ci
  • Loading branch information
jedwards4b authored Dec 27, 2024
2 parents 94d3d0b + eba32bb commit 8e95bbb
Show file tree
Hide file tree
Showing 17 changed files with 76 additions and 20 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@ jobs:
# This statement avoids failures in another instance (another compiler) to cancel this run
# it also prevents canceling the run using the cancel button on the github website
# another form (if: success() || failure()) should allow the cancel button to work but tests with that form didnt act as expected
if: always()
if: ${{ ! cancelled() }}
env:
CC: mpicc
FC: mpifort
CXX: mpicxx
CIME_MODEL: cesm
CIME_DRIVER: nuopc
# Since self runners can only run one step at a time this needs statement is not required
# needs: setup
runs-on: hpc-runner
defaults:
run:
shell: bash {0}
steps:
- name: Run ${{ inputs.compiler }} tests
# Allows the next step to run even if this one fails
# Allows the check status step to run even if this one fails
continue-on-error: true
run: |
pwd
Expand All @@ -45,4 +43,4 @@ jobs:
fi
# tests pass, clean up
rm -fr *.${GITHUB_RUN_ID}${{ inputs.compiler }}
exit 0
exit 0
2 changes: 2 additions & 0 deletions .github/workflows/derecho.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:
build:
strategy:
# run all matrix members even if one fails
fail-fast: false
matrix:
compiler: [gnu, intel, intel-oneapi, nvhpc]
uses: ./.github/workflows/build.yaml
Expand Down
56 changes: 56 additions & 0 deletions .github/workflows/preview_namelist.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
on:
push:
branches: [ master, cesm3.0-alphabranch ]
pull_request:
branches: [ master, cesm3.0-alphabranch ]

jobs:
preview_namelists:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# Lots of python versions, pare down if we don't support a version
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
config:
- {"compset": "BLT1850", "res": "ne30pg3_t232"} # fully coupled
- {"compset": "C_JRA", "res": "TL319_t232"} # ocean only
- {"compset": "C1850MARBL_JRA", "res": "TL319_t232"} # ocean only, with BGC
- {"compset": "DTEST", "res": "TL319_t232"} # ice only
- {"compset": "I1850Clm60SpCru", "res": "f10_f10_mg37"} # land only
- {"compset": "QPC6HIST", "res": "f09_f09_mg17"} # atm only
- {"compset": "T1850Gg", "res": "f09_g17_gris4"} # glc only
steps:
- uses: actions/checkout@v4

- name: Setup python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

- name: Set up non-python environment (need xmllint and a fake ESMF make file)
run: |
git config --global user.email "[email protected]"
git config --global user.name "Github Actions Testing"
echo "ESMFMKFILE=$HOME/esmf.mk" >> ${GITHUB_ENV}
echo "ESMF_VERSION_MAJOR=8" > ${HOME}/esmf.mk
echo "ESMF_VERSION_MINOR=8" >> ${HOME}/esmf.mk
sudo apt-get install libxml2-utils
sudo apt-get install subversion
- name: Checkout CESM
run: |
$GITHUB_WORKSPACE/bin/git-fleximod update
- name: Get WW3 grid data
# WW3 data needs to be prestaged for buildnml to work correctly
run: |
svn co https://svn-ccsm-inputdata.cgd.ucar.edu/trunk/inputdata/wav/ww3 /home/runner/cesm/inputdata/wav/ww3
- name: Create new cases, run case.setup, and then preview namelists
run: |
cd $GITHUB_WORKSPACE/cime/scripts
./create_newcase --run-unsupported --mach ubuntu-latest --compset ${{ matrix.config.compset }} --res ${{ matrix.config.res }} --case $GITHUB_WORKSPACE/cases/${{ matrix.config.compset }}_${{ matrix.python-version }}
cd $GITHUB_WORKSPACE/cases/${{ matrix.config.compset }}_${{ matrix.python-version }}
./case.setup
./preview_namelists
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.12
fxtag = ccs_config_cesm1.0.15
fxrequired = ToplevelRequired

[submodule "cime"]
Expand Down Expand Up @@ -73,7 +73,7 @@
url = https://github.com/ESCOMP/CESM_CICE
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
fxrequired = ToplevelRequired
fxtag = cesm3_cice6_5_0_14
fxtag = cesm3_cice6_6_0_2

[submodule "mom"]
path = components/mom
Expand Down
2 changes: 1 addition & 1 deletion ccs_config
2 changes: 1 addition & 1 deletion components/cam
2 changes: 1 addition & 1 deletion components/cdeps
2 changes: 1 addition & 1 deletion components/cice
2 changes: 1 addition & 1 deletion components/clm
Submodule clm updated 723 files
2 changes: 1 addition & 1 deletion components/mizuroute
Submodule mizuroute updated 202 files
2 changes: 1 addition & 1 deletion components/rtm
2 changes: 1 addition & 1 deletion share
2 changes: 1 addition & 1 deletion tools/CUPiD
Submodule CUPiD updated 58 files
+4 βˆ’12 .github/PULL_REQUEST_TEMPLATE.md
+0 βˆ’14 .github/workflows/tasklist_completed.yml
+0 βˆ’0 Contributors.md
+8 βˆ’8 NCARtips.md
+23 βˆ’22 README.md
+9 βˆ’5 cupid/clean.py
+22 βˆ’5 cupid/cupid_webpage.py
+12 βˆ’91 cupid/run_diagnostics.py
+188 βˆ’0 cupid/run_timeseries.py
+2 βˆ’1 cupid/timeseries.py
+1 βˆ’1 cupid/util.py
+24 βˆ’0 docs/ContributorsGuide.md
+0 βˆ’2 docs/NCARtips.rst
+8 βˆ’3 docs/addingnotebookstocollection.md
+2 βˆ’2 docs/conf.py
+0 βˆ’2 docs/config.md
+0 βˆ’2 docs/contributors.rst
+2 βˆ’0 docs/contributors_guide.rst
+2 βˆ’0 docs/contributors_to_cupid.rst
+3 βˆ’2 docs/index.rst
+2 βˆ’0 docs/ncar_tips.rst
+1 βˆ’1 environments/README
+2 βˆ’0 environments/cupid-analysis.yml
+1 βˆ’1 environments/cupid-infrastructure.yml
+1 βˆ’1 examples/.gitignore
+10 βˆ’6 examples/coupled_model/config.yml
+221 βˆ’0 examples/external_diag_packages/config.yml
+55 βˆ’24 examples/key_metrics/config.yml
+1 βˆ’1 externals/ADF
+1 βˆ’0 helper_scripts/.gitignore
+290 βˆ’0 helper_scripts/generate_adf_config_file.py
+152 βˆ’0 helper_scripts/generate_cupid_config_for_cesm_case.py
+0 βˆ’0 nblibrary/.gitignore
+0 βˆ’0 nblibrary/atm/Global_PSL_NMSE_compare_obs_lens.ipynb
+0 βˆ’0 nblibrary/atm/adf_quick_run.ipynb
+0 βˆ’0 nblibrary/atm/averaging_utils.py
+0 βˆ’0 nblibrary/atm/config_f.cam6_3_119.FLTHIST_ne30.r328_gamma0.33_soae.001.yaml
+223 βˆ’0 nblibrary/atm/link_to_ADF.ipynb
+0 βˆ’0 nblibrary/atm/nmse_utils.py
+0 βˆ’0 nblibrary/glc/Greenland_SMB_visual_compare_obs.ipynb
+0 βˆ’0 nblibrary/glc/utils.py
+0 βˆ’0 nblibrary/ice/cice_masks.yml
+0 βˆ’0 nblibrary/ice/cice_vars.yml
+0 βˆ’0 nblibrary/ice/plot_diff.py
+0 βˆ’0 nblibrary/ice/seaice.ipynb
+0 βˆ’0 nblibrary/ice/vect_diff.py
+0 βˆ’0 nblibrary/infrastructure/index.ipynb
+972 βˆ’0 nblibrary/lnd/Global_TerrestrialCouplingIndex_VisualCompareObs.ipynb
+0 βˆ’0 nblibrary/lnd/land_comparison.ipynb
+0 βˆ’0 nblibrary/ocn/ocean_surface.ipynb
+1,217 βˆ’0 nblibrary/rof/global_discharge_gauge_compare_obs.ipynb
+603 βˆ’0 nblibrary/rof/global_discharge_ocean_compare_obs.ipynb
+41 βˆ’0 nblibrary/rof/scripts/colors.py
+71 βˆ’0 nblibrary/rof/scripts/metrics.py
+88 βˆ’0 nblibrary/rof/scripts/utility.py
+51 βˆ’0 nblibrary/rof/setup/large_river_50.txt
+145 βˆ’0 nblibrary/rof/setup/setup.yaml
+4 βˆ’3 pyproject.toml

0 comments on commit 8e95bbb

Please sign in to comment.