From 11b408cf3fa3ae8858292dea06ad0a4ffa29805a Mon Sep 17 00:00:00 2001 From: Travis J Elless Date: Tue, 10 Jan 2023 12:22:49 -0600 Subject: [PATCH 1/3] changes to allow early cycle enkf to produce analysis files by default --- parm/config/config.base.emc.dyn | 3 +++ scripts/exgdas_enkf_ecen.sh | 11 +++++++---- scripts/exgdas_enkf_update.sh | 9 +++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 5519b6a3bb4..d76c2b3ba76 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -383,6 +383,9 @@ if [ $OUTPUT_FILE = "nemsio" ]; then export DO_CALC_ANALYSIS="NO" fi +# Write analysis files for early cycle EnKF +export DO_GFS_ENKF_CALC_INCREMENT="YES" + # Stratospheric increments to zero export INCVARS_ZERO_STRAT="'sphum_inc','liq_wat_inc','icmr_inc'" export INCVARS_EFOLD="5" diff --git a/scripts/exgdas_enkf_ecen.sh b/scripts/exgdas_enkf_ecen.sh index a5603eee6a1..1a23e3ce64f 100755 --- a/scripts/exgdas_enkf_ecen.sh +++ b/scripts/exgdas_enkf_ecen.sh @@ -24,6 +24,7 @@ pwd=$(pwd) # Base variables CDATE=${CDATE:-"2010010100"} +CDUMP=${CDUMP:-"gdas"} DONST=${DONST:-"NO"} export CASE=${CASE:-384} ntiles=${ntiles:-6} @@ -60,8 +61,11 @@ FHMIN=${FHMIN_ECEN:-3} FHMAX=${FHMAX_ECEN:-9} FHOUT=${FHOUT_ECEN:-3} FHSFC=${FHSFC_ECEN:-$FHMIN} -DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} - +if [ $CDUMP = "gfs" ]; then + DO_CALC_INCREMENT=${DO_GFS_ENKF_CALC_INCREMENT:-"NO"} +else + DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} +fi # global_chgres stuff CHGRESNEMS=${CHGRESNEMS:-$HOMEgfs/exec/enkf_chgres_recenter.x} @@ -328,8 +332,7 @@ if [ $DO_CALC_INCREMENT = "YES" ]; then . prep_step $NCP $CALCINCEXEC $DATA - - rm calc_increment.nml + [[ -f calc_increment.nml ]] && rm calc_increment.nml cat > calc_increment.nml << EOF &setup datapath = './' diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh index 6b32226bba6..9552beb32fc 100755 --- a/scripts/exgdas_enkf_update.sh +++ b/scripts/exgdas_enkf_update.sh @@ -42,6 +42,7 @@ ENKFEXEC=${ENKFEXEC:-$HOMEgfs/exec/enkf.x} # Cycling and forecast hour specific parameters CDATE=${CDATE:-"2001010100"} +CDUMP=${CDUMP:-"gdas"} # Filenames. GPREFIX=${GPREFIX:-""} @@ -84,7 +85,11 @@ cnvw_option=${cnvw_option:-".false."} netcdf_diag=${netcdf_diag:-".true."} modelspace_vloc=${modelspace_vloc:-".false."} # if true, 'vlocal_eig.dat' is needed IAUFHRS_ENKF=${IAUFHRS_ENKF:-6} -DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} +if [ $CDUMP = "gfs" ]; then + DO_CALC_INCREMENT=${DO_GFS_ENKF_CALC_INCREMENT:-"NO"} +else + DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} +fi INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"} ################################################################################ @@ -96,11 +101,11 @@ if [ $SUFFIX = ".nc" ]; then use_gfs_ncio=".true." use_gfs_nemsio=".false." paranc=${paranc:-".true."} + WRITE_INCR_ZERO="incvars_to_zero= $INCREMENTS_TO_ZERO," if [ $DO_CALC_INCREMENT = "YES" ]; then write_fv3_incr=".false." else write_fv3_incr=".true." - WRITE_INCR_ZERO="incvars_to_zero= $INCREMENTS_TO_ZERO," fi else LEVS_ENKF=${LEVS_ENKF:-$($NEMSIOGET $ATMGES_ENSMEAN dimz | awk '{print $2}')} From 17c16c1cd0ee3f8620b24895ea42bf2356394b0a Mon Sep 17 00:00:00 2001 From: Travis J Elless Date: Tue, 17 Jan 2023 14:14:32 -0600 Subject: [PATCH 2/3] Update early cycle DO_CALC variable name --- parm/config/config.base.emc.dyn | 2 +- scripts/exgdas_enkf_ecen.sh | 2 +- scripts/exgdas_enkf_update.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index d76c2b3ba76..33d1d2551f1 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -384,7 +384,7 @@ if [ $OUTPUT_FILE = "nemsio" ]; then fi # Write analysis files for early cycle EnKF -export DO_GFS_ENKF_CALC_INCREMENT="YES" +export DO_CALC_INCREMENT_ENKF_GFS="YES" # Stratospheric increments to zero export INCVARS_ZERO_STRAT="'sphum_inc','liq_wat_inc','icmr_inc'" diff --git a/scripts/exgdas_enkf_ecen.sh b/scripts/exgdas_enkf_ecen.sh index 1a23e3ce64f..32aed709c5e 100755 --- a/scripts/exgdas_enkf_ecen.sh +++ b/scripts/exgdas_enkf_ecen.sh @@ -62,7 +62,7 @@ FHMAX=${FHMAX_ECEN:-9} FHOUT=${FHOUT_ECEN:-3} FHSFC=${FHSFC_ECEN:-$FHMIN} if [ $CDUMP = "gfs" ]; then - DO_CALC_INCREMENT=${DO_GFS_ENKF_CALC_INCREMENT:-"NO"} + DO_CALC_INCREMENT=${DO_CALC_INCREMENT_ENKF_GFS:-"NO"} else DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} fi diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh index 9552beb32fc..53139841bc7 100755 --- a/scripts/exgdas_enkf_update.sh +++ b/scripts/exgdas_enkf_update.sh @@ -86,7 +86,7 @@ netcdf_diag=${netcdf_diag:-".true."} modelspace_vloc=${modelspace_vloc:-".false."} # if true, 'vlocal_eig.dat' is needed IAUFHRS_ENKF=${IAUFHRS_ENKF:-6} if [ $CDUMP = "gfs" ]; then - DO_CALC_INCREMENT=${DO_GFS_ENKF_CALC_INCREMENT:-"NO"} + DO_CALC_INCREMENT=${DO_CALC_INCREMENT_ENKF_GFS:-"NO"} else DO_CALC_INCREMENT=${DO_CALC_INCREMENT:-"NO"} fi From 1bb192d117c966969475e9b8e7f31106534915fd Mon Sep 17 00:00:00 2001 From: "travis.j.elless" Date: Wed, 25 Jan 2023 21:58:28 +0000 Subject: [PATCH 3/3] update_conflict_files_via_clone --- parm/config/config.base.emc.dyn | 1 - scripts/exgdas_enkf_update.sh | 1 - 2 files changed, 2 deletions(-) mode change 100644 => 100755 parm/config/config.base.emc.dyn mode change 100644 => 100755 scripts/exgdas_enkf_update.sh diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn old mode 100644 new mode 100755 index 9e15ff83a76..348f6c1f84e --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -367,7 +367,6 @@ export MAKE_ACFTBUFR="@MAKE_ACFTBUFR@" # Analysis increments to zero in CALCINCEXEC export INCREMENTS_TO_ZERO="'liq_wat_inc','icmr_inc'" - # Write analysis files for early cycle EnKF export DO_CALC_INCREMENT_ENKF_GFS="YES" diff --git a/scripts/exgdas_enkf_update.sh b/scripts/exgdas_enkf_update.sh old mode 100644 new mode 100755 index 02f215ba083..b22dcbfea86 --- a/scripts/exgdas_enkf_update.sh +++ b/scripts/exgdas_enkf_update.sh @@ -93,7 +93,6 @@ INCREMENTS_TO_ZERO=${INCREMENTS_TO_ZERO:-"'NONE'"} ################################################################################ ATMGES_ENSMEAN=$COMIN_GES_ENS/${GPREFIX}atmf006.ensmean${GSUFFIX} - LONB_ENKF=${LONB_ENKF:-$($NCLEN $ATMGES_ENSMEAN grid_xt)} # get LONB_ENKF LATB_ENKF=${LATB_ENKF:-$($NCLEN $ATMGES_ENSMEAN grid_yt)} # get LATB_ENFK LEVS_ENKF=${LEVS_ENKF:-$($NCLEN $ATMGES_ENSMEAN pfull)} # get LEVS_ENFK