Skip to content

Minor fix for EnKF #268

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
hu5970 merged 1 commit into from
Jan 31, 2022
Merged

Minor fix for EnKF #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_NONVARCLD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if [ ${CYCLE_TYPE} == "spinup" ]; then
else
analworkname="nonvar_cldanl"
fi
if [ ${RRFSENS_TYPE} == "MEAN" ]; then
if [ ${MEM_TYPE} == "MEAN" ]; then
workdir="${CYCLE_DIR}/ensmean/${analworkname}"
SLASH_ENSMEM_SUBDIR=""
else
Expand All @@ -83,7 +83,7 @@ mkdir_vrfy -p ${workdir}
$SCRIPTSDIR/exregional_nonvarcldanl.sh \
cycle_dir="${CYCLE_DIR}" \
cycle_type="${CYCLE_TYPE}" \
rrfsens_type="${RRFSENS_TYPE}" \
mem_type="${MEM_TYPE}" \
workdir="${workdir}" \
slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
print_err_msg_exit "\
Expand Down
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_REFL2TTEN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if [ ${CYCLE_TYPE} == "spinup" ]; then
else
analworkname="refl2tten"
fi
if [ ${RRFSENS_TYPE} == "MEAN" ]; then
if [ ${MEM_TYPE} == "MEAN" ]; then
workdir="${CYCLE_DIR}/ensmean/${analworkname}"
SLASH_ENSMEM_SUBDIR=""
else
Expand All @@ -83,7 +83,7 @@ mkdir_vrfy -p ${workdir}
$SCRIPTSDIR/exregional_refl2tten.sh \
cycle_dir="${CYCLE_DIR}" \
cycle_type="${CYCLE_TYPE}" \
rrfsens_type="${RRFSENS_TYPE}" \
mem_type="${MEM_TYPE}" \
workdir="${workdir}" || \
slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
print_err_msg_exit "\
Expand Down
4 changes: 2 additions & 2 deletions jobs/JREGIONAL_RUN_ANAL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ else
fi

