diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu index 0fc0d2b8ad..34ce9d3eab 100644 --- a/modulefiles/build_cheyenne_gnu +++ b/modulefiles/build_cheyenne_gnu @@ -8,17 +8,19 @@ proc ModulesHelp { } { module-whatis "Loads libraries needed for building SRW on Cheyenne" module load cmake/3.22.0 -module load python/3.7.9 module load ncarenv/1.3 -module load gnu/11.2.0 +module load gnu/12.1.0 module load mpt/2.25 setenv MKLROOT /glade/u/apps/opt/intel/2022.1/mkl/latest module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/gnu/11.2.0/hpc-stack-v1.2.0/modulefiles/stack +module use /glade/work/epicufsrt/contrib/miniconda3/modulefiles +module load miniconda3/4.12.0 + +module use /glade/work/epicufsrt/contrib/hpc-stack/gnu12.1.0/modulefiles/stack module load hpc/1.2.0 -module load hpc-gnu/11.2.0 +module load hpc-gnu/12.1.0 module load hpc-mpt/2.25 module load srw_common diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel index 1e1e865542..699ce777c7 100644 --- a/modulefiles/build_cheyenne_intel +++ b/modulefiles/build_cheyenne_intel @@ -8,7 +8,6 @@ proc ModulesHelp { } { module-whatis "Loads libraries needed for building SRW on Cheyenne" module load cmake/3.22.0 -module load python/3.7.9 module load ncarenv/1.3 module load intel/2022.1 module load mpt/2.25 @@ -16,17 +15,20 @@ module load mkl/2022.1 module load ncarcompilers/0.5.0 module unload netcdf -module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/work/epicufsrt/contrib/miniconda3/modulefiles +module load miniconda3/4.12.0 + +module use /glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2022.1 module load hpc-mpt/2.25 module load srw_common +module load netcdf/4.7.4 module load g2/3.4.5 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.37 module load pio/2.5.3 module load fms/2022.01 diff --git a/modulefiles/build_hera_intel b/modulefiles/build_hera_intel index 275ef2fe32..15df2471f7 100644 --- a/modulefiles/build_hera_intel +++ b/modulefiles/build_hera_intel @@ -7,18 +7,20 @@ proc ModulesHelp { } { module-whatis "Loads libraries needed for building SRW on Hera" -module use /contrib/miniconda3/modulefiles -module load miniconda3/4.5.12 +module use /scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles +module load miniconda3/4.12.0 module use /contrib/sutils/modulefiles module load sutils module load cmake/3.20.1 -module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack +module use /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.2.0/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2022.1.2 module load hpc-impi/2022.1.2 +module load intel/2022.1.2 +module load impi/2022.1.2 module load srw_common diff --git a/modulefiles/build_jet_intel b/modulefiles/build_jet_intel index 7a4da30519..0bf068601a 100644 --- a/modulefiles/build_jet_intel +++ b/modulefiles/build_jet_intel @@ -10,10 +10,14 @@ module-whatis "Loads libraries needed for building SRW on JET" module use /contrib/sutils/modulefiles module load sutils -module load cmake/3.20.1 +module use /mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles +module load miniconda3/4.12.0 -module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack +module load cmake/3.20.1 +module load intel/2022.1.2 +module load impi/2022.1.2 +module use /mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2022.1.2 module load hpc-impi/2022.1.2 diff --git a/modulefiles/build_orion_intel b/modulefiles/build_orion_intel index f2171a4a53..ad31085a12 100644 --- a/modulefiles/build_orion_intel +++ b/modulefiles/build_orion_intel @@ -10,9 +10,10 @@ module-whatis "Loads libraries needed for building SRW on Orion" module load contrib noaatools module load cmake/3.22.1 -module load python/3.9.2 +module use /work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles +module load miniconda3/4.12.0 -module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack +module use /work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2022.1.2 module load hpc-impi/2022.1.2 diff --git a/modulefiles/tasks/cheyenne/conda_regional_workflow b/modulefiles/tasks/cheyenne/conda_regional_workflow deleted file mode 100644 index e490af9091..0000000000 --- a/modulefiles/tasks/cheyenne/conda_regional_workflow +++ /dev/null @@ -1,5 +0,0 @@ -#%Module -module unload python -module 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 b/modulefiles/tasks/cheyenne/get_extrn_ics.local index 7f0ed16e4f..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/get_extrn_ics.local +++ b/modulefiles/tasks/cheyenne/get_extrn_ics.local @@ -1,4 +1,2 @@ #%Module - -module load conda_regional_workflow - +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/get_extrn_lbcs.local b/modulefiles/tasks/cheyenne/get_extrn_lbcs.local index 7f0ed16e4f..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/get_extrn_lbcs.local +++ b/modulefiles/tasks/cheyenne/get_extrn_lbcs.local @@ -1,4 +1,2 @@ #%Module - -module load conda_regional_workflow - +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/make_grid.local b/modulefiles/tasks/cheyenne/make_grid.local index e708b857cc..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/make_grid.local +++ b/modulefiles/tasks/cheyenne/make_grid.local @@ -1,2 +1,2 @@ #%Module -module load conda_regional_workflow +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/make_ics.local b/modulefiles/tasks/cheyenne/make_ics.local index e708b857cc..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/make_ics.local +++ b/modulefiles/tasks/cheyenne/make_ics.local @@ -1,2 +1,2 @@ #%Module -module load conda_regional_workflow +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/make_lbcs.local b/modulefiles/tasks/cheyenne/make_lbcs.local index e708b857cc..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/make_lbcs.local +++ b/modulefiles/tasks/cheyenne/make_lbcs.local @@ -1,2 +1,2 @@ #%Module -module load conda_regional_workflow +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/make_orog.hardcoded b/modulefiles/tasks/cheyenne/make_orog.hardcoded deleted file mode 100644 index 51c59c5ee4..0000000000 --- a/modulefiles/tasks/cheyenne/make_orog.hardcoded +++ /dev/null @@ -1,9 +0,0 @@ -#%Module##################################################### - -module purge - -module load ncarenv/1.3 -module load intel/19.0.2 -module load ncarcompilers/0.5.0 -module load netcdf/4.6.3 - diff --git a/modulefiles/tasks/cheyenne/make_orog.local b/modulefiles/tasks/cheyenne/make_orog.local new file mode 100644 index 0000000000..61a3a77250 --- /dev/null +++ b/modulefiles/tasks/cheyenne/make_orog.local @@ -0,0 +1,2 @@ +#%Module +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/miniconda_regional_workflow b/modulefiles/tasks/cheyenne/miniconda_regional_workflow new file mode 100644 index 0000000000..4470e37617 --- /dev/null +++ b/modulefiles/tasks/cheyenne/miniconda_regional_workflow @@ -0,0 +1,6 @@ +#%Module + +module use /glade/work/epicufsrt/contrib/miniconda3/modulefiles +module load miniconda3/4.12.0 + +setenv SRW_ENV regional_workflow diff --git a/modulefiles/tasks/cheyenne/run_fcst.local b/modulefiles/tasks/cheyenne/run_fcst.local index e708b857cc..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/run_fcst.local +++ b/modulefiles/tasks/cheyenne/run_fcst.local @@ -1,2 +1,2 @@ #%Module -module load conda_regional_workflow +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/cheyenne/run_vx.local b/modulefiles/tasks/cheyenne/run_vx.local index e708b857cc..61a3a77250 100644 --- a/modulefiles/tasks/cheyenne/run_vx.local +++ b/modulefiles/tasks/cheyenne/run_vx.local @@ -1,2 +1,2 @@ #%Module -module load conda_regional_workflow +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/gaea/run_vx.local b/modulefiles/tasks/gaea/run_vx.local index f9a59c8e78..92505cf09c 100644 --- a/modulefiles/tasks/gaea/run_vx.local +++ b/modulefiles/tasks/gaea/run_vx.local @@ -1,5 +1,3 @@ #%Module module load miniconda_regional_workflow - -prepend-path LD_LIBRARY_PATH /ncrc/sw/gaea-cle7/python/3.9/anaconda-base/envs/noaa_py3.9/lib diff --git a/modulefiles/tasks/hera/get_extrn_ics.local b/modulefiles/tasks/hera/get_extrn_ics.local index dc099871e1..c3309a3710 100644 --- a/modulefiles/tasks/hera/get_extrn_ics.local +++ b/modulefiles/tasks/hera/get_extrn_ics.local @@ -1,6 +1,4 @@ -#%Module##################################################### -## Module file for get_extrn_ics task. -############################################################# +#%Module module load hpss diff --git a/modulefiles/tasks/hera/get_extrn_lbcs.local b/modulefiles/tasks/hera/get_extrn_lbcs.local index 1b420d33bc..c3309a3710 100644 --- a/modulefiles/tasks/hera/get_extrn_lbcs.local +++ b/modulefiles/tasks/hera/get_extrn_lbcs.local @@ -1,6 +1,4 @@ -#%Module##################################################### -## Module file for get_extrn_lbcs task. -############################################################# +#%Module module load hpss diff --git a/modulefiles/tasks/hera/get_obs.local b/modulefiles/tasks/hera/get_obs.local index 9ed022a5a1..fbfcd28c95 100644 --- a/modulefiles/tasks/hera/get_obs.local +++ b/modulefiles/tasks/hera/get_obs.local @@ -5,7 +5,4 @@ module load hpss -module use /contrib/miniconda3/modulefiles -module load miniconda3/4.5.12 - -setenv SRW_ENV pygraf +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/hera/make_lbcs.local b/modulefiles/tasks/hera/make_lbcs.local index 61a3a77250..92505cf09c 100644 --- a/modulefiles/tasks/hera/make_lbcs.local +++ b/modulefiles/tasks/hera/make_lbcs.local @@ -1,2 +1,3 @@ #%Module + module load miniconda_regional_workflow diff --git a/modulefiles/tasks/hera/run_vx.local b/modulefiles/tasks/hera/run_vx.local index 51416ff471..92505cf09c 100644 --- a/modulefiles/tasks/hera/run_vx.local +++ b/modulefiles/tasks/hera/run_vx.local @@ -1,5 +1,3 @@ #%Module -module use -a /contrib/anaconda/modulefiles -module load intel/18.0.5.274 -module load anaconda/latest +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/jet/make_orog.local b/modulefiles/tasks/jet/make_orog.local new file mode 100644 index 0000000000..61a3a77250 --- /dev/null +++ b/modulefiles/tasks/jet/make_orog.local @@ -0,0 +1,2 @@ +#%Module +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/jet/miniconda_regional_workflow b/modulefiles/tasks/jet/miniconda_regional_workflow index 48de7a99bb..400ab332dd 100644 --- a/modulefiles/tasks/jet/miniconda_regional_workflow +++ b/modulefiles/tasks/jet/miniconda_regional_workflow @@ -1,5 +1,5 @@ #%Module -module use /contrib/miniconda3/modulefiles -module load miniconda3/4.5.12 +module use /mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles +module load miniconda3/4.12.0 setenv SRW_ENV regional_workflow diff --git a/modulefiles/tasks/jet/run_vx.local b/modulefiles/tasks/jet/run_vx.local index 9be1ed3c79..92505cf09c 100644 --- a/modulefiles/tasks/jet/run_vx.local +++ b/modulefiles/tasks/jet/run_vx.local @@ -1,5 +1,3 @@ #%Module -module use -a /contrib/anaconda/modulefiles -module load intel/18.0.5.274 -module load anaconda/5.3.1 +module load miniconda_regional_workflow diff --git a/modulefiles/tasks/orion/miniconda_regional_workflow b/modulefiles/tasks/orion/miniconda_regional_workflow index 3703a9ba17..d8642603b4 100644 --- a/modulefiles/tasks/orion/miniconda_regional_workflow +++ b/modulefiles/tasks/orion/miniconda_regional_workflow @@ -1,5 +1,5 @@ #%Module -module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles -module load miniconda3/3.8 +module use /work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles +module load miniconda3/4.12.0 setenv SRW_ENV regional_workflow diff --git a/modulefiles/tasks/orion/run_vx.local b/modulefiles/tasks/orion/run_vx.local new file mode 100644 index 0000000000..92505cf09c --- /dev/null +++ b/modulefiles/tasks/orion/run_vx.local @@ -0,0 +1,3 @@ +#%Module + +module load miniconda_regional_workflow diff --git a/modulefiles/wflow_cheyenne b/modulefiles/wflow_cheyenne index 7041823915..f72a7938ad 100644 --- a/modulefiles/wflow_cheyenne +++ b/modulefiles/wflow_cheyenne @@ -8,13 +8,14 @@ proc ModulesHelp { } { module-whatis "Loads libraries and utilities needed for running SRW on Cheyenne" module load ncarenv -module use -a /glade/p/ral/jntp/UFS_SRW_app/modules/ +module use -a /glade/work/epicufsrt/contrib/miniconda3/modulefiles +module load miniconda3 +module use -a /glade/work/epicufsrt/contrib/modulefiles module load rocoto -module load conda/latest if { [module-info mode load] } { puts stderr "Please do the following to activate conda: - > conda activate /glade/p/ral/jntp/UFS_SRW_app/conda/regional_workflow" + > conda activate regional_workflow" } diff --git a/modulefiles/wflow_hera b/modulefiles/wflow_hera index 71641a3d11..bb233dcdbd 100644 --- a/modulefiles/wflow_hera +++ b/modulefiles/wflow_hera @@ -9,8 +9,8 @@ module-whatis "Loads libraries needed for running SRW on Hera" module load rocoto -module use /contrib/miniconda3/modulefiles -module load miniconda3/4.5.12 +module use /scratch1/NCEPDEV/nems/role.epic/miniconda3/modulefiles +module load miniconda3/4.12.0 if { [module-info mode load] } { puts stderr "Please do the following to activate conda: diff --git a/modulefiles/wflow_jet b/modulefiles/wflow_jet index 7aa7d0e67a..cb4a529772 100644 --- a/modulefiles/wflow_jet +++ b/modulefiles/wflow_jet @@ -9,8 +9,8 @@ module-whatis "Loads libraries needed for running SRW on Jet" module load rocoto -module use /contrib/miniconda3/modulefiles -module load miniconda3/4.5.12 +module use /mnt/lfs4/HFIP/hfv3gfs/role.epic/miniconda3/modulefiles +module load miniconda3/4.12.0 if { [module-info mode load] } { puts stderr "Please do the following to activate conda: diff --git a/modulefiles/wflow_orion b/modulefiles/wflow_orion index fb3439b0b9..f5c6e78fd1 100644 --- a/modulefiles/wflow_orion +++ b/modulefiles/wflow_orion @@ -9,8 +9,8 @@ module-whatis "Loads libraries needed for running SRW on Orion" module load contrib rocoto -module use -a /apps/contrib/miniconda3-noaa-gsl/modulefiles -module load miniconda3/3.8 +module use /work/noaa/epic-ps/role-epic-ps/miniconda3/modulefiles +module load miniconda3/4.12.0 if { [module-info mode load] } { puts stderr "Please do the following to activate conda: diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml index aa16540124..e7f615d025 100644 --- a/ush/machine/gaea.yaml +++ b/ush/machine/gaea.yaml @@ -5,9 +5,9 @@ platform: CCPA_OBS_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /lustre/f2/pdata/ncep_shared/UFS_SRW_App/develop/obs_data/ndas/proc - METPLUS_PATH: /usw/met/METplus/METplus-4.1.3 + METPLUS_PATH: /lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0/intel-2021.3.0/metplus/4.1.3 MET_BIN_EXEC: bin - MET_INSTALL_DIR: /usw/met/10.1.2 + MET_INSTALL_DIR: /lustre/f2/dev/role.epic/contrib/hpc-stack/intel-2021.3.0/intel-2021.3.0/met/10.1.2 QUEUE_DEFAULT: normal QUEUE_FCST: normal QUEUE_HPSS: normal diff --git a/ush/machine/hera.yaml b/ush/machine/hera.yaml index e2f2ac12f7..9cc39301b1 100644 --- a/ush/machine/hera.yaml +++ b/ush/machine/hera.yaml @@ -5,9 +5,9 @@ platform: CCPA_OBS_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /scratch2/BMC/det/UFS_SRW_App/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/METplus/METplus-4.1.1 + METPLUS_PATH: /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.2.0/intel-2022.2.0/metplus/4.1.3 MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/met/10.1.1 + MET_INSTALL_DIR: /scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.2.0/intel-2022.2.0/met/10.1.2 DOMAIN_PREGEN_BASEDIR: /scratch2/BMC/det/UFS_SRW_App/develop/FV3LAM_pregen PARTITION_DEFAULT: hera QUEUE_DEFAULT: batch diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index c5aa0ca398..9177f7df74 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -5,9 +5,9 @@ platform: CCPA_OBS_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/obs_data/ndas/proc - METPLUS_PATH: /contrib/met/METplus/METplus-4.1.1 + METPLUS_PATH: /mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.2.0/intel-2022.2.0/metplus/4.1.3 MET_BIN_EXEC: bin - MET_INSTALL_DIR: /contrib/met/10.1.1 + MET_INSTALL_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.2.0/intel-2022.2.0/met/10.1.2 DOMAIN_PREGEN_BASEDIR: /mnt/lfs4/BMC/wrfruc/UFS_SRW_App/develop/FV3LAM_pregen PARTITION_DEFAULT: sjet,vjet,kjet,xjet QUEUE_DEFAULT: batch diff --git a/ush/machine/orion.yaml b/ush/machine/orion.yaml index b57a563cd2..50d350de00 100644 --- a/ush/machine/orion.yaml +++ b/ush/machine/orion.yaml @@ -5,9 +5,9 @@ platform: CCPA_OBS_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/obs_data/ccpa/proc MRMS_OBS_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/obs_data/mrms/proc NDAS_OBS_DIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/obs_data/ndas/proc - METPLUS_PATH: /apps/contrib/MET/METplus/METplus-4.1.1 + METPLUS_PATH: /work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/metplus/4.1.3 MET_BIN_EXEC: bin - MET_INSTALL_DIR: /apps/contrib/MET/10.1.1 + MET_INSTALL_DIR: /work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/intel-2022.1.2/met/10.1.2 DOMAIN_PREGEN_BASEDIR: /work/noaa/fv3-cam/UFS_SRW_App/develop/FV3LAM_pregen PARTITION_DEFAULT: orion QUEUE_DEFAULT: batch