Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
790f87d
Update build_cheyenne_gnu.lua
natalie-perlin Oct 25, 2022
eb1ceca
Update build_cheyenne_intel.lua
natalie-perlin Oct 25, 2022
2ccdc92
Update wflow_cheyenne.lua
natalie-perlin Oct 25, 2022
5c7282c
Update wflow_hera.lua
natalie-perlin Oct 25, 2022
01ed3ba
Update wflow_jet.lua
natalie-perlin Oct 25, 2022
3e535f1
Update wflow_orion.lua
natalie-perlin Oct 25, 2022
c1d3ed6
Update load_modules_run_task.sh
natalie-perlin Oct 25, 2022
ac4a2dd
Update wflow_cheyenne.lua
natalie-perlin Oct 25, 2022
9e47ee6
Update and rename conda_regional_workflow.lua to miniconda_regional_w…
natalie-perlin Oct 25, 2022
8b1aa08
Update make_grid.local.lua
natalie-perlin Oct 25, 2022
d94c44c
Update get_extrn_ics.local.lua
natalie-perlin Oct 25, 2022
67fe20e
Update get_extrn_lbcs.local.lua
natalie-perlin Oct 25, 2022
5e62ff5
Update make_ics.local.lua
natalie-perlin Oct 25, 2022
ada2e20
Update make_lbcs.local.lua
natalie-perlin Oct 25, 2022
7394e9f
Update and rename make_orog.hardcoded.lua to make_orog.local.lua
natalie-perlin Oct 25, 2022
846e01b
Update run_fcst.local.lua
natalie-perlin Oct 25, 2022
4c94608
Update run_vx.local.lua
natalie-perlin Oct 25, 2022
0e1b216
Create make_sfc_climo.local.lua
natalie-perlin Oct 25, 2022
4615ab9
Update miniconda_regional_workflow.lua
natalie-perlin Oct 25, 2022
05eb788
Update get_obs.local.lua
natalie-perlin Oct 25, 2022
776de68
Update miniconda_regional_workflow.lua
natalie-perlin Oct 25, 2022
835d841
Update miniconda_regional_workflow.lua
natalie-perlin Oct 25, 2022
8c82aa8
Enable SCHED_NATIVE_CMD on all systems.
danielabdi-noaa Oct 27, 2022
feb66bb
Update build_cheyenne_gnu.lua
natalie-perlin Oct 27, 2022
4d56e78
Update build_cheyenne_intel.lua
natalie-perlin Oct 27, 2022
9febdcb
Update build_gaea_intel.lua
natalie-perlin Oct 27, 2022
542f6b7
Update build_hera_intel.lua
natalie-perlin Oct 27, 2022
d15f89f
Update build_jet_intel.lua
natalie-perlin Oct 27, 2022
7545fb9
Update build_orion_intel.lua
natalie-perlin Oct 27, 2022
07288d6
Merge branch 'ufs-community:develop' into develop_miniconda3_update
natalie-perlin Oct 27, 2022
74b8420
Update load_modules_wflow.sh
natalie-perlin Oct 27, 2022
856c803
Don't export variables for those that use SLURM.
danielabdi-noaa Oct 27, 2022
6b27ffb
Add some missing task specific modulefiles.
danielabdi-noaa Oct 27, 2022
a974451
Update miniconda_regional_workflow.lua
natalie-perlin Oct 27, 2022
65c3704
Update miniconda_regional_workflow.lua
natalie-perlin Oct 27, 2022
4ea989a
Update miniconda_regional_workflow.lua
natalie-perlin Oct 27, 2022
1a3f26b
Update miniconda_regional_workflow.lua
natalie-perlin Oct 27, 2022
13ac404
Update miniconda_regional_workflow.lua
natalie-perlin Oct 27, 2022
64d140e
fixes for noaacloud that work with Daniels pr
mark-a-potts Oct 28, 2022
439adfb
removed extra lines
mark-a-potts Oct 29, 2022
ade9942
Merge branch 'develop_miniconda3_update' into develop
mark-a-potts Oct 29, 2022
7247284
Merge branch 'feature/noaacloud-patch' into develop
mark-a-potts Oct 29, 2022
ba3c55f
removed commented lines
mark-a-potts Oct 29, 2022
3f456b4
Removed set -x and some commented lines
mark-a-potts Oct 29, 2022
718eb48
Merge branch 'feature/noaacloud-patch' of https://github.com/NOAA-EPI…
mark-a-potts Oct 29, 2022
877e94f
put module list back in
mark-a-potts Oct 29, 2022
04a378b
removed ldd
mark-a-potts Oct 29, 2022
c209a37
removed miniconda from build*.lua files
mark-a-potts Oct 29, 2022
8c7fd30
returned conda load to local files
mark-a-potts Oct 29, 2022
f5e185c
returned python to cheyenne
mark-a-potts Oct 31, 2022
81273b8
unload python module before setting up miniconda
mark-a-potts Oct 31, 2022
aa0bb86
added unload python to miniconda_regional_workflow.lua file
mark-a-potts Oct 31, 2022
cb481ec
added local files for orion
mark-a-potts Oct 31, 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
2 changes: 1 addition & 1 deletion modulefiles/build_cheyenne_gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ the CISL machine Cheyenne using GNU
whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===])

