Skip to content

Commit

Permalink
Sync w/ latest ESCOMP/main (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeniseWorthen authored Dec 16, 2024
1 parent 55576eb commit b5d1cc1
Show file tree
Hide file tree
Showing 26 changed files with 634 additions and 1,862 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/extbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ jobs:
ESMF_VERSION: v8.6.1
PNETCDF_VERSION: checkpoint.1.12.3
NETCDF_FORTRAN_VERSION: v4.6.1
PIO_VERSION: pio2_6_2
CDEPS_VERSION: cdeps1.0.36
PIO_VERSION: pio2_6_3
CDEPS_VERSION: cdeps1.0.59
steps:
- uses: actions/checkout@v4
# Build the ESMF library, if the cache contains a previous build
Expand Down
20 changes: 11 additions & 9 deletions .github/workflows/srt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ 3.10.9 ]
python-version: [ 3.x ]
env:
CC: mpicc
FC: mpifort
Expand All @@ -27,7 +27,7 @@ jobs:
LDFLAGS: "-L/usr/lib/x86_64-linux-gnu -lnetcdf -lnetcdff -lpnetcdf"
# Versions of all dependencies can be updated here
ESMF_VERSION: v8.6.1
PARALLELIO_VERSION: pio2_6_2
PARALLELIO_VERSION: pio2_6_3
CIME_MODEL: cesm
CIME_DRIVER: nuopc
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -78,13 +78,15 @@ jobs:
# cpl7 is needed - i think that's a bug
- name: checkout externals
run: |
git config --global user.name "${GITHUB_ACTOR}"
git config --global user.email "${GITHUB_ACTOR_ID}+${GITHUB_ACTOR}@users.noreply.github.com"
pushd cesm
./bin/git-fleximod update ccs_config cdeps share mct parallelio
./bin/git-fleximod update cime ccs_config cdeps share mct parallelio
cd ccs_config
git checkout main
cd ../
git clone https://github.com/ESMCI/cime
cd cime
cd ../cime
git checkout master
git status
if [[ ! -e "${PWD}/.gitmodules.bak" ]]
then
echo "Converting [email protected] to https://github.com urls in ${PWD}/.gitmodules"
Expand Down Expand Up @@ -172,6 +174,6 @@ jobs:
popd
# the following can be used by developers to login to the github server in case of errors
# see https://github.com/marketplace/actions/debugging-with-tmate for further details
- name: Setup tmate session
if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3
# - name: Setup tmate session
# if: ${{ failure() }}
# uses: mxschmitt/action-tmate@v3
347 changes: 26 additions & 321 deletions cesm/driver/esm_time_mod.F90

Large diffs are not rendered by default.

Loading

0 comments on commit b5d1cc1

Please sign in to comment.