Skip to content

Commit ab270c2

Browse files
grantfirlgrantfirl
authored
Merge pull request #486 from grantfirl/ufs-dev-PR189
UFS-dev PR#189
2 parents afb3827 + dbff20b commit ab270c2

15 files changed

+97
-103
lines changed

‎.github/dependabot.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
version: 2
2+
updates:
3+
# Maintain dependencies for GitHub Actions
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "daily"
8+
target-branch: "main"

‎.github/workflows/ci_build_scm_ubuntu_22.04.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# Initial
3030
#######################################################################################
3131
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Initialize submodules
3535
run: git submodule update --init --recursive
@@ -38,7 +38,7 @@ jobs:
3838
# Python setup
3939
#######################################################################################
4040
- name: Set up Python
41-
uses: actions/setup-python@v3
41+
uses: actions/setup-python@v5
4242
with:
4343
python-version: ${{matrix.py-version}}
4444

@@ -70,7 +70,7 @@ jobs:
7070
7171
- name: Cache bacio library v2.4.1
7272
id: cache-bacio-fortran
73-
uses: actions/cache@v3
73+
uses: actions/cache@v4
7474
with:
7575
path: /home/runner/bacio
7676
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
@@ -87,7 +87,7 @@ jobs:
8787
8888
- name: Cache SP-library v2.3.3
8989
id: cache-sp-fortran
90-
uses: actions/cache@v3
90+
uses: actions/cache@v4
9191
with:
9292
path: /home/runner/NCEPLIBS-sp
9393
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
@@ -104,7 +104,7 @@ jobs:
104104
105105
- name: Cache w3emc library v2.9.2
106106
id: cache-w3emc-fortran
107-
uses: actions/cache@v3
107+
uses: actions/cache@v4
108108
with:
109109
path: /home/runner/myw3emc
110110
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
@@ -126,7 +126,7 @@ jobs:
126126
127127
- name: Cache NetCDF Fortran library
128128
id: cache-netcdf-fortran
129-
uses: actions/cache@v3
129+
uses: actions/cache@v4
130130
with:
131131
path: /home/runner/netcdf-fortran
132132
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key

‎.github/workflows/ci_run_scm_DEPHY.yml‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
fortran-compiler: [gfortran-12]
13+
build-type: [Release, Debug]
1314
py-version: [3.7.13]
1415

1516
# Environmental variables
@@ -28,7 +29,7 @@ jobs:
2829
# Initial
2930
#######################################################################################
3031
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
31-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3233

3334
- name: Initialize submodules
3435
run: git submodule update --init --recursive
@@ -37,7 +38,7 @@ jobs:
3738
# Python setup
3839
#######################################################################################
3940
- name: Set up Python
40-
uses: actions/setup-python@v3
41+
uses: actions/setup-python@v5
4142
with:
4243
python-version: ${{matrix.py-version}}
4344

@@ -68,7 +69,7 @@ jobs:
6869
6970
- name: Cache bacio library v2.4.1
7071
id: cache-bacio-fortran
71-
uses: actions/cache@v3
72+
uses: actions/cache@v4
7273
with:
7374
path: /home/runner/bacio
7475
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
@@ -85,7 +86,7 @@ jobs:
8586
8687
- name: Cache SP-library v2.3.3
8788
id: cache-sp-fortran
88-
uses: actions/cache@v3
89+
uses: actions/cache@v4
8990
with:
9091
path: /home/runner/NCEPLIBS-sp
9192
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
@@ -102,7 +103,7 @@ jobs:
102103
103104
- name: Cache w3emc library v2.9.2
104105
id: cache-w3emc-fortran
105-
uses: actions/cache@v3
106+
uses: actions/cache@v4
106107
with:
107108
path: /home/runner/myw3emc
108109
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
@@ -122,7 +123,7 @@ jobs:
122123

