Skip to content

Commit

Permalink
Move to contrib spack-stack on Jet (#978)
Browse files Browse the repository at this point in the history
Point to new install of spack-stack on Jet.

Adjust all script paths to use /lfs5 instead on /lfs4

Fixes #977.
  • Loading branch information
InnocentSouopgui-NOAA authored Sep 9, 2024
1 parent 5de880a commit 06eec5b
Show file tree
Hide file tree
Showing 16 changed files with 55 additions and 61 deletions.
4 changes: 2 additions & 2 deletions driver_scripts/driver_grid.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ fi
#-----------------------------------------------------------------------

export home_dir=$SLURM_SUBMIT_DIR/..
export TEMP_DIR=/lfs4/HFIP/emcda/$LOGNAME/stmp/fv3_grid.$gtype
export out_dir=/lfs4/HFIP/emcda/$LOGNAME/stmp/my_grids
export TEMP_DIR=/lfs5/HFIP/emcda/$LOGNAME/stmp/fv3_grid.$gtype
export out_dir=/lfs5/HFIP/emcda/$LOGNAME/stmp/my_grids
#-----------------------------------------------------------------------
# Should not need to change anything below here.
#-----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion fix/link_fixdirs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pwd=$(pwd -P)
if [ $machine = "hera" ]; then
FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix"
elif [ $machine = "jet" ]; then
FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix"
FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/git_lfs4/fv3gfs/fix"
elif [ $machine = "orion" -o $machine = "hercules" ]; then
FIX_DIR="/work/noaa/global/glopara/fix"
elif [ $machine = "wcoss2" ]; then
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/build.jet.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Load environment to compile UFS_UTILS on Jet using Intel
hpss_ver=os.getenv("hpss_ver") or ""
load(pathJoin("hpss", hpss_ver))

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
4 changes: 2 additions & 2 deletions reg_tests/chgres_cube/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module use ../../modulefiles
module load build.$target.intel
module list

export OUTDIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
export OUTDIR="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"

PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
Expand All @@ -54,7 +54,7 @@ fi

export HOMEufs=$PWD/../..

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/chgres_cube
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/chgres_cube

LOG_FILE=consistency.log
SUM_FILE=summary.log
Expand Down
36 changes: 15 additions & 21 deletions reg_tests/cpld_gridgen/RegressionTests_jet.intel.log
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Mon Apr 8 19:07:01 UTC 2024
Fri Sep 6 19:25:15 UTC 2024
Start Regression test

Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_2966831/025
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/025
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/CPLD_GRIDGEN/rt_1869989/025
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/025

Checking test 025 results ....
Comparing Bu.mx025_SCRIP.nc........OK
Expand All @@ -25,7 +25,6 @@ Comparing rect.0p50_SCRIP.nc........OK
Comparing rect.1p00_SCRIP.nc........OK
Comparing rect.5p00_SCRIP.nc........OK
Comparing tripole.mx025.Bu.to.Ct.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.Bu.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.rect.0p25.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.rect.0p25.conserve.nc........OK
Comparing tripole.mx025.Ct.to.rect.0p50.bilinear.nc........OK
Expand All @@ -39,8 +38,8 @@ Comparing tripole.mx025.Cv.to.Ct.bilinear.nc........OK
Comparing tripole.mx025.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_2966831/050
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/050
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/CPLD_GRIDGEN/rt_1869989/050
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/050

Checking test 050 results ....
Comparing Bu.mx050_SCRIP.nc........OK
Expand All @@ -50,7 +49,6 @@ Comparing C192.mx050.tile3.nc........OK
Comparing C192.mx050.tile4.nc........OK
Comparing C192.mx050.tile5.nc........OK
Comparing C192.mx050.tile6.nc........OK
Comparing Ct.mx025_SCRIP.nc........OK
Comparing Ct.mx050_SCRIP_land.nc........OK
Comparing Ct.mx050_SCRIP.nc........OK
Comparing Ct.mx050.to.C192.nc........OK
Expand All @@ -62,10 +60,10 @@ Comparing mesh.mx050.nc........OK
Comparing rect.0p50_SCRIP.nc........OK
Comparing rect.1p00_SCRIP.nc........OK
Comparing rect.5p00_SCRIP.nc........OK
Comparing tripole.mx025.Ct.to.mx050.Ct.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.mx050.Ct.neareststod.nc........OK
Comparing tripole.mx050.Bu.to.Ct.bilinear.nc........OK
Comparing tripole.mx050.Ct.to.Bu.bilinear.nc........OK
Comparing tripole.mx050.Ct.to.Cu.bilinear.nc........OK
Comparing tripole.mx050.Ct.to.Cv.bilinear.nc........OK
Comparing tripole.mx050.Ct.to.rect.0p50.bilinear.nc........OK
Comparing tripole.mx050.Ct.to.rect.0p50.conserve.nc........OK
Comparing tripole.mx050.Ct.to.rect.1p00.bilinear.nc........OK
Expand All @@ -77,8 +75,8 @@ Comparing tripole.mx050.Cv.to.Ct.bilinear.nc........OK
Comparing tripole.mx050.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_2966831/100
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/100
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/CPLD_GRIDGEN/rt_1869989/100
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/100

Checking test 100 results ....
Comparing Bu.mx100_SCRIP.nc........OK
Expand All @@ -88,7 +86,6 @@ Comparing C96.mx100.tile3.nc........OK
Comparing C96.mx100.tile4.nc........OK
Comparing C96.mx100.tile5.nc........OK
Comparing C96.mx100.tile6.nc........OK
Comparing Ct.mx025_SCRIP.nc........OK
Comparing Ct.mx100_SCRIP_land.nc........OK
Comparing Ct.mx100_SCRIP.nc........OK
Comparing Ct.mx100.to.C96.nc........OK
Expand All @@ -99,10 +96,10 @@ Comparing kmtu_cice_NEMS_mx100.nc........OK
Comparing mesh.mx100.nc........OK
Comparing rect.1p00_SCRIP.nc........OK
Comparing rect.5p00_SCRIP.nc........OK
Comparing tripole.mx025.Ct.to.mx100.Ct.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.mx100.Ct.neareststod.nc........OK
Comparing tripole.mx100.Bu.to.Ct.bilinear.nc........OK
Comparing tripole.mx100.Ct.to.Bu.bilinear.nc........OK
Comparing tripole.mx100.Ct.to.Cu.bilinear.nc........OK
Comparing tripole.mx100.Ct.to.Cv.bilinear.nc........OK
Comparing tripole.mx100.Ct.to.rect.1p00.bilinear.nc........OK
Comparing tripole.mx100.Ct.to.rect.1p00.conserve.nc........OK
Comparing tripole.mx100.Ct.to.rect.5p00.bilinear.nc........OK
Expand All @@ -113,8 +110,8 @@ Comparing tripole.mx100.nc........OK
Comparing ufs.topo_edits_011818.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_2966831/500
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/500
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/CPLD_GRIDGEN/rt_1869989/500
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/500

Checking test 500 results ....
Comparing Bu.mx500_SCRIP.nc........OK
Expand All @@ -124,7 +121,6 @@ Comparing C48.mx500.tile3.nc........OK
Comparing C48.mx500.tile4.nc........OK
Comparing C48.mx500.tile5.nc........OK
Comparing C48.mx500.tile6.nc........OK
Comparing Ct.mx025_SCRIP.nc........OK
Comparing Ct.mx500_SCRIP_land.nc........OK
Comparing Ct.mx500_SCRIP.nc........OK
Comparing Ct.mx500.to.C48.nc........OK
Expand All @@ -134,8 +130,6 @@ Comparing grid_cice_NEMS_mx500.nc........OK
Comparing kmtu_cice_NEMS_mx500.nc........OK
Comparing mesh.mx500.nc........OK
Comparing rect.5p00_SCRIP.nc........OK
Comparing tripole.mx025.Ct.to.mx500.Ct.bilinear.nc........OK
Comparing tripole.mx025.Ct.to.mx500.Ct.neareststod.nc........OK
Comparing tripole.mx500.Bu.to.Ct.bilinear.nc........OK
Comparing tripole.mx500.Ct.to.Bu.bilinear.nc........OK
Comparing tripole.mx500.Ct.to.rect.5p00.bilinear.nc........OK
Expand All @@ -146,5 +140,5 @@ Comparing tripole.mx500.nc........OK


REGRESSION TEST WAS SUCCESSFUL
Mon Apr 8 19:38:29 UTC 2024
Elapsed time: 00h:33m:11s. Have a nice day!
Fri Sep 6 19:53:17 UTC 2024
Elapsed time: 00h:29m:20s. Have a nice day!
6 changes: 3 additions & 3 deletions reg_tests/cpld_gridgen/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ elif [[ $target = hercules ]]; then
ulimit -s unlimited
SBATCH_COMMAND="./cpld_gridgen.sh"
elif [[ $target = jet ]]; then
STMP=${STMP:-/lfs4/HFIP/h-nems/$USER}
export MOM6_FIXDIR=/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/mom6/20220805
BASELINE_ROOT=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data
STMP=${STMP:-/lfs5/HFIP/h-nems/$USER}
export MOM6_FIXDIR=/lfs5/HFIP/hfv3gfs/glopara/git_lfs4/fv3gfs/fix/mom6/20220805
BASELINE_ROOT=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data
ACCOUNT=${ACCOUNT:-h-nems}
QUEUE=${QUEUE:-batch}
NCCMP=nccmp
Expand Down
4 changes: 2 additions & 2 deletions reg_tests/global_cycle/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module use ../../modulefiles
module load build.$target.intel
module list

export WORK_DIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
export WORK_DIR="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"

PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
QUEUE="${QUEUE:-batch}"
Expand All @@ -43,7 +43,7 @@ fi

export DATA_DIR="${WORK_DIR}/reg-tests/global-cycle"

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/global_cycle
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/global_cycle

export OMP_NUM_THREADS_CY=2

Expand Down
4 changes: 2 additions & 2 deletions reg_tests/grid_gen/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ set -x

QUEUE="${QUEUE:-batch}"
PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
export WORK_DIR="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
export WORK_DIR="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"

#-----------------------------------------------------------------------------
Expand All @@ -50,7 +50,7 @@ export home_dir=$PWD/../..
export APRUN=time
export APRUN_SFC=srun
export OMP_STACKSIZE=2048m
export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/grid_gen/baseline_data
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/grid_gen/baseline_data

ulimit -a
ulimit -s unlimited
Expand Down
10 changes: 5 additions & 5 deletions reg_tests/ice_blend/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ set +x
module list
set -x

export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
export DATA="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
export DATA="${DATA}/reg-tests/ice-blend"

#-----------------------------------------------------------------------------
Expand All @@ -51,11 +51,11 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
fi

export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib
export COPYGB=/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-hrqavdi/bin/copygb
export COPYGB2=/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-hrqavdi/bin/copygb2
export CNVGRIB=/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-hrqavdi/bin/cnvgrib
export COPYGB=/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-74mdurc/bin/copygb
export COPYGB2=/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-74mdurc/bin/copygb2
export CNVGRIB=/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/intel/2021.5.0/grib-util-1.3.0-74mdurc/bin/cnvgrib

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ice_blend
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ice_blend

export HOMEgfs=$PWD/../..

Expand Down
22 changes: 11 additions & 11 deletions reg_tests/ocnice_prep/RegressionTests_jet.intel.log
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
Wed Jun 12 20:45:36 UTC 2024
Fri Sep 6 17:46:10 UTC 2024
Start Regression test

Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/OCNICE_PREP/rt_130374/050_ocean
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/050_ocean
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/OCNICE_PREP/rt_353922/050_ocean
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/050_ocean

Checking test 050_ocean results ....
Comparing ocean.mx050.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/OCNICE_PREP/rt_130374/050_ice
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/050_ice
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/OCNICE_PREP/rt_353922/050_ice
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/050_ice

Checking test 050_ice results ....
Comparing ice.mx050.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/OCNICE_PREP/rt_130374/100_ocean
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/100_ocean
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/OCNICE_PREP/rt_353922/100_ocean
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/100_ocean

Checking test 100_ocean results ....
Comparing ocean.mx100.nc........OK


Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/OCNICE_PREP/rt_130374/100_ice
Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/100_ice
Working dir = /lfs5/NESDIS/nesdis-rdo2/Innocent.Souopgui/stmp/OCNICE_PREP/rt_353922/100_ice
Baseline dir = /lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data/100_ice

Checking test 100_ice results ....
Comparing ice.mx100.nc........OK


REGRESSION TEST WAS SUCCESSFUL
Wed Jun 12 20:55:36 UTC 2024
Elapsed time: 00h:11m:40s. Have a nice day!
Fri Sep 6 17:56:44 UTC 2024
Elapsed time: 00h:11m:52s. Have a nice day!
8 changes: 4 additions & 4 deletions reg_tests/ocnice_prep/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ elif [[ $target = hercules ]]; then
ulimit -s unlimited
SBATCH_COMMAND="./ocnice_prep.sh"
elif [[ $target = jet ]]; then
STMP=${STMP:-/lfs4/HFIP/h-nems/$USER}
BASELINE_ROOT=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data
WEIGHTS_ROOT=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data
INPUT_ROOT=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/input_data
STMP=${STMP:-/lfs5/HFIP/h-nems/$USER}
BASELINE_ROOT=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/baseline_data
WEIGHTS_ROOT=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data
INPUT_ROOT=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/ocnice_prep/input_data
ACCOUNT=${ACCOUNT:-h-nems}
QUEUE=${QUEUE:-batch}
NCCMP=nccmp
Expand Down
4 changes: 2 additions & 2 deletions reg_tests/snow2mdl/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ set +x
module list
set -x

DATA_ROOT="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
DATA_ROOT="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
DATA_ROOT="${DATA_ROOT}/reg-tests/snow2mdl"

PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
Expand All @@ -46,7 +46,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/snow2mdl
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/snow2mdl
export HOMEgfs=$PWD/../..
export WGRIB=/apps/wgrib/1.8.1.0b/bin/wgrib

Expand Down
4 changes: 2 additions & 2 deletions reg_tests/weight_gen/driver.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module use ../../modulefiles
module load build.$target.$compiler
module list

export DATA="${WORK_DIR:-/lfs4/HFIP/emcda/$LOGNAME/stmp}"
export DATA="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
export DATA="${DATA}/reg-tests/weight_gen"

#-----------------------------------------------------------------------------
Expand All @@ -49,7 +49,7 @@ if [ "$UPDATE_BASELINE" = "TRUE" ]; then
source ../get_hash.sh
fi

export HOMEreg=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/weight_gen
export HOMEreg=/lfs5/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/weight_gen
export HOMEufs=$PWD/../..

./weight_gen.sh
Expand Down
2 changes: 1 addition & 1 deletion sorc/machine-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fi
target=""
USERNAME=`echo $LOGNAME | awk '{ print tolower($0)'}`

if [[ -d /lfs4 ]] ; then
if [[ -d /lfs5 ]] ; then
# We are on NOAA Jet
if ( ! eval module help > /dev/null 2>&1 ) ; then
echo load the module command 1>&2
Expand Down
2 changes: 1 addition & 1 deletion util/gdas_init/set_fixed_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if [ "$machine" = 'hera' ] ; then
elif [ "$machine" = 'wcoss2' ] ; then
FIX_ORO_INPUT=/lfs/h2/emc/global/noscrub/emc.global/FIX/fix/orog/20230615
elif [ "$machine" = 'jet' ] ; then
FIX_ORO_INPUT=/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/orog/20230615
FIX_ORO_INPUT=/lfs5/HFIP/hfv3gfs/glopara/git_lfs4/fv3gfs/fix/orog/20230615
elif [ "$machine" = 's4' ] ; then
FIX_ORO_INPUT=/data/prod/glopara/fix/orog/20230615
else
Expand Down
2 changes: 1 addition & 1 deletion util/weight_gen/run.jet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module list

export CRES="C48"

export WORK_DIR=/lfs4/HFIP/emcda/$USER/stmp/weight_gen
export WORK_DIR=/lfs5/HFIP/emcda/$USER/stmp/weight_gen

${UFS_DIR}/util/weight_gen/weight_gen.sh

Expand Down

0 comments on commit 06eec5b

Please sign in to comment.