Skip to content

Commit

Permalink
Bug fix for gaea modulefiles. (#407)
Browse files Browse the repository at this point in the history
* Bug fix for gaea modulefiles.

* Specify version number of minicond3.

* Do the same for noaacloud modulefiles.

* Use same miniconda in gaea task modulefiles.
  • Loading branch information
danielabdi-noaa authored Oct 11, 2022
1 parent 27b14f7 commit 28205cb
Show file tree
Hide file tree
Showing 16 changed files with 6 additions and 28 deletions.
6 changes: 0 additions & 6 deletions modulefiles/build_gaea_intel
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,13 @@ module load hpc/1.2.0
module load intel/2021.3.0
module load hpc-intel/2021.3.0
module load hpc-cray-mpich/7.7.11
# Needed at runtime:
module load alps
#needed for WW3 build
module load gcc/8.3.0

module load srw_common
module load libpng/1.6.37

module use /lustre/f2/dev/role.epic/contrib/modulefiles
module load miniconda3/4.12.0

module load cmake/3.20.1
module load rocoto

setenv CC cc
setenv FC ftn
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build_jet_intel
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ module load hpc/1.2.0
module load hpc-intel/2022.1.2
module load hpc-impi/2022.1.2

module load nccmp/1.8.9.0
module load srw_common

module load nccmp/1.8.9.0
module load prod_util/1.2.2
module load nco/4.9.3

Expand Down
7 changes: 0 additions & 7 deletions modulefiles/build_noaacloud_intel
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,10 @@ proc ModulesHelp { } {
puts stderr "the NOAA cloud using Intel-oneapi"
}

module purge
module use /contrib/spack-stack/apps/srw-app-test/modulefiles/Core
module load stack-intel
module load stack-intel-oneapi-mpi
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 use /contrib/GST/miniconda3/modulefiles
module load miniconda3/4.10.3
2 changes: 1 addition & 1 deletion modulefiles/build_orion_intel
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ module load hpc/1.2.0
module load hpc-intel/2022.1.2
module load hpc-impi/2022.1.2

module load nccmp/1.8.9.0
module load srw_common

module load nccmp/1.8.9.0
module load nco/4.9.3

setenv CMAKE_C_COMPILER mpiicc
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/tasks/gaea/miniconda_regional_workflow
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#%Module

module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
module load miniconda3
module use /lustre/f2/dev/role.epic/contrib/modulefiles
module load miniconda3/4.12.0

setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/get_extrn_ics.local
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#%Module

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow

1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/get_extrn_lbcs.local
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#%Module

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/make_grid.local
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ module load netcdf-c
module load netcdf-fortran

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/make_ics.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ module load libpng
module load jasper

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/make_lbcs.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ module load libpng
module load jasper

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/make_orog.local
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ module load netcdf-c
module load netcdf-fortran

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/make_sfc_climo.local
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,5 @@ module load netcdf-c
module load netcdf-fortran

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/run_fcst.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ module load libpng
module load jasper

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
1 change: 0 additions & 1 deletion modulefiles/tasks/noaacloud/run_post.local
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,5 @@ module load libpng
module load jasper

module load miniconda_regional_workflow
module load rocoto
prepend-path PATH /contrib/GST/miniconda/envs/regional_workflow/bin
setenv SRW_ENV regional_workflow
3 changes: 2 additions & 1 deletion modulefiles/wflow_gaea
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ proc ModulesHelp { } {
module-whatis "Loads libraries needed for running SRW on Gaea"

module use /lustre/f2/dev/role.epic/contrib/modulefiles
module load miniconda3/4.12.0
module load rocoto
module load miniconda3
module load alps

setenv CONDA_DEFAULT_ENV "regional_workflow"
setenv PROJ_LIB /lustre/f2/dev/role.epic/contrib/miniconda3/4.12.0/envs/regional_workflow/share/proj
Expand Down
1 change: 0 additions & 1 deletion modulefiles/wflow_noaacloud
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ proc ModulesHelp { } {

module-whatis "Loads libraries needed for running SRW on NOAA cloud"


module use /apps/modules/modulefiles
module load rocoto
module use /contrib/GST/miniconda3/modulefiles
Expand Down

0 comments on commit 28205cb

Please sign in to comment.