Skip to content

Commit c2edc45

Browse files
Merge branch 'develop' into feature/sfc_climo_gen.frac
Fixes ufs-community#709.
2 parents 8ba64d0 + c0e4152 commit c2edc45

File tree

3 files changed

+87
-33
lines changed

3 files changed

+87
-33
lines changed

.github/workflows/developer.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
sudo apt-get update
3838
sudo apt-get install libpng-dev zlib1g-dev libjpeg-dev doxygen libmpich-dev
3939
sudo apt-get install libnetcdf-dev libnetcdff-dev netcdf-bin pkg-config
40-
python3 -m pip install gcovr
40+
# python3 -m pip install gcovr
4141

4242
- name: cache-esmf
4343
id: cache-esmf
@@ -348,7 +348,7 @@ jobs:
348348
run: |
349349
cd ufs_utils/build
350350
ctest --verbose --rerun-failed --output-on-failure
351-
gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
351+
# gcovr --root .. -v --html-details --exclude ../tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null
352352

353353
- name: cache-data
354354
if: steps.cache-data.outputs.cache-hit != 'true'

modulefiles/build.cheyenne.intel

-31
This file was deleted.

modulefiles/build.cheyenne.intel.lua

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
help([[
2+
Load environment to compile UFS_UTILS on Cheyenne using Intel
3+
]])
4+
5+
cmake_ver=os.getenv("cmake_ver") or "3.22.0"
6+
load(pathJoin("cmake", cmake_ver))
7+
8+
python_ver=os.getenv("python_ver") or "3.7.9"
9+
load(pathJoin("python", python))
10+
11+
ncarenv_ver=os.getenv("ncarenv_ver") or "1.3"
12+
load(pathJoin("ncarenv", ncarenv_ver))
13+
14+
intel_ver=os.getenv("intel_ver") or "2022.1"
15+
load(pathJoin("intel", intel_ver))
16+
17+
mpt_ver=os.getenv("mpt_ver") or "2.25"
18+
load(pathJoin("mpt", mpt_ver))
19+
20+
ncarcompilers_ver=os.getenv("ncarcompilers_ver") or "0.5.0"
21+
load(pathJoin("ncarcompilers", ncarcompilers_ver))
22+
23+
24+
unload("netcdf")
25+
26+
27+
prepend_path("MODULEPATH", "/glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack")
28+
29+
hpc_ver=os.getenv("hpc_ver") or "1.2.0"
30+
load(pathJoin("hpc", hpc_ver))
31+
32+
hpc_intel_ver=os.getenv("hpc_intel_ver") or "2022.1"
33+
load(pathJoin("hpc-intel", hpc_intel_ver))
34+
35+
hpc_mpt_ver=os.getenv("hpc_mpt_ver") or "2.25"
36+
load(pathJoin("hpc-mpt", hpc_mpt_ver))
37+
38+
39+
-- ??? load("ufs_common")
40+
41+
42+
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
43+
load(pathJoin("bacio", bacio_ver))
44+
45+
g2_ver=os.getenv("g2_ver") or "3.4.3"
46+
load(pathJoin("g2", g2_ver))
47+
48+
ip_ver=os.getenv("ip_ver") or "3.3.3"
49+
load(pathJoin("ip", ip_ver))
50+
51+
nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
52+
load(pathJoin("nemsio", nemsio_ver))
53+
54+
sp_ver=os.getenv("sp_ver") or "2.3.3"
55+
load(pathJoin("sp", sp_ver))
56+
57+
w3nco_ver=os.getenv("w3nco_ver") or "2.4.1"
58+
load(pathJoin("w3nco", w3nco_ver))
59+
60+
sigio_ver=os.getenv("sigio_ver") or "2.3.2"
61+
load(pathJoin("sigio", sigio_ver))
62+
63+
64+
65+
sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
66+
load(pathJoin("sfcio", sfcio_ver))
67+
68+
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
69+
load(pathJoin("netcdf", netcdf_ver))
70+
71+
esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
72+
load(pathJoin("esmf", esmf_ver))
73+
74+
setenv("CMAKE_C_COMPILER","icc")
75+
setenv("CMAKE_Fortran_COMPILER","ifort")
76+
77+
-- From UFS Model build modulefile...
78+
-- setenv("CC", "mpicc")
79+
-- setenv("CXX", "mpicxx")
80+
-- setenv("FC", "mpif90")
81+
-- setenv("CMAKE_Platform", "cheyenne.intel")
82+
83+
84+
whatis("Description: UFS_UTILS build environment")
85+

0 commit comments

Comments
 (0)