Skip to content

Commit

Permalink
Update to invoke executables on Orion using 'srun'.
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeGayno-NOAA committed May 16, 2022
1 parent 334eefd commit 97bc3b0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion reg_tests/cpld_gridgen/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ elif [[ $target = orion ]]; then
ACCOUNT=${ACCOUNT:-nems}
QUEUE=${QUEUE:-batch}
# ulimit -s unlimited
SBATCH_COMMAND="srun -n 1 ./cpld_gridgen.sh"
SBATCH_COMMAND="./cpld_gridgen.sh"
elif [[ $target = jet ]]; then
STMP=${STMP:-/lfs4/HFIP/h-nems/$USER}
export MOM6_FIXDIR=/lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/fix_mom6
Expand Down
7 changes: 3 additions & 4 deletions ush/cpld_gridgen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ export MASKEDIT=.false.
export DO_POSTWGTS=.false.
export OUTDIR_PATH=${OUTDIR_PATH:-/scratch2/NCEPDEV/climate/Denise.Worthen/grids-20220116}
export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/fix_fv3_gmted2010}
APRUN=${APRUN:-"srun"}

if [ $RESNAME = 400 ]; then
echo "The 4 degree resolution is not implemented yet"
exit 1
#export FIXDIR_PATH=/scratch2/NCEPDEV/climate/Denise.Worthen/soca/test/Data/72x35x25/INPUT
else
export FIXDIR_PATH=${MOM6_FIXDIR}/${RESNAME}
#export FIXDIR_PATH=/scratch2/NCEPDEV/climate/climpara/S2S/FIX/fix_UFSp4/fix_mom6/${RESNAME}
fi

if [ $RESNAME = 400 ]; then
Expand Down Expand Up @@ -97,12 +96,12 @@ if [ ! -d ${OUTDIR_PATH} ]; then
fi

edit_namelist < grid.nml.IN > grid.nml
./cpld_gridgen
$APRUN ./cpld_gridgen

# generate ice mesh
export FSRC=${OUTDIR_PATH}/Ct.mx${RESNAME}_SCRIP_land.nc
export FDST=${OUTDIR_PATH}/mesh.mx${RESNAME}.nc
ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0
$APRUN ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0

# generate kmt file for CICE
export FSRC=${OUTDIR_PATH}/grid_cice_NEMS_mx${RESNAME}.nc
Expand Down

0 comments on commit 97bc3b0

Please sign in to comment.