Skip to content

[release/public-v2] Cleaning up modules and separating hpc-stack and spack-stack for srw_common #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mark-a-potts merged 6 commits into from
Jun 16, 2022
Merged

[release/public-v2] Cleaning up modules and separating hpc-stack and spack-stack for srw_common #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a81aaa
fixes for cheyenne
mark-a-potts Jun 13, 2022
1198c2e
Merge branch 'release/public-v2' of https://github.com/ufs-community/…
mark-a-potts Jun 15, 2022
df715c7
Cleaning up modules for cheyenne and others
mark-a-potts Jun 15, 2022
593807e
cleaning up cloud modules
mark-a-potts Jun 15, 2022
0bdd05a
fix for cheyenne and ufs_utils
mark-a-potts Jun 15, 2022
b226054
Merge branch 'release/public-v2' into feature/module-cleanup
mark-a-potts Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions modulefiles/build_cheyenne_gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ module load w3emc/2.9.2
module load esmf/8.3.0b09
module load mapl/2.11.0-esmf-8.3.0b09
module load netcdf/4.7.4
module load libpng/1.6.35
module load pio/2.5.2

setenv CMAKE_C_COMPILER mpicc
Expand Down
4 changes: 4 additions & 0 deletions modulefiles/build_cheyenne_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ module load hpc-mpt/2.25

module load srw_common


module unload w3emc/2.7.3
module load w3emc/2.9.1

module load g2/3.4.5
module load esmf/8.3.0b09
module load mapl/2.11.0-esmf-8.3.0b09
Expand Down
3 changes: 1 addition & 2 deletions modulefiles/build_noaacloud_intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ module load cmake/3.22.1
module use /apps/modules/modulefiles
module load rocoto

module load srw_common
module load esmf/8.2.0
module load srw_common.spack

module use /contrib/GST/miniconda3/modulefiles
module load miniconda3/4.10.3
20 changes: 9 additions & 11 deletions modulefiles/srw_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@

module load jasper/2.0.25
module load zlib/1.2.11
module try-load png/1.6.35
module try-load libpng/1.6.35

module load hdf5/1.10.6
module load-any netcdf/4.7.4 netcdf-c/4.7.4
module load-any netcdf/4.7.4 netcdf-fortran/4.5.4
module load-any pio/2.5.2 parallelio/2.5.2
module load-any esmf/8.3.0b09
module load fms
module load netcdf/4.7.4
module load pio/2.5.2
module load esmf/8.3.0b09
module load fms/2022.01

module load bacio/2.4.1
module load crtm/2.3.0
Expand All @@ -21,15 +18,16 @@ module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load-any gftl-shared/v1.3.3 gftl-shared/1.3.3
module load-any yafyaml/v0.5.1 yafyaml/0.5.1
module load-any mapl/2.11.0-esmf-8.3.0b09
module load gftl-shared/v1.3.3
module load yafyaml/v0.5.1
module load mapl/2.11.0-esmf-8.3.0b09

module load gfsio/1.4.1
module load landsfcutil/2.4.1
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
module load sfcio/1.4.1
module load sigio/2.3.2
module try-load w3emc/2.7.3
module load w3emc/2.7.3
module load wgrib2/2.0.8

33 changes: 33 additions & 0 deletions modulefiles/srw_common.spack
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#%Module

module load jasper/2.0.25
module load zlib/1.2.11

module load hdf5/1.10.6
module load netcdf-c/4.7.4
module load netcdf-fortran/4.5.4
module load parallelio/2.5.2
module load esmf/8.3.0b09
module load fms/2021.03

module load bacio/2.4.1
module load crtm/2.3.0
module load g2/3.4.3
module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/1.3.3
module load yafyaml/0.5.1

module load gfsio/1.4.1
module load landsfcutil/2.4.1
module load nemsio/2.5.2
module load nemsiogfs/2.5.3
module load sfcio/1.4.1
module load sigio/2.3.2
module load w3emc/2.7.3
module load wgrib2/2.0.8

2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExternalProject_Add(UFS_UTILS
)

if(NOT CCPP_SUITES)
set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km")
set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km,FV3_WoFS_v0")
endif()

if(NOT APP)
Expand Down