Skip to content

Commit

Permalink
Merge branch 'release/8.6.0' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
theurich committed Nov 9, 2023
2 parents 8484ac7 + 087f34a commit d8571ec
Show file tree
Hide file tree
Showing 59 changed files with 188 additions and 5,325 deletions.
112 changes: 112 additions & 0 deletions .github/workflows/develop-nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
name: Develop - Nightly

on:
schedule:
- cron: '30 7 * * *'
workflow_dispatch:

jobs:
nuopc-test:
name: ${{matrix.config.name}}
runs-on: ${{matrix.config.os}}
strategy:
matrix:
config:
- {
name: "Ubuntu (gfortran, openmpi)",
os: ubuntu-latest,
compiler: gfortran,
comm: openmpi
}
steps:
- uses: actions/checkout@v3
- name: Library Directory
run: |
export STACK_ROOT=${HOME}/stack
mkdir -p ${STACK_ROOT}/{include,lib,lib64,bin}
echo "STACK_ROOT=${STACK_ROOT}" >> $GITHUB_ENV
export LD_LIBRARY_PATH=${STACK_ROOT}/lib64:${STACK_ROOT}/lib:${LD_LIBRARY_PATH}
echo "LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" >> $GITHUB_ENV
echo "CPPFLAGS=-I${STACK_ROOT}/include" >> $GITHUB_ENV
echo "LDFLAGS=-L${STACK_ROOT}/lib" >> $GITHUB_ENV
echo "${STACK_ROOT}/bin" >> $GITHUB_PATH
- name: Cache Libraries
id: cache-libraries
uses: actions/cache@v3
with:
path: ${{env.STACK_ROOT}}
key: develop-nightly-${{matrix.config.os}}-${{matrix.config.compiler}}-${{matrix.config.comm}}
- name: Install OPENMPI
if: ${{matrix.config.comm}} == 'openmpi'
env:
CACHE_HIT: ${{steps.cache-libraries.outputs.cache-hit}}
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
OPENMPI_URL="https://download.open-mpi.org/release/open-mpi/v4.0/openmpi-4.0.3.tar.gz"
mkdir ${{runner.temp}}/openmpi
cd ${{runner.temp}}/openmpi
curl -L $OPENMPI_URL | tar --strip-components=1 -xz
./configure --prefix=${{env.STACK_ROOT}}
make -j 2 install
fi
echo "CC=${{env.STACK_ROOT}}/bin/mpicc" >> $GITHUB_ENV
echo "CXX=${{env.STACK_ROOT}}/bin/mpicxx" >> $GITHUB_ENV
echo "F77=${{env.STACK_ROOT}}/bin/mpif77" >> $GITHUB_ENV
echo "F90=${{env.STACK_ROOT}}/bin/mpif90" >> $GITHUB_ENV
echo "FC=${{env.STACK_ROOT}}/bin/mpifort" >> $GITHUB_ENV
echo "OPENMPI_ROOT=${{env.STACK_ROOT}}" >> $GITHUB_ENV
- name: Install HDF5
env:
CACHE_HIT: ${{steps.cache-libraries.outputs.cache-hit}}
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
HDF5_URL="https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.2/src/hdf5-1.12.2.tar.gz"
mkdir ${{runner.temp}}/hdf5
cd ${{runner.temp}}/hdf5
curl -L $HDF5_URL | tar --strip-components=2 -xz
./configure --enable-fortran --prefix=${{env.STACK_ROOT}}
make -j 2 install
fi
echo "HDF5_ROOT=${{env.STACK_ROOT}}" >> $GITHUB_ENV
- name: Install NetCDF-C
env:
CACHE_HIT: ${{steps.cache-libraries.outputs.cache-hit}}
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
NETCDF_URL="https://github.com/Unidata/netcdf-c/archive/v4.9.0.tar.gz"
mkdir ${{runner.temp}}/netcdf-c
cd ${{runner.temp}}/netcdf-c
curl -L $NETCDF_URL | tar --strip-components=1 -xz
./configure --enable-netcdf-4 --disable-dap --prefix=${{env.STACK_ROOT}}
make -j 2 install
fi
echo "NETCDF_ROOT=${{env.STACK_ROOT}}" >> $GITHUB_ENV
- name: Install NetCDF-Fortran
env:
CACHE_HIT: ${{steps.cache-libraries.outputs.cache-hit}}
run: |
if [[ "$CACHE_HIT" != 'true' ]]; then
NETCDFF_URL="https://github.com/Unidata/netcdf-fortran/archive/v4.5.4.tar.gz"
mkdir ${{runner.temp}}/netcdf-fortran
cd ${{runner.temp}}/netcdf-fortran
curl -L $NETCDFF_URL | tar --strip-components=1 -xz
./configure --prefix=${{env.STACK_ROOT}}
make -j 2 install
fi
echo "NETCDFF_ROOT=${{env.STACK_ROOT}}" >> $GITHUB_ENV
- name: Install ESMF
uses: esmf-org/install-esmf-action@v1
env:
ESMF_COMPILER: ${{matrix.config.compiler}}
ESMF_COMM: ${{matrix.config.comm}}
ESMF_NETCDF: 'nc-config'
with:
build-key: 'develop-nightly-${{matrix.config.os}}-${{matrix.config.compiler}}-${{matrix.config.comm}}'
version: 'develop'
rebuild-check: quick
esmpy: false
cache: true
- name: NUOPC Tests
run: |
export TOOLRUN="--oversubscribe"
./testProtos.sh
46 changes: 0 additions & 46 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -356,52 +356,6 @@ AtmOcnScalarProto/esmApp.stdout
AtmOcnScalarProto/field_ocn_export_adv_sst.nc
AtmOcnScalarProto/ocn.mod
AtmOcnScalarProto/ocn.o
AtmOcnSelectExternalProto/ATM-A/atmA.mk
AtmOcnSelectExternalProto/ATM-A/atmA.o
AtmOcnSelectExternalProto/ATM-A/atma.mod
AtmOcnSelectExternalProto/ATM-B/atmB.mk
AtmOcnSelectExternalProto/ATM-B/atmB.o
AtmOcnSelectExternalProto/ATM-B/atmb.mod
AtmOcnSelectExternalProto/ATM-B/procedure.o
AtmOcnSelectExternalProto/ATM-C/atmC.mk
AtmOcnSelectExternalProto/ATM-C/atmC.o
AtmOcnSelectExternalProto/ATM-C/atmc.mod
AtmOcnSelectExternalProto/ATM-C/libatmC.a
AtmOcnSelectExternalProto/ATM-C/procedure.o
AtmOcnSelectExternalProto/ATM-D/atmD.mk
AtmOcnSelectExternalProto/ATM-D/atmd.mod
AtmOcnSelectExternalProto/ATM-D/libatmD.so
AtmOcnSelectExternalProto/ATM-E/atmE.mk
AtmOcnSelectExternalProto/ATM-E/atme.mod
AtmOcnSelectExternalProto/OcnCommon/oceancommon.mod
AtmOcnSelectExternalProto/OcnCommon/ocnCommon.mk
AtmOcnSelectExternalProto/OcnCommon/ocnCommon.o
AtmOcnSelectExternalProto/OcnCommon/subModule1.o
AtmOcnSelectExternalProto/OcnCommon/subModule2.o
AtmOcnSelectExternalProto/OcnCommon/submodule1.mod
AtmOcnSelectExternalProto/OcnCommon/submodule2.mod
AtmOcnSelectExternalProto/OcnModelA/ocn.mk
AtmOcnSelectExternalProto/OcnModelA/ocn.o
AtmOcnSelectExternalProto/OcnModelA/ocna.mod
AtmOcnSelectExternalProto/OcnModelB/OcnSub/ocnSub.mk
AtmOcnSelectExternalProto/OcnModelB/OcnSub/ocnSub.o
AtmOcnSelectExternalProto/OcnModelB/OcnSub/ocnsub.mod
AtmOcnSelectExternalProto/OcnModelB/ocn.mk
AtmOcnSelectExternalProto/OcnModelB/ocn.o
AtmOcnSelectExternalProto/OcnModelB/ocnb.mod
AtmOcnSelectExternalProto/OcnModelC/OcnSub/ocnSub.mk
AtmOcnSelectExternalProto/OcnModelC/OcnSub/ocnSub.o
AtmOcnSelectExternalProto/OcnModelC/OcnSub/ocnsub.mod
AtmOcnSelectExternalProto/OcnModelC/ocn.mk
AtmOcnSelectExternalProto/OcnModelC/ocnc.mod
AtmOcnSelectExternalProto/PET0.ESMF_LogFile
AtmOcnSelectExternalProto/PET1.ESMF_LogFile
AtmOcnSelectExternalProto/PET2.ESMF_LogFile
AtmOcnSelectExternalProto/PET3.ESMF_LogFile
AtmOcnSelectExternalProto/atmD.so
AtmOcnSelectExternalProto/atmE.so
AtmOcnSelectExternalProto/esmApp.stdout
AtmOcnSelectExternalProto/ocn.so
AtmOcnSelectProto/PET0.ESMF_LogFile
AtmOcnSelectProto/PET1.ESMF_LogFile
AtmOcnSelectProto/PET2.ESMF_LogFile
Expand Down
Empty file removed .gitmodules
Empty file.
111 changes: 0 additions & 111 deletions AtmOcnMedIngestFromConfigProto/esmApp.runconfig

This file was deleted.

6 changes: 0 additions & 6 deletions AtmOcnPetListProto/nuopc.configure

This file was deleted.

76 changes: 0 additions & 76 deletions AtmOcnSelectExternalProto/ATM-A/Makefile

This file was deleted.

Loading

0 comments on commit d8571ec

Please sign in to comment.