From 22eb4c7a3bfcc9df5549c65f897727aa663ac201 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Tue, 14 Nov 2023 17:36:48 -0700 Subject: [PATCH 1/2] ci bugfix: Using h5py>=3.4 to avoid 'H5Pset_fapl_ros3 is undefined' error and to work with Conda's NetCDF. --- .github/workflows/ci_build_scm_ubuntu_22.04.yml | 7 +++---- .github/workflows/ci_run_scm_DEPHY.yml | 8 ++++---- .github/workflows/ci_run_scm_rts.yml | 9 ++++----- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml index 66f2c93f4..6c33a30e5 100644 --- a/.github/workflows/ci_build_scm_ubuntu_22.04.yml +++ b/.github/workflows/ci_build_scm_ubuntu_22.04.yml @@ -37,7 +37,7 @@ jobs: ####################################################################################### # Python setup - ####################################################################################### + ####################################################################################### - name: Set up Python uses: actions/setup-python@v3 with: @@ -47,10 +47,9 @@ jobs: run: | echo $CONDA/bin >> $GITHUB_PATH - - name: Install python libraries + - name: Install NetCDF Python libraries run: | - conda install --yes -c conda-forge f90nml - conda install --yes -c conda-forge netCDF4 + conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml - name: Update system packages run: sudo apt-get update diff --git a/.github/workflows/ci_run_scm_DEPHY.yml b/.github/workflows/ci_run_scm_DEPHY.yml index 0f0463c77..eeba4c7fe 100644 --- a/.github/workflows/ci_run_scm_DEPHY.yml +++ b/.github/workflows/ci_run_scm_DEPHY.yml @@ -35,7 +35,7 @@ jobs: ####################################################################################### # Python setup - ####################################################################################### + ####################################################################################### - name: Set up Python uses: actions/setup-python@v3 with: @@ -44,10 +44,10 @@ jobs: - name: Add conda to system path run: | echo $CONDA/bin >> $GITHUB_PATH - - name: Install python libraries + - name: Install NetCDF Python libraries run: | - conda install --yes -c conda-forge f90nml - conda install --yes -c conda-forge netCDF4 + conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml + - name: Update system packages run: sudo apt-get update diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml index 436dc9379..d58a10cdd 100644 --- a/.github/workflows/ci_run_scm_rts.yml +++ b/.github/workflows/ci_run_scm_rts.yml @@ -39,7 +39,7 @@ jobs: ####################################################################################### # Python setup - ####################################################################################### + ####################################################################################### - name: Set up Python uses: actions/setup-python@v3 with: @@ -49,10 +49,9 @@ jobs: run: | echo $CONDA/bin >> $GITHUB_PATH - - name: Install python libraries + - name: Install NetCDF Python libraries run: | - conda install --yes -c conda-forge f90nml - conda install --yes -c conda-forge netCDF4 + conda install --yes -c conda-forge h5py>=3.4 netCDF4 f90nml - name: Update system packages run: sudo apt-get update @@ -198,6 +197,6 @@ jobs: - name: Upload SCM RTs as GitHub Artifact uses: actions/upload-artifact@v2 - with: + with: name: rt-baselines-${{matrix.build-type}} path: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}} From 8db0343289fad843d5fcdecafcff39cd57c1460c Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Fri, 1 Dec 2023 10:48:38 -0500 Subject: [PATCH 2/2] fix .gitmodules and point to NCAR/main of ccpp/physics --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1b9e6c12a..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR88 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index e1ccc99c6..61b419f13 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit e1ccc99c6eb48b6700513c4bb4315fca131fbd6a +Subproject commit 61b419f132ea24cbe191e34f1bbfcedf2c66e0dd