load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0"))
load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3"))
load(pathJoin("gnu", os.getenv("gnu_ver") or "11.2.0"))
load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25"))
load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
setenv("MKLROOT", "/glade/u/apps/opt/intel/2022.1/mkl/latest")
load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0"))
unload("netcdf")
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build_cheyenne_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ the CISL machine Cheyenne using Intel-2022.1
whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===])

load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0"))
load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3"))
load(pathJoin("intel", os.getenv("intel_ver") or "2022.1"))
load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25"))
load(pathJoin("mkl", os.getenv("mkl_ver") or "2022.1"))
load(pathJoin("python", os.getenv("python_ver") or "3.7.9"))
load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0"))
unload("netcdf")

Expand Down
12 changes: 5 additions & 7 deletions modulefiles/build_noaacloud_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ the NOAA cloud using Intel-oneapi

whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===])

prepend_path("MODULEPATH", "/contrib/spack-stack/apps/srw-app-test/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/envs/srw-develop-intel/install/modulefiles/Core")
prepend_path("MODULEPATH", "/apps/modules/modulefiles")
load("intel/2021.3.0")
load("impi/2021.3.0")
load("stack-intel")
load("stack-intel-oneapi-mpi")
load("cmake/3.22.1")

load("srw_common")
load("esmf/8.2.0")
load("netcdf-c")
load("netcdf-fortran")
load("libpng")
load("jasper")
load("srw_common_spack")
1 change: 0 additions & 1 deletion modulefiles/build_orion_intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ load("contrib")
load("noaatools")

load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.1"))
load(pathJoin("python", os.getenv("python_ver") or "3.9.2"))

prepend_path("MODULEPATH","/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))
Expand Down
30 changes: 30 additions & 0 deletions modulefiles/srw_common_spack.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
load("jasper/2.0.25")
load("zlib/1.2.11")
load("libpng/1.6.37")
load("netcdf-c/4.7.4")
load("netcdf-fortran/4.5.4")
load("pio/2.5.3")
load("esmf/8.3.0b09")
load("fms/2022.01")

load("bufr/11.7.0")
load("bacio/2.4.1")
load("crtm/2.3.0")
load("g2/3.4.5")
load("g2tmpl/1.10.0")
load("ip/3.3.3")
load("sp/2.3.3")
load("w3emc/2.9.2")

load("gftl-shared/1.5.0")
load("yafyaml/0.5.1")
load("mapl/2.22.0-esmf-8.3.0b09-esmf-8.3.0")

load("nemsio/2.5.4")
load("sfcio/1.4.1")
load("sigio/2.3.2")
load("w3nco/2.4.1")
load("wrf_io/1.2.0")

load("ncio/1.1.2")
load("wgrib2/2.0.8")
3 changes: 0 additions & 3 deletions modulefiles/tasks/cheyenne/conda_regional_workflow.lua

This file was deleted.

2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/get_extrn_ics.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/make_grid.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/make_ics.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/make_lbcs.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
4 changes: 0 additions & 4 deletions modulefiles/tasks/cheyenne/make_orog.hardcoded.lua

This file was deleted.

1 change: 1 addition & 0 deletions modulefiles/tasks/cheyenne/make_orog.local.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/make_sfc_climo.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
5 changes: 5 additions & 0 deletions modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
unload("python")
prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

setenv("SRW_ENV", "regional_workflow")
Comment thread
mark-a-potts marked this conversation as resolved.
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/run_fcst.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/cheyenne/run_vx.local.lua
Original file line number Diff line number Diff line change
@@ -1 +1 @@
load("conda_regional_workflow")
load("miniconda_regional_workflow")
2 changes: 1 addition & 1 deletion modulefiles/tasks/gaea/miniconda_regional_workflow.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prepend_path("MODULEPATH", "/lustre/f2/dev/role.epic/contrib/modulefiles")
prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

Comment thread
mark-a-potts marked this conversation as resolved.
Comment thread
mark-a-potts marked this conversation as resolved.
setenv("SRW_ENV", "regional_workflow")
5 changes: 1 addition & 4 deletions modulefiles/tasks/hera/get_obs.local.lua
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
load("hpss")
prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12")
Comment thread
mark-a-potts marked this conversation as resolved.

setenv("SRW_ENV", "pygraf")
Comment thread
mark-a-potts marked this conversation as resolved.
load("miniconda_regional_workflow")
4 changes: 2 additions & 2 deletions modulefiles/tasks/hera/miniconda_regional_workflow.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
Comment thread
mark-a-potts marked this conversation as resolved.
prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

Comment thread
mark-a-potts marked this conversation as resolved.
setenv("SRW_ENV", "regional_workflow")
4 changes: 2 additions & 2 deletions modulefiles/tasks/jet/miniconda_regional_workflow.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
Comment thread
mark-a-potts marked this conversation as resolved.
prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

Comment thread
mark-a-potts marked this conversation as resolved.
setenv("SRW_ENV", "regional_workflow")
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
prepend_path("MODULEPATH", "/contrib/GST/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3"))
Comment thread
mark-a-potts marked this conversation as resolved.

