Skip to content

Commit

Permalink
Merge branch 'main' into feature/ufs_case_gen_exact_mode
Browse files Browse the repository at this point in the history
  • Loading branch information
grantfirl committed Jul 25, 2024
2 parents 8cb9d5d + 09bbcd9 commit b0fcbcd
Show file tree
Hide file tree
Showing 35 changed files with 205 additions and 654 deletions.
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
target-branch: "main"
2 changes: 1 addition & 1 deletion .github/workflows/build_and_push_docker_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push latest tag
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci_build_scm_ubuntu_22.04.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
sp_ROOT: /home/runner/NCEPLIBS-sp
w3emc_ROOT: /home/runner/myw3emc
SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm
suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v16_RRTMGP,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v16_RRTMGP_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf,SCM_HRRR_gf_ps

# Workflow steps
steps:
#######################################################################################
# Initial
#######################################################################################
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize submodules
run: git submodule update --init --recursive
Expand All @@ -38,7 +38,7 @@ jobs:
# Python setup
#######################################################################################
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{matrix.py-version}}

Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- name: Cache bacio library v2.4.1
id: cache-bacio-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/bacio
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -87,7 +87,7 @@ jobs:
- name: Cache SP-library v2.3.3
id: cache-sp-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/NCEPLIBS-sp
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -104,7 +104,7 @@ jobs:
- name: Cache w3emc library v2.9.2
id: cache-w3emc-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/myw3emc
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -126,7 +126,7 @@ jobs:
- name: Cache NetCDF Fortran library
id: cache-netcdf-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/netcdf-fortran
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
Expand Down
25 changes: 17 additions & 8 deletions .github/workflows/ci_run_scm_DEPHY.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
strategy:
matrix:
fortran-compiler: [gfortran-12]
build-type: [Release, Debug]
py-version: [3.7.13]

# Environmental variables
Expand All @@ -28,7 +29,7 @@ jobs:
# Initial
#######################################################################################
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize submodules
run: git submodule update --init --recursive
Expand All @@ -37,7 +38,7 @@ jobs:
# Python setup
#######################################################################################
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{matrix.py-version}}

Expand Down Expand Up @@ -68,7 +69,7 @@ jobs:
- name: Cache bacio library v2.4.1
id: cache-bacio-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/bacio
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -85,7 +86,7 @@ jobs:
- name: Cache SP-library v2.3.3
id: cache-sp-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/NCEPLIBS-sp
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -102,7 +103,7 @@ jobs:
- name: Cache w3emc library v2.9.2
id: cache-w3emc-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/myw3emc
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -122,7 +123,7 @@ jobs:

- name: Cache NetCDF Fortran library v4.4.4
id: cache-netcdf-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/netcdf-fortran
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
Expand Down Expand Up @@ -150,13 +151,21 @@ jobs:
cd ${SCM_ROOT}
./contrib/get_all_static_data.sh
./contrib/get_thompson_tables.sh
- name: Configure build with CMake
- name: Configure build with CMake (Release)
if: contains(matrix.build-type, 'Release')
run: |
cd ${SCM_ROOT}/scm
mkdir bin && cd bin
cmake -DCCPP_SUITES=${suites} ../src
- name: Configure build with CMake (Debug)
if: contains(matrix.build-type, 'Debug')
run: |
cd ${SCM_ROOT}/scm
mkdir bin && cd bin
cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src
- name: Build SCM
run: |
cd ${SCM_ROOT}/scm/bin
Expand Down
23 changes: 12 additions & 11 deletions .github/workflows/ci_run_scm_rts.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

name: CI test to build and run SCM regression tests

on: [pull_request, workflow_dispatch]
Expand All @@ -21,8 +22,8 @@ jobs:
sp_ROOT: /home/runner/NCEPLIBS-sp
w3emc_ROOT: /home/runner/myw3emc
SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm
suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_RRFS_v1,SCM_GFS_v17_HR3,SCM_GFS_v17_HR3_RRTMGP
suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_RRFS_v1_ps,SCM_GFS_v17_HR3_ps,SCM_GFS_v17_HR3_RRTMGP_ps
suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP
suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps
dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}}

