Release/public v2 gaea update (#830)

* Lmod/8.7.12 init, updated miniconda3 - for Gaea Added new (Lmod/8.7.12) initialization wrapper script to the ENV_INIT_SCRIPTS_FPS variable; added the PROJ_LIB and PATH variables referring to a PROJ package location in the updated miniconda3/4.12.0 and the regional_workflow environment that contain the PROJ package * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/. * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * update run_vx.local Updates to the MetPlus verification script; not yet officially supported in the release of public-v2. These changes and test of the MetPlus script were done by @EdwardSnyder-NOAA * added missing argument for the ./etc/lmod-setup.sh script A bug found by @EdwardSnyder-NOAA; a separate PR to be created into the develop branch * Gaea: Lmod/8.7.12 initialization using a wrapper script, under role.epic account * Gaea: initialize Lmod/8.7.12 using a wrapper script * update a new location of miniconda3/4.12.0, rocoto Specify a new location of the miniconda3/4.12.0 with the regional_workflow environment containing all the necessary packages, and the rocoto/1.3.3 module installed on Gaea under EPIC role account: /lustre/f2/dev/wpo/role.epic/contrib/ * Delete get_extrn_lbcs.local A redundant module; it is placed under ./regional_workflow/modulefiles/tasks/gaea/ instead. * Update load_modules_run_task.sh * Update run_vx.local Updated following recent tests of Met verification, as in ufs-srweather-app repository PR-353: ufs-community/ufs-srweather-app#353 * Update gaea.sh Updated Met Installation locations on Gaea
ufs-community · Sep 28, 2022 · fd233fd · fd233fd
1 parent 9bd1e9e
commit fd233fd
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 12 deletions.
diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
@@ -56,6 +56,8 @@ else if ( { test -d /lustre -a -d /ncrc } ) then
         # the module command fails.  Hence we actually have to source
         # /etc/csh.login here.
         source /etc/csh.login
+        # initialize Lmod/8.7.12 using a wrapper script
+        source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
         set __ms_source_etc_csh_login=yes
     else
         set __ms_source_etc_csh_login=no

diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
@@ -66,6 +66,8 @@ elif [[ -d /lustre && -d /ncrc ]] ; then
         # the module command fails.  Hence we actually have to source
         # /etc/profile here.
         source /etc/profile
+        # initialize Lmod/8.7.12 using a wrapper script
+        source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
         __ms_source_etc_profile=yes
     else
         __ms_source_etc_profile=no

diff --git a/modulefiles/tasks/gaea/get_extrn_ics.local b/modulefiles/tasks/gaea/get_extrn_ics.local
@@ -0,0 +1,7 @@
+#%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/get_extrn_lbcs.local b/modulefiles/tasks/gaea/get_extrn_lbcs.local
@@ -0,0 +1,7 @@
+#%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/make_grid.local b/modulefiles/tasks/gaea/make_grid.local
@@ -1,5 +1,6 @@
 #%Module
-module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
 module load rocoto
 module load miniconda3
 

diff --git a/modulefiles/tasks/gaea/make_ics.local b/modulefiles/tasks/gaea/make_ics.local
@@ -1,5 +1,6 @@
 #%Module
-module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
 module load rocoto
 module load miniconda3
 

diff --git a/modulefiles/tasks/gaea/make_lbcs.local b/modulefiles/tasks/gaea/make_lbcs.local
@@ -1,5 +1,6 @@
 #%Module
-module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
 module load rocoto
 module load miniconda3
 

diff --git a/modulefiles/tasks/gaea/make_orog.local b/modulefiles/tasks/gaea/make_orog.local
@@ -0,0 +1,7 @@
+#%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/make_sfc_climo.local b/modulefiles/tasks/gaea/make_sfc_climo.local
@@ -0,0 +1,7 @@
+#%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/run_fcst.local b/modulefiles/tasks/gaea/run_fcst.local
@@ -1,5 +1,5 @@
 #%Module
-module use /lustre/f2/pdata/esrl/gsd/contrib/modulefiles
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
 module load rocoto
 module load miniconda3
 

diff --git a/modulefiles/tasks/gaea/run_post.local b/modulefiles/tasks/gaea/run_post.local
@@ -0,0 +1,7 @@
+#%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
+
+setenv SRW_ENV regional_workflow
diff --git a/modulefiles/tasks/gaea/run_vx.local b/modulefiles/tasks/gaea/run_vx.local
@@ -1,7 +1,8 @@
 #%Module
+
+module use /lustre/f2/dev/wpo/role.epic/contrib/modulefiles
+module load rocoto
+module load miniconda3
 
-module use -a /contrib/anaconda/modulefiles
-module load intel/18.0.5.274
-module load anaconda/latest
-module use -a /contrib/met/modulefiles/
-module load met/10.0.0
+prepend-path LD_LIBRARY_PATH /ncrc/sw/gaea-cle7/python/3.9/anaconda-base/envs/noaa_py3.9/lib
+setenv SRW_ENV regional_workflow
diff --git a/ush/load_modules_run_task.sh b/ush/load_modules_run_task.sh
@@ -92,7 +92,7 @@ jjob_fp="$2"
 #
 machine=$(echo_lowercase $MACHINE)
 
-source "${SR_WX_APP_TOP_DIR}/etc/lmod-setup.sh"
+source "${SR_WX_APP_TOP_DIR}/etc/lmod-setup.sh" ${machine}
 module use "${SR_WX_APP_TOP_DIR}/modulefiles"
 module load "${BUILD_MOD_FN}" || print_err_msg_exit "\
 Loading of platform- and compiler-specific module file (BUILD_MOD_FN) 

diff --git a/ush/machine/gaea.sh b/ush/machine/gaea.sh
@@ -19,6 +19,8 @@ function file_location() {
   echo ${location:-}
 }
 
+export PROJ_LIB=/lustre/f2/dev/role.epic/contrib/miniconda3/4.12.0/envs/regional_workflow/share/proj
+export PATH=${PATH}:/lustre/f2/deve/role.epic/contrib/miniconda3/4.12.0/envs/regional_workflow/bin
 
 EXTRN_MDL_SYSBASEDIR_ICS=${EXTRN_MDL_SYSBASEDIR_ICS:-$(file_location \
   ${EXTRN_MDL_NAME_ICS} \
@@ -30,7 +32,7 @@ EXTRN_MDL_SYSBASEDIR_LBCS=${EXTRN_MDL_SYSBASEDIR_LBCS:-$(file_location \
 # System scripts to source to initialize various commands within workflow
 # scripts (e.g. "module").
 if [ -z ${ENV_INIT_SCRIPTS_FPS:-""} ]; then
-  ENV_INIT_SCRIPTS_FPS=( "/etc/profile" )
+  ENV_INIT_SCRIPTS_FPS=( "/etc/profile"  "/lustre/f2/dev/role.epic/contrib/Lmod_init.sh" )
 fi
 
 
@@ -66,5 +68,10 @@ RUN_CMD_FCST='srun --mpi=pmi2 -n ${PE_MEMBER01}'
 RUN_CMD_POST='srun --mpi=pmi2 -n $nprocs'
 
 # MET Installation Locations
-# MET Plus is not yet supported on gaea
+MET_INSTALL_DIR=${MET_INSTALL_DIR:-"/usw/met/10.1.2"}
+METPLUS_PATH=${METPLUS_PATH:-"/usw/met/METplus/METplus-4.1.3"}
+CCPA_OBS_DIR=${CCPA_OBS_DIR:-"${staged_data_dir}/obs_data/ccpa/proc"}
+MRMS_OBS_DIR=${MRMS_OBS_DIR:-"${staged_data_dir}/obs_data/mrms/proc"}
+NDAS_OBS_DIR=${NDAS_OBS_DIR:-"${staged_data_dir}/obs_data/ndas/proc"}
+MET_BIN_EXEC=${MET_BIN_EXEC:-"bin"}
 # Test Data Locations