setenv("SRW_ENV", "regional_workflow")
Comment thread
mark-a-potts marked this conversation as resolved.
prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")
1 change: 1 addition & 0 deletions modulefiles/tasks/orion/make_orog.local.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load("miniconda_regional_workflow")
1 change: 1 addition & 0 deletions modulefiles/tasks/orion/make_sfc_climo.local.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load("miniconda_regional_workflow")
4 changes: 2 additions & 2 deletions modulefiles/tasks/orion/miniconda_regional_workflow.lua
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
append_path("MODULEPATH", "/apps/contrib/miniconda3-noaa-gsl/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "3.8"))
Comment thread
mark-a-potts marked this conversation as resolved.
append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

Comment thread
mark-a-potts marked this conversation as resolved.
setenv("SRW_ENV", "regional_workflow")
6 changes: 4 additions & 2 deletions modulefiles/wflow_cheyenne.lua
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@ load("ncarenv")
append_path("MODULEPATH","/glade/p/ral/jntp/UFS_SRW_app/modules")
load("rocoto")

load(pathJoin("conda", os.getenv("conda_ver") or "latest"))
unload("python")
prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
> conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
> conda activate regional_workflow
]===])
end

4 changes: 2 additions & 2 deletions modulefiles/wflow_hera.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Hera ]===])

load("rocoto")

prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
prepend_path("MODULEPATH","/scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/wflow_jet.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Jet ]===])

load("rocoto")

prepend_path("MODULEPATH","/contrib/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12"))
prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
Expand Down
8 changes: 4 additions & 4 deletions modulefiles/wflow_noaacloud.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ whatis([===[Loads libraries needed for running the UFS SRW App on NOAA cloud ]==
prepend_path("MODULEPATH","/apps/modules/modulefiles")
load("rocoto")

prepend_path("MODULEPATH","/contrib/GST/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3"))
prepend_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

setenv("PROJ_LIB","/contrib/GST/miniconda/envs/regional_workflow/share/proj")
setenv("PROJ_LIB","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/share/proj")
setenv("OPT","/contrib/EPIC/hpc-modules")
append_path("PATH","/contrib/GST/miniconda/envs/regional_workflow/bin")
append_path("PATH","/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin")

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/wflow_orion.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ whatis([===[Loads libraries needed for running SRW on Orion ]===])
load("contrib")
load("rocoto")

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not end up putting a python module into the Orion module files, so there is no python to unload.

append_path("MODULEPATH","/apps/contrib/miniconda3-noaa-gsl/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "3.8"))
append_path("MODULEPATH","/work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles")
load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0"))

if mode() == "load" then
LmodMsgRaw([===[Please do the following to activate conda:
Expand Down
10 changes: 4 additions & 6 deletions ush/load_modules_wflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,11 @@ task failed:
[[ ${SHELLOPTS} =~ nounset ]] && has_mu=true || has_mu=false

$has_mu && set +u
if [[ "${machine}" == 'cheyenne' ]]; then
conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow
else
if [ ! -z $(command -v conda) ]; then
conda activate regional_workflow
fi

if [ ! -z $(command -v conda) ]; then
conda activate regional_workflow
fi

$has_mu && set -u

# List loaded modulefiles
Expand Down