Skip to content

Update Jet support #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RussTreadon-NOAA merged 2 commits into from
Mar 9, 2023
Merged

Update Jet support #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfc61f1
Update Jet support. #529
DavidHuber-NOAA Feb 23, 2023
ea14f88
Merge remote-tracking branch 'origin/develop' into update_jet_dev
DavidHuber-NOAA Feb 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions modulefiles/gsi_jet.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
help([[
]])

load("cmake/3.20.1")
prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-18.0.5.274/modulefiles/stack")

prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")
local hpc_ver=os.getenv("hpc_ver") or "1.2.0"
local hpc_intel_ver=os.getenv("hpc_intel_ver") or "18.0.5.274"
local hpc_impi_ver=os.getenv("hpc_impi_ver") or "2018.4.274"
local cmake_ver=os.getenv("cmake_ver") or "3.20.1"
local anaconda_ver=os.getenv("anaconda_ver") or "5.3.1"
local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"

load("anaconda/5.3.1")
load(pathJoin("hpc", hpc_ver))
load(pathJoin("hpc-intel", hpc_intel_ver))
load(pathJoin("hpc-impi", hpc_impi_ver))
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack")
prepend_path("MODULEPATH", "/contrib/anaconda/modulefiles")

load("hpc/1.1.0")
load("hpc-intel/18.0.5.274")
load("hpc-impi/2018.4.274")
load(pathJoin("anaconda", anaconda_ver))

load("gsi_common")

local prod_util_ver=os.getenv("prod_util_ver") or "1.2.2"
load(pathJoin("prod_util", prod_util_ver))

pushenv("CFLAGS", "-axSSE4.2,AVX,CORE-AVX2")
pushenv("FFLAGS", "-axSSE4.2,AVX,CORE-AVX2")

pushenv("GSI_BINARY_SOURCE_DIR", "/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20221128")

pushenv("GSI_BINARY_SOURCE_DIR", "/mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix/gsi/20221128")
Comment thread
DavidHuber-NOAA marked this conversation as resolved.

whatis("Description: GSI environment on Jet with Intel Compilers")
2 changes: 1 addition & 1 deletion regression/global_3dvar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ for type in $listdiag; do
date=`echo $diag_file | cut -d'.' -f2`
$UNCOMPRESS $diag_file
fnameanl=$(echo $fname|sed 's/_ges//g')
mv $fname.$date $fnameanl
mv ${fname}.${date} $fnameanl
done