Expand All @@ -32,7 +33,7 @@ jobs:
# Initial
#######################################################################################
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize submodules
run: git submodule update --init --recursive
Expand All @@ -41,7 +42,7 @@ jobs:
# Python setup
#######################################################################################
- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: ${{matrix.py-version}}

Expand Down Expand Up @@ -74,7 +75,7 @@ jobs:
- name: Cache bacio library v2.4.1
id: cache-bacio-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/bacio
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -91,7 +92,7 @@ jobs:
- name: Cache SP-library v2.3.3
id: cache-sp-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/NCEPLIBS-sp
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -108,7 +109,7 @@ jobs:
- name: Cache w3emc library v2.9.2
id: cache-w3emc-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/myw3emc
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
Expand All @@ -128,7 +129,7 @@ jobs:

- name: Cache NetCDF Fortran library
id: cache-netcdf-fortran
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: /home/runner/netcdf-fortran
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
Expand Down Expand Up @@ -208,7 +209,7 @@ jobs:
- name: Download SCM RT baselines
run: |
cd ${dir_bl}
wget https://dtcenter.ucar.edu/ccpp/users/rt/rt-baselines-${{matrix.build-type}}.zip
wget https://dtcenter.ucar.edu/ccpp/rt/rt-baselines-${{matrix.build-type}}.zip
unzip rt-baselines-${{matrix.build-type}}.zip
- name: Compare SCM RT output to baselines
Expand All @@ -217,13 +218,13 @@ jobs:
./cmp_rt2bl.py --dir_rt ${dir_rt} --dir_bl ${dir_bl}
- name: Upload plots of SCM Baselines/RTs as GitHub Artifact.
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: rt-plots-${{matrix.build-type}}
path: /home/runner/work/ccpp-scm/ccpp-scm/test/scm_rt_out

- name: Upload SCM RTs as GitHub Artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: rt-baselines-${{matrix.build-type}}
path: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
10 changes: 5 additions & 5 deletions .github/workflows/ci_run_scm_ufs_replay.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
#######################################################################################

- name: Checkout SCM.
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize SCM submodules.
run: git submodule update --init --recursive
Expand All @@ -32,13 +32,13 @@ jobs:
run: sudo apt-get update

- name: Cache conda
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/conda_pkgs_dir
key: conda-pkgs

- name: Setup python.
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment: env_ufsreplay
environment-file: environment-ufsreplay.yml
Expand All @@ -51,7 +51,7 @@ jobs:
#######################################################################################

- name: Cache UWM regression test output.
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${dir_rt_cache}
key: ufs-rt-files
Expand All @@ -72,4 +72,4 @@ jobs:
#######################################################################################
# Done
#######################################################################################
#######################################################################################
6 changes: 3 additions & 3 deletions .github/workflows/ci_scm_ccpp_prebuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ jobs:
steps:

- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize submodules
run: git submodule update --init --recursive

