diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh index b08cbac7c..ac721f2fe 100755 --- a/reg_tests/cpld_gridgen/rt.sh +++ b/reg_tests/cpld_gridgen/rt.sh @@ -108,7 +108,7 @@ TESTS_FILE="$PATHRT/rt.conf" export TEST_NAME= # for C3072 on hera, use WLCLK=60 and MEM="--exclusive" -WLCLK_dflt=10 +WLCLK_dflt=15 export WLCLK=$WLCLK_dflt MEM_dflt="--mem=12g" export MEM=$MEM_dflt diff --git a/ush/cpld_gridgen.sh b/ush/cpld_gridgen.sh index abed8df3e..427b69e71 100755 --- a/ush/cpld_gridgen.sh +++ b/ush/cpld_gridgen.sh @@ -21,7 +21,7 @@ function edit_namelist { export RESNAME=${RESNAME:-$1} export DEBUG=.false. export MASKEDIT=.false. -export DO_POSTWGTS=.false. +export DO_POSTWGTS=.true. export OUTDIR_PATH=${OUTDIR_PATH:-/scratch1/NCEPDEV/climate/Denise.Worthen/grids-20220116} export MOSAICDIR_PATH=${MOSAICDIR_PATH:-$PATHTR/fix/orog} if [[ $MOSAICRES == C3072 ]]; then @@ -64,10 +64,7 @@ if [ $RESNAME = 100 ]; then export EDITSFILE=topo_edits_011818.nc if [ $DO_POSTWGTS == .true. ]; then #pre-generate SCRIP files for dst rectilinear grids using NCO - ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap - export FSRC=${OUTDIR_PATH}/rect.1p0_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.1p0_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap fi fi @@ -78,14 +75,8 @@ if [ $RESNAME = 050 ]; then export EDITSFILE='none' if [ $DO_POSTWGTS == .true. ]; then #pre-generate SCRIP files for dst rectilinear grids using NCO - ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap - ncremap -g ${OUTDIR_PATH}/rect.0p5_SCRIP.nc -G latlon=361,720#lon_typ=grn_ctr#lat_typ=cap - export FSRC=${OUTDIR_PATH}/rect.1p0_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.1p0_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 - export FSRC=${OUTDIR_PATH}/rect.0p5_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.0p5_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.0p5_SCRIP.nc -G latlon=361,720#lon_typ=grn_ctr#lat_typ=cap fi fi @@ -96,18 +87,9 @@ if [ $RESNAME = 025 ]; then export EDITSFILE=All_edits.nc if [ $DO_POSTWGTS == .true. ]; then #pre-generate SCRIP files for dst rectilinear grids using NCO - ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap - ncremap -g ${OUTDIR_PATH}/rect.0p5_SCRIP.nc -G latlon=361,720#lon_typ=grn_ctr#lat_typ=cap - ncremap -g ${OUTDIR_PATH}/rect.0p25_SCRIP.nc -G latlon=721,1440#lon_typ=grn_ctr#lat_typ=cap - export FSRC=${OUTDIR_PATH}/rect.1p0_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.1p0_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 - export FSRC=${OUTDIR_PATH}/rect.0p5_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.0p5_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 - export FSRC=${OUTDIR_PATH}/rect.0p25_SCRIP.nc - export FDST=${OUTDIR_PATH}/rect.0p25_mesh.nc - $APRUN -n 1 ESMF_Scrip2Unstruct ${FSRC} ${FDST} 0 + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.1p0_SCRIP.nc -G latlon=181,360#lon_typ=grn_ctr#lat_typ=cap + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.0p5_SCRIP.nc -G latlon=361,720#lon_typ=grn_ctr#lat_typ=cap + $APRUN -n 1 ncremap -g ${OUTDIR_PATH}/rect.0p25_SCRIP.nc -G latlon=721,1440#lon_typ=grn_ctr#lat_typ=cap fi fi