123124
- name: Cache NetCDF Fortran library v4.4.4
124125
id: cache-netcdf-fortran
125-
uses: actions/cache@v3
126+
uses: actions/cache@v4
126127
with:
127128
path: /home/runner/netcdf-fortran
128129
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
@@ -150,13 +151,21 @@ jobs:
150151
cd ${SCM_ROOT}
151152
./contrib/get_all_static_data.sh
152153
./contrib/get_thompson_tables.sh
153-
154-
- name: Configure build with CMake
154+
155+
- name: Configure build with CMake (Release)
156+
if: contains(matrix.build-type, 'Release')
155157
run: |
156158
cd ${SCM_ROOT}/scm
157159
mkdir bin && cd bin
158160
cmake -DCCPP_SUITES=${suites} ../src
159161
162+
- name: Configure build with CMake (Debug)
163+
if: contains(matrix.build-type, 'Debug')
164+
run: |
165+
cd ${SCM_ROOT}/scm
166+
mkdir bin && cd bin
167+
cmake -DCCPP_SUITES=${suites} -DCMAKE_BUILD_TYPE=Debug ../src
168+
160169
- name: Build SCM
161170
run: |
162171
cd ${SCM_ROOT}/scm/bin

‎.github/workflows/ci_run_scm_rts.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# Initial
3333
#######################################################################################
3434
- name: Checkout SCM code (into /home/runner/work/ccpp-scm/)
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

3737
- name: Initialize submodules
3838
run: git submodule update --init --recursive
@@ -41,7 +41,7 @@ jobs:
4141
# Python setup
4242
#######################################################################################
4343
- name: Set up Python
44-
uses: actions/setup-python@v3
44+
uses: actions/setup-python@v5
4545
with:
4646
python-version: ${{matrix.py-version}}
4747

@@ -74,7 +74,7 @@ jobs:
7474
7575
- name: Cache bacio library v2.4.1
7676
id: cache-bacio-fortran
77-
uses: actions/cache@v3
77+
uses: actions/cache@v4
7878
with:
7979
path: /home/runner/bacio
8080
key: cache-bacio-fortran-${{matrix.fortran-compiler}}-key
@@ -91,7 +91,7 @@ jobs:
9191
9292
- name: Cache SP-library v2.3.3
9393
id: cache-sp-fortran
94-
uses: actions/cache@v3
94+
uses: actions/cache@v4
9595
with:
9696
path: /home/runner/NCEPLIBS-sp
9797
key: cache-sp-fortran-${{matrix.fortran-compiler}}-key
@@ -108,7 +108,7 @@ jobs:
108108
109109
- name: Cache w3emc library v2.9.2
110110
id: cache-w3emc-fortran
111-
uses: actions/cache@v3
111+
uses: actions/cache@v4
112112
with:
113113
path: /home/runner/myw3emc
114114
key: cache-w3emc-fortran-${{matrix.fortran-compiler}}-key
@@ -128,7 +128,7 @@ jobs:
128128

129129
- name: Cache NetCDF Fortran library
130130
id: cache-netcdf-fortran
131-
uses: actions/cache@v3
131+
uses: actions/cache@v4
132132
with:
133133
path: /home/runner/netcdf-fortran
134134
key: cache-netcdf-fortran-${{matrix.fortran-compiler}}-key
@@ -208,7 +208,7 @@ jobs:
208208
- name: Download SCM RT baselines
209209
run: |
210210
cd ${dir_bl}
211-
wget https://dtcenter.ucar.edu/ccpp/users/rt/rt-baselines-${{matrix.build-type}}.zip
211+
wget https://dtcenter.ucar.edu/ccpp/rt/rt-baselines-${{matrix.build-type}}.zip
212212
unzip rt-baselines-${{matrix.build-type}}.zip
213213
214214
- name: Compare SCM RT output to baselines
@@ -223,7 +223,7 @@ jobs:
223223
path: /home/runner/work/ccpp-scm/ccpp-scm/test/scm_rt_out
224224

225225
- name: Upload SCM RTs as GitHub Artifact
226-
uses: actions/upload-artifact@v2
226+
uses: actions/upload-artifact@v4
227227
with:
228228
name: rt-baselines-${{matrix.build-type}}
229229
path: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}

‎.github/workflows/ci_run_scm_ufs_replay.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
#######################################################################################
2424

2525
- name: Checkout SCM.
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4
2727