- name: Set up Python 3.8.5
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: 3.8.5

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci_test_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build and export test tag
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: docker/Dockerfile
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 83 files
+6 −2 .github/workflows/capgen_unit_tests.yaml
+20 −0 .github/workflows/prebuild.yaml
+49 −0 .github/workflows/python.yaml
+3 −0 pytest.ini
+73 −11 scripts/ccpp_capgen.py
+342 −22 scripts/ccpp_datafile.py
+1 −1 scripts/ccpp_fortran_to_metadata.py
+17 −1 scripts/ccpp_prebuild.py
+37 −2 scripts/ccpp_suite.py
+21 −13 scripts/ccpp_track_variables.py
+2 −0 scripts/common.py
+216 −183 scripts/constituents.py
+91 −0 scripts/fortran_tools/offline_check_fortran_vs_metadata.py
+17 −3 scripts/fortran_tools/parse_fortran_file.py
+78 −5 scripts/host_cap.py
+16 −3 scripts/metadata_parser.py
+33 −14 scripts/metadata_table.py
+13 −7 scripts/metavar.py
+126 −34 scripts/mkcap.py
+163 −71 scripts/mkstatic.py
+0 −1 scripts/parse_tools/parse_source.py
+3 −3 scripts/suite_objects.py
+1 −1 src/CMakeLists.txt
+367 −37 src/ccpp_constituent_prop_mod.F90
+4 −0 src/ccpp_types.F90
+6 −0 src/ccpp_types.meta
+27 −0 test/advection_test/cld_ice.F90
+1 −0 test/advection_test/cld_ice.meta
+21 −0 test/advection_test/cld_liq.F90
+1 −0 test/advection_test/cld_liq.meta
+2 −0 test/advection_test/run_test
+392 −61 test/advection_test/test_host.F90
+3 −1 test/advection_test/test_host_mod.F90
+3 −0 test/advection_test/test_reports.py
+3 −1 test/capgen_test/run_test
+5 −5 test/capgen_test/temp_adjust.F90
+14 −0 test/capgen_test/temp_adjust.meta
+3 −1 test/capgen_test/temp_set.F90
+14 −0 test/capgen_test/temp_set.meta
+5 −4 test/capgen_test/test_reports.py
+1 −0 test/hash_table_tests/test_hash.F90
+1 −0 test/unit_tests/sample_files/test_host.meta
+96 −0 test/unit_tests/sample_scheme_files/duplicate_dyn_const.F90
+104 −0 test/unit_tests/sample_scheme_files/duplicate_dyn_const.meta
+75 −0 test/unit_tests/sample_scheme_files/dyn_const_not_present.F90
+104 −0 test/unit_tests/sample_scheme_files/dyn_const_not_present.meta
+100 −0 test/unit_tests/sample_scheme_files/dyn_const_not_present_nested.F90
+104 −0 test/unit_tests/sample_scheme_files/dyn_const_not_present_nested.meta
+21 −0 test/unit_tests/sample_scheme_files/temp_adjust.F90
+1 −0 test/unit_tests/sample_scheme_files/temp_adjust.meta
+35 −0 test/unit_tests/test_metadata_scheme_file.py
+3 −0 test/unit_tests/test_metadata_table.py
+2 −2 test/var_compatibility_test/test_reports.py
+10 −0 test_prebuild/run_all_tests.sh
+2 −2 test_prebuild/test_blocked_data/CMakeLists.txt
+11 −0 test_prebuild/test_blocked_data/run_test.sh
+2 −2 test_prebuild/test_chunked_data/CMakeLists.txt
+4 −2 test_prebuild/test_chunked_data/main.F90
+13 −0 test_prebuild/test_chunked_data/run_test.sh
+98 −0 test_prebuild/test_opt_arg/CMakeLists.txt
+13 −0 test_prebuild/test_opt_arg/ccpp_kinds.F90
+15 −0 test_prebuild/test_opt_arg/ccpp_kinds.meta
+81 −0 test_prebuild/test_opt_arg/ccpp_prebuild_config.py
+23 −0 test_prebuild/test_opt_arg/data.F90
+46 −0 test_prebuild/test_opt_arg/data.meta
+119 −0 test_prebuild/test_opt_arg/main.F90
+90 −0 test_prebuild/test_opt_arg/opt_arg_scheme.F90
+157 −0 test_prebuild/test_opt_arg/opt_arg_scheme.meta
+13 −0 test_prebuild/test_opt_arg/run_test.sh
+9 −0 test_prebuild/test_opt_arg/suite_opt_arg_suite.xml
+130 −0 test_prebuild/test_track_variables.py
+69 −0 test_prebuild/test_track_variables/ccpp_prebuild_config.py
+25 −0 test_prebuild/test_track_variables/scheme_1.meta
+87 −0 test_prebuild/test_track_variables/scheme_2.meta
+143 −0 test_prebuild/test_track_variables/scheme_3.meta
+31 −0 test_prebuild/test_track_variables/scheme_4.meta
+31 −0 test_prebuild/test_track_variables/scheme_A.meta
+48 −0 test_prebuild/test_track_variables/scheme_B.meta
+24 −0 test_prebuild/test_track_variables/suite_TEST_SUITE.xml
+14 −0 test_prebuild/test_track_variables/suite_small_suite.xml
+10 −0 test_prebuild/unit_tests/run_tests.sh
+0 −0 test_prebuild/unit_tests/test_metadata_parser.py
+0 −0 test_prebuild/unit_tests/test_mkstatic.py
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 203 files
Loading

0 comments on commit b0fcbcd

Please sign in to comment.