diff --git a/modulefiles/build_cheyenne_gnu.lua b/modulefiles/build_cheyenne_gnu.lua index 6f1dc5d75e..705eac625a 100644 --- a/modulefiles/build_cheyenne_gnu.lua +++ b/modulefiles/build_cheyenne_gnu.lua @@ -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") diff --git a/modulefiles/build_cheyenne_intel.lua b/modulefiles/build_cheyenne_intel.lua index 2c5f2a332f..3f2e8a73b6 100644 --- a/modulefiles/build_cheyenne_intel.lua +++ b/modulefiles/build_cheyenne_intel.lua @@ -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") diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua index cb1205a42b..6f99a415cf 100644 --- a/modulefiles/build_noaacloud_intel.lua +++ b/modulefiles/build_noaacloud_intel.lua @@ -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") diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 92795c6f8c..200b2bbf35 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -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")) diff --git a/modulefiles/srw_common_spack.lua b/modulefiles/srw_common_spack.lua new file mode 100644 index 0000000000..8e0a607a9d --- /dev/null +++ b/modulefiles/srw_common_spack.lua @@ -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") diff --git a/modulefiles/tasks/cheyenne/conda_regional_workflow.lua b/modulefiles/tasks/cheyenne/conda_regional_workflow.lua deleted file mode 100644 index 53ba3f6936..0000000000 --- a/modulefiles/tasks/cheyenne/conda_regional_workflow.lua +++ /dev/null @@ -1,3 +0,0 @@ -unload("python") -load("conda") -setenv("SRW_ENV", "/glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow") diff --git a/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua b/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua +++ b/modulefiles/tasks/cheyenne/get_extrn_ics.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua b/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/cheyenne/get_extrn_lbcs.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/make_grid.local.lua b/modulefiles/tasks/cheyenne/make_grid.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/make_grid.local.lua +++ b/modulefiles/tasks/cheyenne/make_grid.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/make_ics.local.lua b/modulefiles/tasks/cheyenne/make_ics.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/make_ics.local.lua +++ b/modulefiles/tasks/cheyenne/make_ics.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/make_lbcs.local.lua b/modulefiles/tasks/cheyenne/make_lbcs.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/make_lbcs.local.lua +++ b/modulefiles/tasks/cheyenne/make_lbcs.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/make_orog.hardcoded.lua b/modulefiles/tasks/cheyenne/make_orog.hardcoded.lua deleted file mode 100644 index 2395a81c8e..0000000000 --- a/modulefiles/tasks/cheyenne/make_orog.hardcoded.lua +++ /dev/null @@ -1,4 +0,0 @@ -load("ncarenv/1.3") -load("intel/19.0.2") -load("ncarcompilers/0.5.0") -load("netcdf/4.6.3") diff --git a/modulefiles/tasks/cheyenne/make_orog.local.lua b/modulefiles/tasks/cheyenne/make_orog.local.lua new file mode 100644 index 0000000000..d371c08301 --- /dev/null +++ b/modulefiles/tasks/cheyenne/make_orog.local.lua @@ -0,0 +1 @@ +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua b/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua +++ b/modulefiles/tasks/cheyenne/make_sfc_climo.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua b/modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua new file mode 100644 index 0000000000..2263141a0a --- /dev/null +++ b/modulefiles/tasks/cheyenne/miniconda_regional_workflow.lua @@ -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") diff --git a/modulefiles/tasks/cheyenne/run_fcst.local.lua b/modulefiles/tasks/cheyenne/run_fcst.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/run_fcst.local.lua +++ b/modulefiles/tasks/cheyenne/run_fcst.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua index 494c85136d..d371c08301 100644 --- a/modulefiles/tasks/cheyenne/run_vx.local.lua +++ b/modulefiles/tasks/cheyenne/run_vx.local.lua @@ -1 +1 @@ -load("conda_regional_workflow") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/gaea/miniconda_regional_workflow.lua b/modulefiles/tasks/gaea/miniconda_regional_workflow.lua index dd8ec8f7e4..74336ca1cf 100644 --- a/modulefiles/tasks/gaea/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/gaea/miniconda_regional_workflow.lua @@ -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")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/hera/get_obs.local.lua b/modulefiles/tasks/hera/get_obs.local.lua index c53d3ff3de..d1afe2451e 100644 --- a/modulefiles/tasks/hera/get_obs.local.lua +++ b/modulefiles/tasks/hera/get_obs.local.lua @@ -1,5 +1,2 @@ load("hpss") -prepend_path("MODULEPATH", "/contrib/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.5.12") - -setenv("SRW_ENV", "pygraf") +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/hera/miniconda_regional_workflow.lua b/modulefiles/tasks/hera/miniconda_regional_workflow.lua index 0443b7d948..7934169824 100644 --- a/modulefiles/tasks/hera/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/hera/miniconda_regional_workflow.lua @@ -1,4 +1,4 @@ -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")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/jet/miniconda_regional_workflow.lua b/modulefiles/tasks/jet/miniconda_regional_workflow.lua index 0443b7d948..ef4f248966 100644 --- a/modulefiles/tasks/jet/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/jet/miniconda_regional_workflow.lua @@ -1,4 +1,4 @@ -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")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua b/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua index 74486df795..602d60842f 100644 --- a/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/noaacloud/miniconda_regional_workflow.lua @@ -1,4 +1 @@ -prepend_path("MODULEPATH", "/contrib/GST/miniconda3/modulefiles") -load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.10.3")) - -setenv("SRW_ENV", "regional_workflow") +prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin") diff --git a/modulefiles/tasks/orion/make_orog.local.lua b/modulefiles/tasks/orion/make_orog.local.lua new file mode 100644 index 0000000000..d371c08301 --- /dev/null +++ b/modulefiles/tasks/orion/make_orog.local.lua @@ -0,0 +1 @@ +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/orion/make_sfc_climo.local.lua b/modulefiles/tasks/orion/make_sfc_climo.local.lua new file mode 100644 index 0000000000..d371c08301 --- /dev/null +++ b/modulefiles/tasks/orion/make_sfc_climo.local.lua @@ -0,0 +1 @@ +load("miniconda_regional_workflow") diff --git a/modulefiles/tasks/orion/miniconda_regional_workflow.lua b/modulefiles/tasks/orion/miniconda_regional_workflow.lua index 22b0f4a5ce..793a8824a9 100644 --- a/modulefiles/tasks/orion/miniconda_regional_workflow.lua +++ b/modulefiles/tasks/orion/miniconda_regional_workflow.lua @@ -1,4 +1,4 @@ -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")) setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/wflow_cheyenne.lua b/modulefiles/wflow_cheyenne.lua index aa44485679..35b7365d43 100644 --- a/modulefiles/wflow_cheyenne.lua +++ b/modulefiles/wflow_cheyenne.lua @@ -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 diff --git a/modulefiles/wflow_hera.lua b/modulefiles/wflow_hera.lua index 58bc83d0c4..efca665dd2 100644 --- a/modulefiles/wflow_hera.lua +++ b/modulefiles/wflow_hera.lua @@ -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: diff --git a/modulefiles/wflow_jet.lua b/modulefiles/wflow_jet.lua index 3c651ae788..be11c223bc 100644 --- a/modulefiles/wflow_jet.lua +++ b/modulefiles/wflow_jet.lua @@ -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: diff --git a/modulefiles/wflow_noaacloud.lua b/modulefiles/wflow_noaacloud.lua index 23746052a0..45444a9eb2 100644 --- a/modulefiles/wflow_noaacloud.lua +++ b/modulefiles/wflow_noaacloud.lua @@ -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: diff --git a/modulefiles/wflow_orion.lua b/modulefiles/wflow_orion.lua index 29518b70a9..a8edef0089 100644 --- a/modulefiles/wflow_orion.lua +++ b/modulefiles/wflow_orion.lua @@ -8,8 +8,8 @@ whatis([===[Loads libraries needed for running SRW on Orion ]===]) load("contrib") load("rocoto") -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: diff --git a/ush/load_modules_wflow.sh b/ush/load_modules_wflow.sh index 6049805a62..5e7e30e3a7 100755 --- a/ush/load_modules_wflow.sh +++ b/ush/load_modules_wflow.sh @@ -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