2828
- name: Initialize SCM submodules.
2929
run: git submodule update --init --recursive
@@ -32,13 +32,13 @@ jobs:
3232
run: sudo apt-get update
3333

3434
- name: Cache conda
35-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3636
with:
3737
path: ~/conda_pkgs_dir
3838
key: conda-pkgs
3939

4040
- name: Setup python.
41-
uses: conda-incubator/setup-miniconda@v2
41+
uses: conda-incubator/setup-miniconda@v3
4242
with:
4343
activate-environment: env_ufsreplay
4444
environment-file: environment-ufsreplay.yml
@@ -51,7 +51,7 @@ jobs:
5151
#######################################################################################
5252

5353
- name: Cache UWM regression test output.
54-
uses: actions/cache@v3
54+
uses: actions/cache@v4
5555
with:
5656
path: ${dir_rt_cache}
5757
key: ufs-rt-files
@@ -72,4 +72,4 @@ jobs:
7272
7373
#######################################################################################
7474
# Done
75-
#######################################################################################
75+
#######################################################################################

‎.github/workflows/ci_scm_ccpp_prebuild.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
steps:
1212

1313
- name: Checkout code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515

1616
- name: Initialize submodules
1717
run: git submodule update --init --recursive
18-
18+
1919
- name: Set up Python 3.8.5
20-
uses: actions/setup-python@v3
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: 3.8.5
2323

‎ccpp/framework‎

Submodule framework updated 41 files

‎ccpp/physics‎

Submodule physics updated 203 files

‎scm/etc/modules/hera_gnu.lua‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,23 @@ the NOAA RDHPC machine Hera using GNU 9.2.0
55

66
whatis([===[Loads libraries needed for building the CCPP SCM on Hera with GNU compilers ]===])
77

8-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
98

10-
load("cmake/3.28.1")
11-
load("miniconda/3.9.12")
9+
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles")
10+
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles")
11+
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/ufs-wm-srw-rocky8/install/modulefiles/Core")
1212

13-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
14-
15-
load("stack-gcc/9.2.0")
16-
load("stack-openmpi/4.1.5")
17-
load("stack-python/3.10.8")
13+
load("stack-gcc/13.3.0")
14+
load("stack-openmpi/4.1.6")
15+
load("cmake/3.23.1")
16+
load("stack-python/3.10.13")
1817
load("py-f90nml")
1918
load("py-netcdf4/1.5.8")
2019

2120
load("netcdf-c/4.9.2")
22-
load("netcdf-fortran/4.6.0")
21+
load("netcdf-fortran/4.6.1")
2322
load("bacio/2.4.1")
24-
load("sp/2.3.3")
25-
load("w3emc")
23+
load("sp/2.5.0")
24+
load("w3emc/2.10.0")
2625

2726
setenv("CMAKE_C_COMPILER","mpicc")
2827
setenv("CMAKE_CXX_COMPILER","mpicxx")

‎scm/etc/modules/hera_intel.lua‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,20 @@ the NOAA RDHPC machine Hera using Intel-2021.5.0
55

66
whatis([===[Loads libraries needed for building the CCPP SCM on Hera with Intel compilers ]===])
77

8-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
9-
load("cmake/3.28.1")
10-
load("miniconda/3.9.12")
11-
12-
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env-rocky8/install/modulefiles/Core")
8+
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
139

1410
load("stack-intel/2021.5.0")
1511
load("stack-intel-oneapi-mpi/2021.5.1")
16-
load("stack-python/3.10.8")
12+
load("cmake/3.23.1")
13+
load("stack-python/3.10.13")
1714
load("py-f90nml")
1815
load("py-netcdf4/1.5.8")
1916

2017
load("netcdf-c/4.9.2")
21-
load("netcdf-fortran/4.6.0")
18+
load("netcdf-fortran/4.6.1")
2219
load("bacio/2.4.1")
23-
load("sp/2.3.3")
24-
load("w3emc")
20+
load("sp/2.5.0")
21+
load("w3emc/2.10.0")
2522

2623
setenv("CMAKE_C_COMPILER","mpiicc")
2724
setenv("CMAKE_CXX_COMPILER","mpiicpc")

0 commit comments

Comments
 (0)