# Run GSI
Expand Down
16 changes: 8 additions & 8 deletions regression/regression_param.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ case $regtest in
topts[1]="0:15:00" ; popts[1]="12/5/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="12/9/" ; ropts[2]="/2"
elif [[ "$machine" = "Jet" ]]; then
topts[1]="0:50:00" ; popts[1]="12/3/" ; ropts[1]="/1"
topts[2]="0:50:00" ; popts[2]="12/9/" ; ropts[2]="/2"
topts[1]="0:15:00" ; popts[1]="12/5/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="12/9/" ; ropts[2]="/2"
elif [[ "$machine" = "Cheyenne" ]]; then
topts[1]="0:30:00" ; popts[1]="16/2/" ; ropts[1]="/1"
topts[2]="0:30:00" ; popts[2]="16/4/" ; ropts[2]="/2"
Expand Down Expand Up @@ -123,8 +123,8 @@ case $regtest in
topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/12/" ; ropts[2]="/2"
elif [[ "$machine" = "Jet" ]]; then
topts[1]="0:35:00" ; popts[1]="6/8/" ; ropts[1]="/1"
topts[2]="0:35:00" ; popts[2]="6/10/" ; ropts[2]="/2"
topts[1]="0:10:00" ; popts[1]="12/8/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/10/" ; ropts[2]="/2"
elif [[ "$machine" = "Discover" ]]; then
topts[1]="0:30:00" ; popts[1]="48/2" ; ropts[1]="/1"
topts[2]="0:30:00" ; popts[2]="60/3" ; ropts[2]="/2"
Expand Down Expand Up @@ -153,8 +153,8 @@ case $regtest in
topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/1"
elif [[ "$machine" = "Jet" ]]; then
topts[1]="0:15:00" ; popts[1]="4/4/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="6/6/" ; ropts[2]="/1"
topts[1]="0:15:00" ; popts[1]="20/1/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="20/2/" ; ropts[2]="/1"
elif [[ "$machine" = "wcoss2" ]]; then
topts[1]="0:15:00" ; popts[1]="64/1/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="128/2/" ; ropts[2]="/1"
Expand Down Expand Up @@ -255,8 +255,8 @@ case $regtest in
topts[1]="0:10:00" ; popts[1]="12/3/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/5/" ; ropts[2]="/2"
elif [[ "$machine" = "Jet" ]]; then
topts[1]="0:15:00" ; popts[1]="12/3/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="12/5/" ; ropts[2]="/2"
topts[1]="0:10:00" ; popts[1]="12/3/" ; ropts[1]="/1"
topts[2]="0:10:00" ; popts[2]="12/5/" ; ropts[2]="/2"
elif [[ "$machine" = "Cheyenne" ]]; then
topts[1]="0:15:00" ; popts[1]="16/2/" ; ropts[1]="/1"
topts[2]="0:15:00" ; popts[2]="16/4/" ; ropts[2]="/2"
Expand Down
9 changes: 3 additions & 6 deletions regression/regression_var.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if [[ -d /glade ]]; then # Cheyenne
export machine="Cheyenne"
elif [[ -d /scratch1 ]]; then # Hera
export machine="Hera"
elif [[ -d /jetmon ]]; then # Jet
elif [[ -d /mnt/lfs4 || -d /jetmon || -d /mnt/lfs1 ]]; then # Jet
export machine="Jet"
elif [[ -d /discover ]]; then # NCCS Discover
export machine="Discover"
Expand Down Expand Up @@ -138,19 +138,16 @@ case $machine in

export noscrub=/lfs1/NESDIS/nesdis-rdo2/$LOGNAME/noscrub
export ptmp=/lfs1/NESDIS/nesdis-rdo2/$LOGNAME/ptmp
export fixcrtm="/lfs1/NESDIS/nesdis-rdo2/David.Huber/save/CRTM_REL-2.2.3/crtm_v2.2.3/fix_update"
export casesdir="/lfs1/NESDIS/nesdis-rdo2/David.Huber/save/CASES"
export casesdir="/lfs1/NESDIS/nesdis-rdo2/David.Huber/save/CASES/regtest"
export check_resource="no"
export accnt="nesdis-rdo2"

export group="global"
export queue="batch"
if [[ "$cmaketest" = "false" ]]; then
export basedir="/lfs1/NESDIS/nesdis-rdo2/$LOGNAME/gsi"
export basedir="/lfs1/NESDIS/nesdis-rdo2/$LOGNAME/save/git/gsi"
fi

export ptmp="/lfs1/NESDIS/nesdis-rdo2/$LOGNAME/ptmp/$ptmpName"

# On Jet, there are no scrubbers to remove old contents from stmp* directories.
# After completion of regression tests, will remove the regression test subdirecories
export clean=".true."
Expand Down
3 changes: 2 additions & 1 deletion ush/sub_jet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ output=${output:-$jobname.out}
myuser=$LOGNAME
myhost=$(hostname)

DATA=$regdir/regtests/data
DATA=${DATA:-$ptmp/tmp}

mkdir -p $DATA

Expand Down Expand Up @@ -117,6 +117,7 @@ echo "#SBATCH --time=$timew"
echo "#SBATCH --nodes=$nodes --ntasks-per-node=$procs --cpus-per-task=$threads" >> $cfile
#echo "#SBATCH -j oe" >> $cfile
echo "#SBATCH --account=$accnt" >> $cfile
echo "#SBATCH --mem=0" >> $cfile
echo "#SBATCH --partition=kjet" >> $cfile
#echo "#SBATCH -V" >> $cfile
#echo "#PBS -d" >> $cfile
Expand Down