diff --git a/parm/hafs_C512_regional_1mvnest_storm.conf b/parm/hafs_C512_regional_1mvnest_storm.conf
index 0cc0bde8c..39d7cd42e 100644
--- a/parm/hafs_C512_regional_1mvnest_storm.conf
+++ b/parm/hafs_C512_regional_1mvnest_storm.conf
@@ -1,21 +1,14 @@
-[config]
-
[dir]
PARMforecast={PARMhafs}/forecast/regional
[grid]
CASE=C512 ;; FV3 resolution
-LEVS=82 ;; Model vertical levels: 65
+LEVS=82 ;; Model vertical levels
gtype=regional ;; grid type: uniform, stretch, nest, or regional
-# If gridfixdir is provided and the dir exists, then use the pre-generated static grid fix files under gridfixdir
-#gridfixdir={FIXhafs}/fix_fv3/{CASE}_globnest_static
gridfixdir=/let/hafs_grid/generate/grid
-# Otherwise, will generate the model grid according to the following grid parameters
-# Need for grid types: stretch, nest and regional
-stretch_fac=1.0001 ;; Stretching factor for the grid
+stretch_fac=1.05 ;; Stretching factor for the grid
target_lon={domlon} ;; center longitude of the highest resolution tile
target_lat={domlat} ;; center latitude of the highest resolution tile
-# Need for grid types: nest and regional
nest_grids=2
parent_grid_num=1,2
parent_tile=6,7
@@ -43,25 +36,24 @@ iend_nest_mvnest1res=2976
jend_nest_mvnest1res=2976
[atm_init]
-# For the nested or regional standalone domain
-layoutx_init=20,20
-layouty_init=12,12
+layoutx_init=12,12
+layouty_init=20,20
[forecast]
dt_atmos=90
-# For the global domain if it is a global or global-nesting experiment
-glob_layoutx=4
-glob_layouty=5
-glob_npx=513
-glob_npy=513
-# For the nested or regional standalone domain
-layoutx=30,30
-layouty=30,30
npx=1441,961
npy=1441,961
npz=81
-k_split=2,3
-n_split=5,10
+k_split=2,5
+n_split=5,9
+layoutx=30,30
+layouty=20,20
+io_layoutx=3,3
+io_layouty=20,20
+full_zs_filter=.true.,.true.
+n_zs_filter=1,1
+n_del2_weak=15,24
+max_slope=0.25,0.25
# Moving nest related options
is_moving_nest=.false.,.true.
@@ -70,8 +62,6 @@ ntrack=0,2
move_cd_x=0,0
move_cd_y=0,0
-restart_interval="3 6 9" ;; restart interval in hours for the forecast
-
quilting=.true.
write_groups=2
write_tasks_per_group=60
@@ -81,10 +71,16 @@ output_history=.true.
output_grid=rotated_latlon
output_grid_cen_lon={domlon} ;; central longitude
output_grid_cen_lat={domlat} ;; central latitude
-output_grid_lon_span=84.0 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
-output_grid_lat_span=84.0 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
+output_grid_lon_span=81.0 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
+output_grid_lat_span=81.0 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
output_grid_dlon=0.06 ;; output grid spacing dlon . . . .
output_grid_dlat=0.06 ;; output grid spacing dlat . . . .
+[atm_post]
+satpost=.true.
+
+[atm_post_ens]
+satpost_ens=.true.
+
[rocotostr]
-FORECAST_RESOURCES=FORECAST_RESOURCES_C512_regional_1mvnest
+FORECAST_RESOURCES=FORECAST_RESOURCES_1320PE
diff --git a/parm/hafsv0p3_hycom.conf b/parm/hafsv0p3_hycom.conf
new file mode 100644
index 000000000..735f82c20
--- /dev/null
+++ b/parm/hafsv0p3_hycom.conf
@@ -0,0 +1,24 @@
+[config]
+run_wave=no
+ww3_model=ww3
+run_ocean=yes
+ocean_model=hycom
+
+[forecast]
+ccpp_suite_regional=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+ccpp_suite_nest=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+ccpp_suite_glob=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+# Choose nstf_name=0,0,0,0,0
+nstf_n1=0
+nstf_n2=0
+nstf_n3=0
+nstf_n4=0
+nstf_n5=0
+
+[forecast_ens]
+ccpp_suite_regional_ens=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+ccpp_suite_nest_ens=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+ccpp_suite_glob_ens=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+
+[rocotostr]
+FORECAST_RESOURCES=FORECAST_RESOURCES_1380PE
diff --git a/parm/hafsv0p3_regional_AL.conf b/parm/hafsv0p3_regional_AL.conf
new file mode 100644
index 000000000..07b0ad45f
--- /dev/null
+++ b/parm/hafsv0p3_regional_AL.conf
@@ -0,0 +1,74 @@
+[config]
+domlat=25.0
+domlon=-62.0
+vitalsdomlat=250N
+vitalsdomlon=620W
+fakestormid=00L
+fakestormname=NATL
+fakestormorg=NHC
+fakestorm_vitals={fakestormorg} {fakestormid} {fakestormname} {YMD} {HH}{min} {vitalsdomlat} {vitalsdomlon} -99 -99 -999 -999 -099 -9 -99 -999 -999 -999 -999 M
+
+[dir]
+PARMforecast={PARMhafs}/forecast/regional
+
+[grid]
+CASE=C3089 ;; FV3 resolution
+LEVS=82 ;; Model vertical levels
+gtype=regional ;; grid type: uniform, stretch, nest, or regional
+gridfixdir={HOMEhafs}/fix/fix_fv3/ESG_C3089_62W25N_3120x2160
+stretch_fac=1.0001 ;; Stretching factor for the grid
+target_lon={domlon} ;; center longitude of the highest resolution tile
+target_lat={domlat} ;; center latitude of the highest resolution tile
+nest_grids=1
+parent_grid_num=1
+parent_tile=6
+refine_ratio=4
+istart_nest=46
+jstart_nest=168
+iend_nest=1485
+jend_nest=1367
+
+[atm_init]
+layoutx_init=24
+layouty_init=20
+
+[forecast]
+dt_atmos=90
+npx=3121
+npy=2161
+npz=81
+k_split=3
+n_split=5
+layoutx=40
+layouty=30
+io_layoutx=3
+io_layouty=20
+full_zs_filter=.true.
+n_zs_filter=1
+n_del2_weak=15
+max_slope=0.25
+
+restart_interval="3 6 9"
+
+quilting=.true.
+write_groups=2
+write_tasks_per_group=60
+write_dopost=.false.
+output_history=.true.
+
+output_grid=regional_latlon
+output_grid_cen_lon=-62.0 ;; central longitude
+output_grid_cen_lat=25.8 ;; central latitude
+output_grid_lon_span=109.5 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
+output_grid_lat_span=63.6 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
+output_grid_dlon=0.03 ;; output grid spacing dlon . . . .
+output_grid_dlat=0.03 ;; output grid spacing dlat . . . .
+
+[atm_post]
+satpost=.true.
+
+[atm_post_ens]
+satpost_ens=.true.
+
+[rocotostr]
+FORECAST_RESOURCES=FORECAST_RESOURCES_1320PE
diff --git a/parm/hafs_C512_regional_1mvnest_storm_hycom.conf b/parm/hafsv0p3_regional_mvnest.conf
similarity index 53%
rename from parm/hafs_C512_regional_1mvnest_storm_hycom.conf
rename to parm/hafsv0p3_regional_mvnest.conf
index 9aae4499b..853d3288f 100644
--- a/parm/hafs_C512_regional_1mvnest_storm_hycom.conf
+++ b/parm/hafsv0p3_regional_mvnest.conf
@@ -1,33 +1,22 @@
-[config]
-run_wave=no
-ww3_model=ww3
-run_ocean=yes
-ocean_model=hycom
-
[dir]
PARMforecast={PARMhafs}/forecast/regional
[grid]
CASE=C512 ;; FV3 resolution
-LEVS=82 ;; Model vertical levels: 65
+LEVS=82 ;; Model vertical levels
gtype=regional ;; grid type: uniform, stretch, nest, or regional
-# If gridfixdir is provided and the dir exists, then use the pre-generated static grid fix files under gridfixdir
-#gridfixdir={FIXhafs}/fix_fv3/{CASE}_globnest_static
gridfixdir=/let/hafs_grid/generate/grid
-# Otherwise, will generate the model grid according to the following grid parameters
-# Need for grid types: stretch, nest and regional
-stretch_fac=1.0001 ;; Stretching factor for the grid
+stretch_fac=1.05 ;; Stretching factor for the grid
target_lon={domlon} ;; center longitude of the highest resolution tile
target_lat={domlat} ;; center latitude of the highest resolution tile
-# Need for grid types: nest and regional
nest_grids=2
parent_grid_num=1,2
parent_tile=6,7
refine_ratio=3,3
-istart_nest=33,1121
-jstart_nest=33,1121
-iend_nest=992,1760
-jend_nest=992,1760
+istart_nest=33,1201
+jstart_nest=33,1201
+iend_nest=992,1680
+jend_nest=992,1680
[grid_mvnest1res]
CASE_mvnest1res=C1536
@@ -46,38 +35,35 @@ jstart_nest_mvnest1res=97
iend_nest_mvnest1res=2976
jend_nest_mvnest1res=2976
-[forecast]
-ccpp_suite_regional=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
-ccpp_suite_nest=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
-# Choose nstf_name=0,0,0,0,0
-nstf_n1=0
-nstf_n2=0
-nstf_n3=0
-nstf_n4=0
-nstf_n5=0
+[atm_init]
+layoutx_init=12,12
+layouty_init=20,20
+[forecast]
dt_atmos=90
-# For the global domain if it is a global or global-nesting experiment
-glob_layoutx=4
-glob_layouty=5
-glob_npx=513
-glob_npy=513
-# For the nested or regional standalone domain
-layoutx=20,20
-layouty=20,20
-npx=1441,961
-npy=1441,961
+npx=1441,721
+npy=1441,721
npz=81
-k_split=2,3
-n_split=5,10
+k_split=2,5
+n_split=5,9
+layoutx=30,30
+layouty=20,20
+io_layoutx=3,3
+io_layouty=20,20
+full_zs_filter=.true.,.true.
+n_zs_filter=1,1
+n_del2_weak=15,24
+max_slope=0.25,0.25
# Moving nest related options
-is_moving_nest=.false.,.false.
+is_moving_nest=.false.,.true.
vortex_tracker=0,7
ntrack=0,2
move_cd_x=0,0
move_cd_y=0,0
+restart_interval="3 6 9"
+
quilting=.true.
write_groups=2
write_tasks_per_group=60
@@ -87,14 +73,16 @@ output_history=.true.
output_grid=rotated_latlon
output_grid_cen_lon={domlon} ;; central longitude
output_grid_cen_lat={domlat} ;; central latitude
-output_grid_lon_span=84.0 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
-output_grid_lat_span=84.0 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
+output_grid_lon_span=81.0 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
+output_grid_lat_span=81.0 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
output_grid_dlon=0.06 ;; output grid spacing dlon . . . .
output_grid_dlat=0.06 ;; output grid spacing dlat . . . .
-[forecast_ens]
-ccpp_suite_regional_ens=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
-ccpp_suite_nest_ens=FV3_HAFS_v0_gfdlmp_tedmf_nonsst
+[atm_post]
+satpost=.true.
+
+[atm_post_ens]
+satpost_ens=.true.
[rocotostr]
-FORECAST_RESOURCES=FORECAST_RESOURCES_C512_regional_1mvnest_atm_ocn_980PE
+FORECAST_RESOURCES=FORECAST_RESOURCES_1320PE
diff --git a/parm/hafsv0p3_regional_storm.conf b/parm/hafsv0p3_regional_storm.conf
new file mode 100644
index 000000000..950043047
--- /dev/null
+++ b/parm/hafsv0p3_regional_storm.conf
@@ -0,0 +1,64 @@
+[dir]
+PARMforecast={PARMhafs}/forecast/regional
+
+[grid]
+CASE=C512 ;; FV3 resolution
+LEVS=82 ;; Model vertical levels
+gtype=regional ;; grid type: uniform, stretch, nest, or regional
+gridfixdir=/let/hafs_grid/generate/grid
+stretch_fac=1.05 ;; Stretching factor for the grid
+target_lon={domlon} ;; center longitude of the highest resolution tile
+target_lat={domlat} ;; center latitude of the highest resolution tile
+nest_grids=1
+parent_grid_num=1
+parent_tile=6
+refine_ratio=6
+istart_nest=93
+jstart_nest=113
+iend_nest=932
+jend_nest=912
+
+[atm_init]
+layoutx_init=24
+layouty_init=20
+
+[forecast]
+dt_atmos=90
+npx=2521
+npy=2401
+npz=81
+k_split=4
+n_split=5
+layoutx=40
+layouty=30
+io_layoutx=3
+io_layouty=20
+full_zs_filter=.true.
+n_zs_filter=1
+n_del2_weak=15
+max_slope=0.25
+
+restart_interval="3 6 9"
+
+quilting=.true.
+write_groups=2
+write_tasks_per_group=60
+write_dopost=.false.
+output_history=.true.
+
+output_grid=rotated_latlon
+output_grid_cen_lon={domlon} ;; central longitude
+output_grid_cen_lat={domlat} ;; central latitude
+output_grid_lon_span=78.0 ;; output domain span for longitude in regular latlon coordinate system (in degrees)
+output_grid_lat_span=72.0 ;; output domain span for latitude in regular latlon coordinate system (in degrees)
+output_grid_dlon=0.03 ;; output grid spacing dlon . . . .
+output_grid_dlat=0.03 ;; output grid spacing dlat . . . .
+
+[atm_post]
+satpost=.true.
+
+[atm_post_ens]
+satpost_ens=.true.
+
+[rocotostr]
+FORECAST_RESOURCES=FORECAST_RESOURCES_1320PE
diff --git a/rocoto/cronjob_hafs_mvnest.sh b/rocoto/cronjob_hafs_mvnest.sh
index 3fc88a9d4..1cfdfb9f9 100755
--- a/rocoto/cronjob_hafs_mvnest.sh
+++ b/rocoto/cronjob_hafs_mvnest.sh
@@ -63,7 +63,8 @@ scrubopt="config.scrub_work=no config.scrub_com=no"
${PYTHON3} ./run_hafs.py -t ${dev} 2020082512 13L HISTORY \
config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_C512_regional_1mvnest_atm_ocn \
config.NHRS=12 ${scrubopt} \
- ../parm/hafs_C512_regional_1mvnest_storm_hycom.conf
+ ../parm/hafs_C512_regional_1mvnest_storm.conf \
+ ../parm/hafsv0p3_hycom.conf
#===============================================================================
diff --git a/rocoto/cronjob_hafs_mvnest_vida.sh b/rocoto/cronjob_hafs_mvnest_vida.sh
new file mode 100755
index 000000000..ee8fd3983
--- /dev/null
+++ b/rocoto/cronjob_hafs_mvnest_vida.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+set -x
+date
+
+# NOAA WCOSS Dell Phase3
+#HOMEhafs=/gpfs/dell2/emc/modeling/noscrub/${USER}/save/HAFS
+#dev="-s sites/wcoss_dell_p3.ent -f"
+#PYTHON3=/usrx/local/prod/packages/python/3.6.3/bin/python3
+
+# NOAA WCOSS Cray
+#HOMEhafs=/gpfs/hps3/emc/hwrf/noscrub/${USER}/save/HAFS
+#dev="-s sites/wcoss_cray.ent -f"
+#PYTHON3=/opt/intel/intelpython3/bin/python3
+
+# NOAA RDHPCS Jet
+#HOMEhafs=/mnt/lfs4/HFIP/hwrfv3/${USER}/HAFS
+#dev="-s sites/xjet.ent -f"
+#PYTHON3=/apps/intel/intelpython3/bin/python3
+
+# MSU Orion
+HOMEhafs=/work/noaa/hwrf/save/${USER}/HAFS
+dev="-s sites/orion.ent -f"
+PYTHON3=/apps/intel-2020/intel-2020/intelpython3/bin/python3
+
+# NOAA RDHPCS Hera
+# HOMEhafs=/scratch1/NCEPDEV/hwrf/save/${USER}/HAFS
+# dev="-s sites/hera.ent -f"
+# PYTHON3=/apps/intel/intelpython3/bin/python3
+
+cd ${HOMEhafs}/rocoto
+
+EXPT=$(basename ${HOMEhafs})
+scrubopt="config.scrub_work=no config.scrub_com=no"
+
+#===============================================================================
+ conf_mvnest_vida="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_mvnest_vida \
+ config.run_atm_init=yes config.run_atm_init_fgat=yes config.run_atm_init_ens=no \
+ config.run_atm_merge=no config.run_atm_merge_fgat=no config.run_atm_merge_ens=no \
+ config.run_atm_vi=yes config.run_atm_vi_fgat=yes config.run_atm_vi_ens=no \
+ config.run_gsi_vr=no config.run_gsi_vr_fgat=no config.run_gsi_vr_ens=no \
+ config.run_gsi=yes config.gsi_d01=no config.gsi_d02=yes config.run_fgat=yes config.run_envar=yes \
+ config.run_ensda=no config.ENS_SIZE=40 config.run_enkf=no \
+ config.run_analysis_merge=yes config.run_analysis_merge_ens=no \
+ atm_merge.atm_merge_method=vortexreplace analysis_merge.analysis_merge_method=vortexreplace \
+ config.NHRS=126 \
+ config.GRID_RATIO_ENS=2 \
+ gsi.use_bufr_nr=yes \
+ ../parm/hafsv0p3_regional_mvnest.conf \
+ ../parm/hafsv0p3_hycom.conf"
+
+ confopts="${conf_mvnest_vida}"
+ ${PYTHON3} ./run_hafs.py -t ${dev} 2020082506-2020082512 13L HISTORY ${confopts} \
+ config.NHRS=12 config.scrub_work=no config.scrub_com=no
+
+#===============================================================================
+
+date
+
+echo 'cronjob done'
diff --git a/rocoto/cronjob_hafs_vida.sh b/rocoto/cronjob_hafs_vida.sh
index 032400b89..6432fcf18 100755
--- a/rocoto/cronjob_hafs_vida.sh
+++ b/rocoto/cronjob_hafs_vida.sh
@@ -47,8 +47,8 @@ EXPT=$(basename ${HOMEhafs})
config.NHRS=126 \
config.GRID_RATIO_ENS=2 \
gsi.use_bufr_nr=yes \
- ../parm/hafs_C512_regional_3kmL81.conf \
- ../parm/hafs_hycom.conf"
+ ../parm/hafsv0p3_regional_storm.conf \
+ ../parm/hafsv0p3_hycom.conf"
# h3db_cycst: atm_init+atm_merge+fgat+3denvar+anal_merge and cycling storm region only
confh3db_cycst="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_h3db_cycst \
@@ -63,8 +63,8 @@ EXPT=$(basename ${HOMEhafs})
config.NHRS=126 \
config.GRID_RATIO_ENS=2 \
gsi.use_bufr_nr=yes \
- ../parm/hafs_C512_regional_3kmL81.conf \
- ../parm/hafs_hycom.conf"
+ ../parm/hafsv0p3_regional_storm.conf \
+ ../parm/hafsv0p3_hycom.conf"
# h3db_cycdm: atm_init+atm_merge+fgat+3denvar+anal_merge and cycling whole domain
confh3db_cycdm="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_h3db_cycdm \
@@ -79,11 +79,11 @@ EXPT=$(basename ${HOMEhafs})
config.NHRS=126 \
config.GRID_RATIO_ENS=2 \
gsi.use_bufr_nr=yes \
- ../parm/hafs_C512_regional_3kmL81.conf \
- ../parm/hafs_hycom.conf"
+ ../parm/hafsv0p3_regional_storm.conf \
+ ../parm/hafsv0p3_hycom.conf"
# h3db_vi: atm_init+atm_vi and cycling storm region only
- confh3db_vida="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_h3db_vida_test \
+ confh3db_vi="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_h3db_vi \
config.run_atm_init=yes config.run_atm_init_fgat=yes config.run_atm_init_ens=no \
config.run_atm_merge=no config.run_atm_merge_fgat=no config.run_atm_merge_ens=no \
config.run_atm_vi=yes config.run_atm_vi_fgat=yes config.run_atm_vi_ens=no \
@@ -96,8 +96,8 @@ EXPT=$(basename ${HOMEhafs})
config.NHRS=126 \
config.GRID_RATIO_ENS=2 \
gsi.use_bufr_nr=yes \
- ../parm/hafs_C512_regional_3kmL81.conf \
- ../parm/hafs_hycom.conf"
+ ../parm/hafsv0p3_regional_storm.conf \
+ ../parm/hafsv0p3_hycom.conf"
# h3da_init: warmstart from the coldstart atm_init (initialized from gfs analysis)
confh3da_init="config.EXPT=${EXPT} config.SUBEXPT=${EXPT}_h3da_init \
@@ -125,10 +125,11 @@ EXPT=$(basename ${HOMEhafs})
config.run_ensda=no config.ENS_SIZE=40 config.run_enkf=no \
config.run_analysis_merge=no config.run_analysis_merge_ens=no \
config.NHRS=126 \
+ forecast.restart_interval=240 \
config.GRID_RATIO_ENS=2 \
gsi.use_bufr_nr=yes \
- ../parm/hafs_C512_regional_3kmL81.conf \
- ../parm/hafs_hycom.conf"
+ ../parm/hafsv0p3_regional_storm.conf \
+ ../parm/hafsv0p3_hycom.conf"
# Choose the configuration to run
#confopts="${confh3db_vida}"
@@ -140,8 +141,7 @@ EXPT=$(basename ${HOMEhafs})
confopts="${confh3db_vida}"
${PYTHON3} ./run_hafs.py -t ${dev} 2020082506-2020082512 13L HISTORY ${confopts} \
- config.NHRS=12 \
- config.scrub_work=no config.scrub_com=no
+ config.NHRS=12 config.scrub_work=no config.scrub_com=no
# Storms to run: Laura13L2020, Ida09L2021, Sam18L2021
#${PYTHON3} ./run_hafs.py -t ${dev} 2020081918-2020082718 13L HISTORY ${confopts}
diff --git a/rocoto/sites/hera.ent b/rocoto/sites/hera.ent
index 75e4af853..fb0fc630a 100644
--- a/rocoto/sites/hera.ent
+++ b/rocoto/sites/hera.ent
@@ -25,10 +25,13 @@
6:ppn=20:tpp=1TOTAL_TASKS120NCTSK20OMP_THREADS100:30:00">
6:ppn=20:tpp=1TOTAL_TASKS120NCTSK20OMP_THREADS101:00:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS100:30:00">
+ 1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS100:30:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS100:30:00">
- 40:ppn=20:tpp=2TOTAL_TASKS800NCTSK20OMP_THREADS203:00:00">
+ 40:ppn=10:tpp=2TOTAL_TASKS400NCTSK10OMP_THREADS203:59:00">
41:ppn=1:tpp=40TOTAL_TASKS41NCTSK1OMP_THREADS4002:00:00">
1:ppn=20:tpp=1TOTAL_TASKS20NCTSK20OMP_THREADS102:00:00">
+ 1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS100:30:00">
+ 30:ppn=20:tpp=2TOTAL_TASKS600NCTSK20OMP_THREADS202:00:00">
07:59:00">
OMP_THREADS2">
@@ -60,8 +63,6 @@
6:ppn=12:tpp=2TOTAL_TASKS72NCTSK12&FORECAST_EXTRA;">
4:ppn=20:tpp=2TOTAL_TASKS80NCTSK20&FORECAST_EXTRA;">
- 64:ppn=20:tpp=2TOTAL_TASKS1280NCTSK20&FORECAST_EXTRA;">
-
43:ppn=12:tpp=2TOTAL_TASKS516NCTSK12&FORECAST_EXTRA;">
113:ppn=12:tpp=2TOTAL_TASKS1356NCTSK12&FORECAST_EXTRA;">
@@ -149,6 +150,8 @@
96:ppn=20:tpp=2TOTAL_TASKS1920NCTSK20&FORECAST_EXTRA;">
99:ppn=20:tpp=2TOTAL_TASKS1980NCTSK20&FORECAST_EXTRA;">
49:ppn=20:tpp=2TOTAL_TASKS980NCTSK20&FORECAST_EXTRA;">
+ 66:ppn=20:tpp=2TOTAL_TASKS1320NCTSK20&FORECAST_EXTRA;">
+ 69:ppn=20:tpp=2TOTAL_TASKS1380NCTSK20&FORECAST_EXTRA;">
9:ppn=20:tpp=2TOTAL_TASKS180NCTSK20&FORECAST_EXTRA;">
34:ppn=20:tpp=2TOTAL_TASKS680NCTSK20&FORECAST_EXTRA;">
@@ -233,11 +236,10 @@
67:ppn=20:tpp=2TOTAL_TASKS1340NCTSK20&FORECAST_EXTRA;">
70:ppn=20:tpp=2TOTAL_TASKS1400NCTSK20&FORECAST_EXTRA;">
- 1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
+ 3:ppn=40:tpp=1TOTAL_TASKS120NCTSK40OMP_THREADS107:59:00">
1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
- 1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:0024G">
- 8:ppn=40:tpp=1TOTAL_TASKS320NCTSK40OMP_THREADS101:59:00">
+ 1:ppn=2:tpp=1TOTAL_TASKS2NCTSK2OMP_THREADS107:59:0024G">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK1OMP_THREADS107:59:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
diff --git a/rocoto/sites/orion.ent b/rocoto/sites/orion.ent
index c935e07c9..6f67ae781 100644
--- a/rocoto/sites/orion.ent
+++ b/rocoto/sites/orion.ent
@@ -31,7 +31,7 @@
41:ppn=1:tpp=40TOTAL_TASKS41NCTSK1OMP_THREADS4002:00:00">
1:ppn=20:tpp=1TOTAL_TASKS20NCTSK20OMP_THREADS102:00:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS100:30:00">
- 16:ppn=20:tpp=2TOTAL_TASKS320NCTSK20OMP_THREADS201:00:00">
+ 30:ppn=20:tpp=2TOTAL_TASKS600NCTSK20OMP_THREADS202:00:00">
07:59:00">
OMP_THREADS2">
@@ -150,6 +150,8 @@
96:ppn=20:tpp=2TOTAL_TASKS1920NCTSK20&FORECAST_EXTRA;">
99:ppn=20:tpp=2TOTAL_TASKS1980NCTSK20&FORECAST_EXTRA;">
49:ppn=20:tpp=2TOTAL_TASKS980NCTSK20&FORECAST_EXTRA;">
+ 66:ppn=20:tpp=2TOTAL_TASKS1320NCTSK20&FORECAST_EXTRA;">
+ 69:ppn=20:tpp=2TOTAL_TASKS1380NCTSK20&FORECAST_EXTRA;">
9:ppn=20:tpp=2TOTAL_TASKS180NCTSK20&FORECAST_EXTRA;">
34:ppn=20:tpp=2TOTAL_TASKS680NCTSK20&FORECAST_EXTRA;">
@@ -234,11 +236,10 @@
67:ppn=20:tpp=2TOTAL_TASKS1340NCTSK20&FORECAST_EXTRA;">
70:ppn=20:tpp=2TOTAL_TASKS1400NCTSK20&FORECAST_EXTRA;">
- 1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
+ 3:ppn=40:tpp=1TOTAL_TASKS120NCTSK40OMP_THREADS107:59:00">
1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
- 1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:0024G">
- 6:ppn=40:tpp=1TOTAL_TASKS240NCTSK40OMP_THREADS101:59:00">
+ 1:ppn=2:tpp=1TOTAL_TASKS2NCTSK2OMP_THREADS107:59:0024G">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK1OMP_THREADS107:59:00">
1:ppn=40:tpp=1TOTAL_TASKS40NCTSK40OMP_THREADS107:59:00">
diff --git a/rocoto/sites/xjet.ent b/rocoto/sites/xjet.ent
index 27bbb89d8..f05ee83b2 100644
--- a/rocoto/sites/xjet.ent
+++ b/rocoto/sites/xjet.ent
@@ -25,12 +25,15 @@
5:ppn=24:tpp=1TOTAL_TASKS120NCTSK24OMP_THREADS100:30:00">
5:ppn=12:tpp=1TOTAL_TASKS60NCTSK12OMP_THREADS103:30:00">
1:ppn=24:tpp=1TOTAL_TASKS24NCTSK24OMP_THREADS100:30:00">
+ 1:ppn=24:tpp=1TOTAL_TASKS24NCTSK24OMP_THREADS100:30:00">
1:ppn=24:tpp=1TOTAL_TASKS24NCTSK24OMP_THREADS100:30:00">
50:ppn=12:tpp=2TOTAL_TASKS600NCTSK12OMP_THREADS202:00:00">
60:ppn=1:tpp=24TOTAL_TASKS60NCTSK1OMP_THREADS2402:00:00">
2:ppn=12:tpp=1TOTAL_TASKS24NCTSK12OMP_THREADS102:00:00">
+ 1:ppn=24:tpp=1TOTAL_TASKS24NCTSK24OMP_THREADS100:30:00">
+ 50:ppn=12:tpp=2TOTAL_TASKS600NCTSK12OMP_THREADS202:00:00">
- 06:00:00">
+ 07:59:00">
OMP_THREADS2">
@@ -87,8 +90,6 @@
6:ppn=12:tpp=2TOTAL_TASKS72NCTSK12&FORECAST_EXTRA;">
4:ppn=20:tpp=2TOTAL_TASKS80NCTSK20&FORECAST_EXTRA;">
- 64:ppn=20:tpp=2TOTAL_TASKS1280NCTSK20&FORECAST_EXTRA;">
-
43:ppn=12:tpp=2TOTAL_TASKS516NCTSK12&FORECAST_EXTRA;">
113:ppn=12:tpp=2TOTAL_TASKS1356NCTSK12&FORECAST_EXTRA;">
@@ -115,7 +116,6 @@
115:ppn=12:tpp=2TOTAL_TASKS1380NCTSK12&FORECAST_EXTRA;">
120:ppn=12:tpp=2TOTAL_TASKS1440NCTSK12&FORECAST_EXTRA;">
120:ppn=12:tpp=2TOTAL_TASKS1440NCTSK12&FORECAST_EXTRA;">
- 116:ppn=12:tpp=2+1:ppn=8:tpp=2TOTAL_TASKS1400NCTSK12&FORECAST_EXTRA;">
135:ppn=12:tpp=2TOTAL_TASKS1620NCTSK12&FORECAST_EXTRA;">
175:ppn=12:tpp=2TOTAL_TASKS2100NCTSK12&FORECAST_EXTRA;">
@@ -123,6 +123,7 @@
67:ppn=20:tpp=2TOTAL_TASKS1340NCTSK20&FORECAST_EXTRA;">
70:ppn=20:tpp=2TOTAL_TASKS1400NCTSK20&FORECAST_EXTRA;">
70:ppn=20:tpp=2TOTAL_TASKS1400NCTSK20&FORECAST_EXTRA;">
+ 68:ppn=20:tpp=2TOTAL_TASKS1360NCTSK20&FORECAST_EXTRA;">
79:ppn=20:tpp=2TOTAL_TASKS1580NCTSK20&FORECAST_EXTRA;">
103:ppn=20:tpp=2TOTAL_TASKS2060NCTSK20&FORECAST_EXTRA;">
@@ -162,6 +163,36 @@
91:ppn=20:tpp=2TOTAL_TASKS1820NCTSK20&FORECAST_EXTRA;">
91:ppn=20:tpp=2TOTAL_TASKS1820NCTSK20&FORECAST_EXTRA;">
+ 6:ppn=20:tpp=2TOTAL_TASKS120NCTSK20&FORECAST_EXTRA;">
+ 9:ppn=20:tpp=2TOTAL_TASKS180NCTSK20&FORECAST_EXTRA;">
+ 12:ppn=20:tpp=2TOTAL_TASKS240NCTSK20&FORECAST_EXTRA;">
+
+ 8:ppn=20:tpp=2TOTAL_TASKS160NCTSK20&FORECAST_EXTRA;">
+ 11:ppn=20:tpp=2TOTAL_TASKS220NCTSK20&FORECAST_EXTRA;">
+ 96:ppn=20:tpp=2TOTAL_TASKS1920NCTSK20&FORECAST_EXTRA;">
+ 99:ppn=20:tpp=2TOTAL_TASKS1980NCTSK20&FORECAST_EXTRA;">
+ 49:ppn=20:tpp=2TOTAL_TASKS980NCTSK20&FORECAST_EXTRA;">
+ 110:ppn=12:tpp=2TOTAL_TASKS1320NCTSK12&FORECAST_EXTRA;">
+ 115:ppn=12:tpp=2TOTAL_TASKS1380NCTSK12&FORECAST_EXTRA;">
+
+ 9:ppn=20:tpp=2TOTAL_TASKS180NCTSK20&FORECAST_EXTRA;">
+ 34:ppn=20:tpp=2TOTAL_TASKS680NCTSK20&FORECAST_EXTRA;">
+
+
+ 12:ppn=20:tpp=2TOTAL_TASKS240NCTSK20&FORECAST_EXTRA;">
+ 38:ppn=20:tpp=2TOTAL_TASKS760NCTSK20&FORECAST_EXTRA;">
+ 43:ppn=20:tpp=2TOTAL_TASKS860NCTSK20&FORECAST_EXTRA;">
+
+ 21:ppn=20:tpp=2TOTAL_TASKS420NCTSK20&FORECAST_EXTRA;">
+ 58:ppn=20:tpp=2TOTAL_TASKS1160NCTSK20&FORECAST_EXTRA;">
+
+
6:ppn=12:tpp=2TOTAL_TASKS72NCTSK12&FORECAST_EXTRA;">
11:ppn=12:tpp=2TOTAL_TASKS132NCTSK12&FORECAST_EXTRA;">
@@ -227,11 +258,10 @@
67:ppn=20:tpp=2TOTAL_TASKS1340NCTSK20&FORECAST_EXTRA;">
70:ppn=20:tpp=2TOTAL_TASKS1400NCTSK20&FORECAST_EXTRA;">
- 1:ppn=12:tpp=1TOTAL_TASKS12NCTSK12OMP_THREADS107:59:00">
+ 5:ppn=12:tpp=1TOTAL_TASKS60NCTSK12OMP_THREADS107:59:00">
1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:00">
1:ppn=24:tpp=1TOTAL_TASKS24NCTSK24OMP_THREADS107:59:00">
- 1:ppn=1:tpp=1TOTAL_TASKS1NCTSK1OMP_THREADS107:59:0024G">
- 10:ppn=24:tpp=1TOTAL_TASKS240NCTSK24OMP_THREADS101:59:00">
+ 1:ppn=2:tpp=1TOTAL_TASKS2NCTSK2OMP_THREADS107:59:0024G">
2:ppn=12:tpp=1TOTAL_TASKS24NCTSK12OMP_THREADS107:59:00">
2:ppn=12:tpp=1TOTAL_TASKS24NCTSK12OMP_THREADS107:59:00">
diff --git a/scripts/exhafs_merge.sh b/scripts/exhafs_merge.sh
index 3464f45e5..485976f4b 100755
--- a/scripts/exhafs_merge.sh
+++ b/scripts/exhafs_merge.sh
@@ -48,7 +48,7 @@ else
tcvital=${WORKhafs}/tmpvit
fi
if [ ${merge_method} = vortexreplace ]; then
- MERGE_CMD="${DATOOL} vortexreplace --tcvital=${tcvital} --infile_date=${PDY}.${cyc}0000 --vortexradius=800:900"
+ MERGE_CMD="${DATOOL} vortexreplace --tcvital=${tcvital} --infile_date=${PDY}.${cyc}0000 --vortexradius=650:700"
elif [ ${merge_method} = domainmerge ]; then
MERGE_CMD="${DATOOL} remap"
else
diff --git a/sorc/link_fix.sh b/sorc/link_fix.sh
index 08cee526c..ae0fe5ba4 100755
--- a/sorc/link_fix.sh
+++ b/sorc/link_fix.sh
@@ -24,7 +24,7 @@ else
exit 1
fi
-for subdir in fix_am fix_orog fix_fv3_gmted2010 fix_sfc_climo fix_hycom fix_ww3 hafs-crtm-2.3.0 fix_cdeps;
+for subdir in fix_am fix_orog fix_fv3_gmted2010 fix_sfc_climo fix_vi fix_hycom fix_ww3 hafs-crtm-2.3.0 fix_cdeps;
do
ln -sf ${FIXROOT}/${subdir} ./
done