Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion fix/gsi/gsiparm.anl.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
gsi_namelist="
&SETUP
miter=2,niter(1)=50,niter(2)=50,
miter=${miter},niter(1)=50,niter(2)=50,
write_diag(1)=.true.,write_diag(2)=${write_diag_2},write_diag(3)=.true.,
qoption=2,print_obs_para=.true.,diag_radardbz=${diag_radardbz},
gencode=78,factqmin=0.0,factqmax=0.0,
iguess=-1,
lread_obs_save=${lread_obs_save},lread_obs_skip=${lread_obs_skip},
oneobtest=.false.,retrieval=.false.,
nhr_assimilation=3,l_foto=.false.,
use_pbl=.false.,use_prepb_satwnd=$ifsatbufr,
Expand Down
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_RUN_ANAL
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ else
fi

if [ ${GSI_TYPE} == "OBSERVER" ]; then
if [ ${ENS_TYPE} == "MEAN" ]; then
if [ ${RRFSENS_TYPE} == "MEAN" ]; then
analworkdir="${CYCLE_DIR}/ensmean/observer${analworkname}"
SLASH_ENSMEM_SUBDIR=""
observer_nwges_dir="${NWGES_DIR}/ensmean/observer${analworkname}"
Expand All @@ -100,7 +100,7 @@ $SCRIPTSDIR/exregional_run_analysis.sh \
cycle_dir="${CYCLE_DIR}" \
cycle_type="${CYCLE_TYPE}" \
gsi_type="${GSI_TYPE}" \
ens_type="${ENS_TYPE}" \
rrfsens_type="${RRFSENS_TYPE}" \
analworkdir="${analworkdir}" \
observer_nwges_dir="${observer_nwges_dir}" \
slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
Expand Down
12 changes: 8 additions & 4 deletions scripts/exregional_run_analysis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ specified cycle.
#
#-----------------------------------------------------------------------
#
valid_args=( "cycle_dir" "cycle_type" "gsi_type" "ens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" )
valid_args=( "cycle_dir" "cycle_type" "gsi_type" "rrfsens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" )
process_args valid_args "$@"
#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -172,13 +172,13 @@ cd_vrfy ${analworkdir}

fixgriddir=$FIX_GSI/${PREDEF_GRID_NAME}
if [ ${cycle_type} == "spinup" ]; then
if [ ${ens_type} == "MEAN" ]; then
if [ ${rrfsens_type} == "MEAN" ]; then
bkpath=${cycle_dir}/ensmean/fcst_fv3lam_spinup/INPUT
else
bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam_spinup/INPUT
fi
else
if [ ${ens_type} == "MEAN" ]; then
if [ ${rrfsens_type} == "MEAN" ]; then
bkpath=${cycle_dir}/ensmean/fcst_fv3lam/INPUT
else
bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam/INPUT
Expand Down Expand Up @@ -290,6 +290,9 @@ esac
ifsatbufr=.false.
ifsoilnudge=.false.
ifhyb=.false.
miter=2
lread_obs_save=.false.
lread_obs_skip=.false.

# Determine if hybrid option is available
memname='atmf009'
Expand Down Expand Up @@ -545,7 +548,8 @@ done
#
if [ ${gsi_type} == "OBSERVER" ]; then
miter=0
if [ ${ens_type} == "MEAN" ]; then
ifhyb=.false.
if [ ${rrfsens_type} == "MEAN" ]; then
lread_obs_save=.true.
lread_obs_skip=.false.
else
Expand Down
1 change: 1 addition & 0 deletions ush/config.sh.RRFS_CONUS_3km
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ SST_update_hour=01
GVF_update_hour=04

NCORES_RUN_ANAL=240
NCORES_RUN_OBSERVER=80
HYBENSMEM_NMIN=66
HALO_BLEND=20

Expand Down
1 change: 1 addition & 0 deletions ush/config_defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1536,6 +1536,7 @@ NNODES_RUN_GRAPHICS="1"
# Number of cores.
#
NCORES_RUN_ANAL="4"
NCORES_RUN_OBSERVER="4"
NCORES_RUN_ENKF="4"
NATIVE_RUN_FCST="--cpus-per-task 2 --exclusive"
NATIVE_RUN_ANAL="--cpus-per-task 2 --exclusive"
Expand Down
1 change: 1 addition & 0 deletions ush/generate_FV3LAM_wflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ settings="\
'ncores_run_fcst': ${PE_MEMBER01}
'native_run_fcst': ${NATIVE_RUN_FCST}
'ncores_run_anal': ${NCORES_RUN_ANAL}
'ncores_run_observer': ${NCORES_RUN_OBSERVER}
'native_run_anal': ${NATIVE_RUN_ANAL}
'ncores_run_enkf': ${NCORES_RUN_ENKF}
'native_run_enkf': ${NATIVE_RUN_ENKF}
Expand Down
12 changes: 6 additions & 6 deletions ush/templates/FV3LAM_wflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ MODULES_RUN_TASK_FP script.
<envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
<envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
<envar><name>GSI_TYPE</name><value><cyclestr>ANALYSIS</cyclestr></value></envar>
<envar><name>ENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>

<dependency>
Expand Down Expand Up @@ -940,7 +940,7 @@ MODULES_RUN_TASK_FP script.
<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
<envar><name>CYCLE_DIR</name><value><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
<envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
<envar><name>ENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>

<dependency>
Expand Down Expand Up @@ -980,7 +980,7 @@ MODULES_RUN_TASK_FP script.
<envar><name>CDATE</name><value><cyclestr>@Y@m@d@H</cyclestr></value></envar>
<envar><name>CYCLE_DIR</name><value><cyclestr>&CYCLE_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
<envar><name>CYCLE_TYPE</name><value><cyclestr>#type#</cyclestr></value></envar>
<envar><name>ENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>

<dependency>
Expand Down Expand Up @@ -1364,7 +1364,7 @@ MODULES_RUN_TASK_FP script.
<envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
<envar><name>NWGES_DIR</name><value><cyclestr>&NWGES_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
<envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
<envar><name>ENS_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>
<envar><name>RRFSENS_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>

<dependency>
<and>
Expand Down Expand Up @@ -1395,7 +1395,7 @@ MODULES_RUN_TASK_FP script.

<command>&LOAD_MODULES_RUN_TASK_FP; "&RUN_ANAL_TN;" "&JOBSDIR;/JREGIONAL_RUN_ANAL"</command>
{% if machine in ["JET", "HERA"] -%}
<cores>{{ ncores_run_anal }}</cores>
<cores>{{ ncores_run_observer }}</cores>
<native>{{ native_run_anal }} &RRFS_RESERVE;</native>
{% else -%}
<nodes>{{ nnodes_run_anal }}:ppn={{ ppn_run_anal }}</nodes>
Expand All @@ -1412,7 +1412,7 @@ MODULES_RUN_TASK_FP script.
<envar><name>CYCLE_ROOT</name><value><cyclestr>&CYCLE_BASEDIR;</cyclestr></value></envar>
<envar><name>NWGES_DIR</name><value><cyclestr>&NWGES_BASEDIR;/@Y@m@d@H</cyclestr></value></envar>
<envar><name>GSI_TYPE</name><value><cyclestr>OBSERVER</cyclestr></value></envar>
<envar><name>ENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>SLASH_ENSMEM_SUBDIR</name><value><cyclestr>{{ slash_ensmem_subdir }}</cyclestr></value></envar>

<dependency>
Expand Down