Update static data locations for Gaea and noaacloud

ufs-community · Apr 22, 2022 · 87b210a · 87b210a
1 parent be7b13f
commit 87b210a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/ush/machine/gaea.sh b/ush/machine/gaea.sh
@@ -48,11 +48,12 @@ QUEUE_FCST=${QUEUE_DEFAULT:-"normal"}
 WTIME_MAKE_LBCS="00:60:00"
 
 # UFS SRW App specific paths
-FIXgsm=${FIXgsm:-"//lustre/f2/dev/Mark.Potts/EPIC/fix/fix_am"}
-FIXaer=${FIXaer:-"/lustre/f2/dev/Mark.Potts/EPIC/fix/fix_aer"}
-FIXlut=${FIXlut:-"/lustre/f2/dev/Mark.Potts/EPIC/fix/fix_lut"}
-TOPO_DIR=${TOPO_DIR:-"/lustre/f2/dev/Mark.Potts/EPIC/fix/fix_orog"}
-SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"/lustre/f2/dev/Mark.Potts/EPIC/fix/fix_sfc_climo"}
+staged_data_dir="/lustre/f2/dev/Mark.Potts/EPIC/UFS_SRW_App/develop"
+FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"}
+FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"}
+FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"}
+TOPO_DIR=${TOPO_DIR:-"${staged_data_dir}/fix/fix_orog"}
+SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"${staged_data_dir}/fix/fix_sfc_climo"}
 
 RUN_CMD_SERIAL="time"
 #Run Commands currently differ for GNU/openmpi
@@ -66,5 +67,5 @@ RUN_CMD_POST='srun --mpi=pmi2 -n $nprocs'
 # MET Installation Locations
 # MET Plus is not yet supported on gaea
 # Test Data Locations
-TEST_EXTRN_MDL_SOURCE_BASEDIR="/lustre/f2/dev/Mark.Potts/EPIC/SRW/model_data"
+TEST_EXTRN_MDL_SOURCE_BASEDIR="${staged_data_dir}/input_model_data"
 
diff --git a/ush/machine/noaacloud.sh b/ush/machine/noaacloud.sh
@@ -52,12 +52,13 @@ NCORES_PER_NODE=${NCORES_PER_NODE:-36}
 SCHED=${SCHED:-"slurm"}
 
 # UFS SRW App specific paths
-FIXgsm=${FIXgsm:-"/contrib/EPIC/fix/fix_am"}
-FIXaer=${FIXaer:-"/contrib/EPIC/fix/fix_aer"}
-FIXlut=${FIXlut:-"/contrib/EPIC/fix/fix_lut"}
-TOPO_DIR=${TOPO_DIR:-"/contrib/EPIC/fix/fix_orog"}
-SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"/contrib/EPIC/fix/fix_sfc_climo"}
-DOMAIN_PREGEN_BASEDIR=${DOMAIN_PREGEN_BASEDIR:-"/scratch2/BMC/det/FV3LAM_pregen"}
+staged_data_dir="/contrib/EPIC/UFS_SRW_App/develop"
+FIXgsm=${FIXgsm:-"${staged_data_dir}/fix/fix_am"}
+FIXaer=${FIXaer:-"${staged_data_dir}/fix/fix_aer"}
+FIXlut=${FIXlut:-"${staged_data_dir}/fix/fix_lut"}
+TOPO_DIR=${TOPO_DIR:-"${staged_data_dir}/fix/fix_orog"}
+SFC_CLIMO_INPUT_DIR=${SFC_CLIMO_INPUT_DIR:-"${staged_data_dir}/fix/fix_sfc_climo"}
+DOMAIN_PREGEN_BASEDIR=${DOMAIN_PREGEN_BASEDIR:-"${staged_data_dir}/FV3LAM_pregen"}
 
 RUN_CMD_SERIAL="time"
 #Run Commands currently differ for GNU/openmpi