Skip to content

Commit

Permalink
Merge branch 'cesm3.0-alphabranch' for cesm3_0_alpha05c
Browse files Browse the repository at this point in the history
  • Loading branch information
fischer-ncar committed Jan 8, 2025
2 parents f8d2242 + 4d3b720 commit fe48b0f
Show file tree
Hide file tree
Showing 23 changed files with 339 additions and 36 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 "testing@github.actions"
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
26 changes: 13 additions & 13 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
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.16
fxrequired = ToplevelRequired

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxDONOTUSEurl = https://github.com/ESMCI/cime
fxtag = cime6.1.46
fxtag = cime6.1.56
fxrequired = ToplevelRequired

[submodule "fms"]
Expand All @@ -51,29 +51,29 @@
path = share
url = https://github.com/ESCOMP/CESM_share
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.5
fxtag = share1.1.7
fxrequired = ToplevelRequired

[submodule "cam"]
path = components/cam
url = https://www.github.com/ESCOMP/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam6_4_047
fxtag = cam6_4_048
fxrequired = ToplevelRequired

[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
fxrequired = ToplevelRequired
fxtag = ctsm5.3.014
fxtag = ctsm5.3.016

[submodule "cice"]
path = components/cice
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_5

[submodule "mom"]
path = components/mom
Expand All @@ -86,29 +86,29 @@
path = components/cism
url = https://github.com/ESCOMP/cism-wrapper.git
fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
fxtag = cismwrap_2_2_002
fxtag = cismwrap_2_2_005
fxrequired = ToplevelRequired

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
fxrequired = ToplevelRequired
fxtag = cdeps1.0.57
fxtag = cdeps1.0.61

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
fxrequired = ToplevelRequired
fxtag = cmeps1.0.25
fxtag = cmeps1.0.33

[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
fxrequired = ToplevelRequired
fxtag = rtm1_0_83
fxtag = rtm1_0_84

[submodule "ww3"]
path = components/ww3
Expand All @@ -122,14 +122,14 @@
url = https://github.com/ESCOMP/mizuRoute
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
fxrequired = ToplevelRequired
fxtag = cesm-coupling.n02_v2.1.3
fxtag = cesm-coupling.n03_v2.2.0

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
fxrequired = ToplevelRequired
fxtag = mosart1.1.05
fxtag = mosart1.1.06

[submodule "parallelio"]
path = libraries/parallelio
Expand Down Expand Up @@ -157,4 +157,4 @@
url = https://github.com/NCAR/CUPiD.git
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
fxrequired = ToplevelRequired
fxtag = v0.1.1
fxtag = v0.1.2
2 changes: 1 addition & 1 deletion .lib/git-fleximod/git_fleximod/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import argparse
from git_fleximod import utils

__version__ = "0.9.3"
__version__ = "0.9.4"

def find_root_dir(filename=".gitmodules"):
""" finds the highest directory in tree
Expand Down
3 changes: 2 additions & 1 deletion .lib/git-fleximod/git_fleximod/git_fleximod.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,8 @@ def init_submodule_from_gitmodules(gitmodules, name, root_dir, logger):
url = gitmodules.get(name, "url")
assert path and url, f"Malformed .gitmodules file {path} {url}"
tag = gitmodules.get(name, "fxtag")
if not tag:
tag = gitmodules.get(name, "hash")
fxurl = gitmodules.get(name, "fxDONOTUSEurl")
fxsparse = gitmodules.get(name, "fxsparse")
fxrequired = gitmodules.get(name, "fxrequired")
Expand Down Expand Up @@ -250,7 +252,6 @@ def submodules_update(gitmodules, root_dir, requiredlist, force):
newrequiredlist = ["AlwaysRequired"]
if optional:
newrequiredlist.append("AlwaysOptional")

submodules_update(gitsubmodules, repodir, newrequiredlist, force=force)

def local_mods_output():
Expand Down
2 changes: 1 addition & 1 deletion .lib/git-fleximod/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "git-fleximod"
version = "0.9.3"
version = "0.9.4"
description = "Extended support for git-submodule and git-sparse-checkout"
authors = ["Jim Edwards <jedwards@ucar.edu>"]
maintainers = ["Jim Edwards <jedwards@ucar.edu>"]
Expand Down
2 changes: 1 addition & 1 deletion .lib/git-fleximod/tbump.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
github_url = "https://github.com/jedwards4b/git-fleximod/"

[version]
current = "0.9.3"
current = "0.9.4"

# Example of a semver regexp.
# Make sure this matches current_version before
Expand Down
Loading

0 comments on commit fe48b0f

Please sign in to comment.