if [ ${GSI_TYPE} == "OBSERVER" ]; then
if [ ${RRFSENS_TYPE} == "MEAN" ]; then
if [ ${MEM_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}" \
rrfsens_type="${RRFSENS_TYPE}" \
mem_type="${MEM_TYPE}" \
analworkdir="${analworkdir}" \
observer_nwges_dir="${observer_nwges_dir}" \
slash_ensmem_subdir="${SLASH_ENSMEM_SUBDIR}" || \
Expand Down
6 changes: 3 additions & 3 deletions scripts/exregional_nonvarcldanl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ with FV3 for the specified cycle.
#
#-----------------------------------------------------------------------
#
valid_args=( "cycle_dir" "cycle_type" "rrfsens_type" "workdir" "slash_ensmem_subdir" )
valid_args=( "cycle_dir" "cycle_type" "mem_type" "workdir" "slash_ensmem_subdir" )
process_args valid_args "$@"
#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -162,7 +162,7 @@ if [ ${cycle_type} == "spinup" ]; then
else
cycle_tag=""
fi
if [ ${rrfsens_type} == "MEAN" ]; then
if [ ${mem_type} == "MEAN" ]; then
bkpath=${cycle_dir}/ensmean/fcst_fv3lam${cycle_tag}/INPUT
else
bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam${cycle_tag}/INPUT
Expand Down Expand Up @@ -237,7 +237,7 @@ cat << EOF > gsiparm.anl
r_cleanSnow_WarmTs_threshold=5.0,
l_conserve_thetaV=.true.,
i_conserve_thetaV_iternum=3,
l_cld_bld=.false.,
l_cld_bld=.true.,
l_numconc=.true.,
cld_bld_hgt=1200.0,
build_cloud_frac_p=0.50,
Expand Down
4 changes: 2 additions & 2 deletions scripts/exregional_refl2tten.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ with FV3 for the specified cycle.
#
#-----------------------------------------------------------------------
#
valid_args=( "cycle_dir" "cycle_type" "rrfsens_type" "workdir" "slash_ensmem_subdir" )
valid_args=( "cycle_dir" "cycle_type" "mem_type" "workdir" "slash_ensmem_subdir" )
process_args valid_args "$@"
#
#-----------------------------------------------------------------------
Expand Down Expand Up @@ -165,7 +165,7 @@ if [ ${cycle_type} == "spinup" ]; then
else
cycle_tag=""
fi
if [ ${rrfsens_type} == "MEAN" ]; then
if [ ${mem_type} == "MEAN" ]; then
bkpath=${cycle_dir}/ensmean/fcst_fv3lam${cycle_tag}/INPUT
else
bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam${cycle_tag}/INPUT
Expand Down
16 changes: 8 additions & 8 deletions scripts/exregional_run_analysis.sh
View file
Open in desktop
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" "rrfsens_type" "analworkdir" "observer_nwges_dir" "slash_ensmem_subdir" )
valid_args=( "cycle_dir" "cycle_type" "gsi_type" "mem_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 [ ${rrfsens_type} == "MEAN" ]; then
if [ ${mem_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 [ ${rrfsens_type} == "MEAN" ]; then
if [ ${mem_type} == "MEAN" ]; then
bkpath=${cycle_dir}/ensmean/fcst_fv3lam/INPUT
else
bkpath=${cycle_dir}${slash_ensmem_subdir}/fcst_fv3lam/INPUT
Expand Down Expand Up @@ -206,7 +206,7 @@ print_info_msg "$VERBOSE" "background type is is $BKTYPE"
stampcycle=$(date -d "${START_DATE}" +%s)
minHourDiff=100
loops="009" # or 009s for GFSv15
ens_type="nc" # or nemsio for GFSv15
ftype="nc" # or nemsio for GFSv15
foundens="false"
cat "no ens found" >> filelist03

Expand All @@ -215,7 +215,7 @@ case $MACHINE in
"WCOSS_C" | "WCOSS" | "WCOSS_DELL_P3")

for loop in $loops; do
for timelist in $(ls ${ENKF_FCST}/enkfgdas.*/*/atmos/mem080/gdas*.atmf${loop}.${ens_type}); do
for timelist in $(ls ${ENKF_FCST}/enkfgdas.*/*/atmos/mem080/gdas*.atmf${loop}.${ftype}); do
availtimeyyyymmdd=$(echo ${timelist} | cut -d'/' -f9 | cut -c 10-17)
availtimehh=$(echo ${timelist} | cut -d'/' -f10)
availtime=${availtimeyyyymmdd}${availtimehh}
Expand Down Expand Up @@ -248,7 +248,7 @@ case $MACHINE in
"JET" | "HERA")

for loop in $loops; do
for timelist in $(ls ${ENKF_FCST}/*.gdas.t*z.atmf${loop}.mem080.${ens_type}); do
for timelist in $(ls ${ENKF_FCST}/*.gdas.t*z.atmf${loop}.mem080.${ftype}); do
availtimeyy=$(basename ${timelist} | cut -c 1-2)
availtimeyyyy=20${availtimeyy}
availtimejjj=$(basename ${timelist} | cut -c 3-5)
Expand All @@ -275,7 +275,7 @@ case $MACHINE in
done

if [ $foundens = "true" ]; then
ls ${ENKF_FCST}/${enkfcstname}.mem0??.${ens_type} >> filelist03
ls ${ENKF_FCST}/${enkfcstname}.mem0??.${ftype} >> filelist03
fi

esac
Expand Down Expand Up @@ -563,7 +563,7 @@ done
if [ ${gsi_type} == "OBSERVER" ]; then
miter=0
ifhyb=.false.
if [ ${rrfsens_type} == "MEAN" ]; then
if [ ${mem_type} == "MEAN" ]; then
lread_obs_save=.true.
lread_obs_skip=.false.
else
Expand Down
10 changes: 5 additions & 5 deletions ush/templates/FV3LAM_wflow.xml
View file
Open in desktop
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>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>MEM_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>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>MEM_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>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>MEM_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 @@ -1377,7 +1377,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>RRFSENS_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>
<envar><name>MEM_TYPE</name><value><cyclestr>MEAN</cyclestr></value></envar>

<dependency>
<and>
Expand Down Expand Up @@ -1425,7 +1425,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>RRFSENS_TYPE</name><value><cyclestr>MEMBER</cyclestr></value></envar>
<envar><name>MEM_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