Fix eobs diags being left on the floor and a number of EE2 related updates

dev/parm/config/gfs/config.resources

@@ -758,12 +758,19 @@ case ${step} in
     fi
     ;;
 
-  "analdiag")
+  "analdiag" | "ediag")
     walltime="00:15:00"
     ntasks=96             # Should be at least twice ediag's tasks
+    memory="48GB"
+    #if [[ "${step}" == "ediag" ]]; then
+    #  ntasks=48
+    #fi
     threads_per_task=1
+    if [[ ${ntasks} -gt ${max_tasks_per_node} ]]; then
+      ntasks=${max_tasks_per_node}
+      export is_exclusive=True
+    fi
     tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
-    memory="48GB"
     ;;
 
   "anlstat")
@@ -853,7 +860,7 @@ case ${step} in
     MEDTHREADS=${nthreads_mediator:-1}
     MEDPETS=${MEDPETS:-${FV3PETS}}
     (( MEDPETS = FV3PETS ))
-    (( MEDTHREADS = FV3THREADS )) 
+    (( MEDTHREADS = FV3THREADS ))
     (( "${MEDPETS}" > 4800 )) && MEDPETS=4800
     export MEDPETS MEDTHREADS
     echo "MEDIATOR using (threads, PETS) = (${MEDTHREADS}, ${MEDPETS})"
@@ -979,7 +986,7 @@ case ${step} in
     ;;
 
   "upp")
-    #ntasks cannot be greater than $CASE_HIST      
+    #ntasks cannot be greater than $CASE_HIST
     #define resources based on $CASE_HIST for upp
     case "${CASE_HIST}" in
       "C48" | "C96")
@@ -1255,14 +1262,6 @@ case ${step} in
     fi
     ;;
 
-  "ediag")
-    walltime="00:15:00"
-    ntasks=48
-    threads_per_task=1
-    tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
-    memory="30GB"
-    ;;
-
   "eupd")
     walltime="00:45:00"
     case "${CASE}" in

env/GAEAC6.env

@@ -199,7 +199,10 @@ case ${step} in
     ntasks_gausfcanl=${ntasks_gausfcanl:-1}
     export APRUN_GAUSFCANL="${launcher} -n ${ntasks_gausfcanl} --cpus-per-task=${NTHREADS_GAUSFCANL}"
  ;;
-  "offlineanl")
+ "analdiag" | "ediag")
+    export USE_CFP="YES"
+ ;;
+ "offlineanl")
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     if [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]]; then

env/HERA.env

@@ -203,6 +203,10 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     ntasks_gausfcanl=${ntasks_gausfcanl:-1}
     export APRUN_GAUSFCANL="${launcher} -n ${ntasks_gausfcanl} --cpus-per-task=${NTHREADS_GAUSFCANL}"
 
+elif [[ "${step}" = "analdiag" ]] || [[ "${step}" = "ediag" ]]; then
+
+    export USE_CFP="YES"
+
 elif [[ "${step}" = "offlineanl" ]]; then
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}

env/HERCULES.env

@@ -158,7 +158,7 @@ case ${step} in
  "anlstat")
 
     export NTHREADS_ANLSTAT=${NTHREADSmax}
-    export APRUN_ANLSTAT="${APRUN_default} --cpus-per-task=${NTHREADS_ANLSTAT}" 
+    export APRUN_ANLSTAT="${APRUN_default} --cpus-per-task=${NTHREADS_ANLSTAT}"
  ;;
  "ecen_fv3jedi")
 
@@ -218,6 +218,9 @@ case ${step} in
     # REGRID requires 6 tasks for reproducibility
     ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
+ ;;
+  "analdiag" | "ediag")
+    export USE_CFP="YES"
  ;;
   "offlineanl")
 

env/ORION.env

@@ -157,7 +157,7 @@ elif [[ "${step}" = "marineanlletkf" ]]; then
 elif [[ "${step}" = "anlstat" ]]; then
 
     export NTHREADS_ANLSTAT=${NTHREADSmax}
-    export APRUN_ANLSTAT="${APRUN_default} --cpus-per-task=${NTHREADS_ANLSTAT}" 
+    export APRUN_ANLSTAT="${APRUN_default} --cpus-per-task=${NTHREADS_ANLSTAT}"
 
 elif [[ "${step}" = "ecen_fv3jedi" ]]; then
 
@@ -216,6 +216,10 @@ elif [[ "${step}" = "sfcanl" ]]; then
     ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
+elif [[ "${step}" = "analdiag" ]] || [[ "${step}" = "ediag" ]]; then
+
+    export USE_CFP="YES"
+
 elif [[ "${step}" = "offlineanl" ]]; then
 
     export NTHREADS_CHGRES=${threads_per_task:-12}

env/URSA.env

@@ -192,6 +192,10 @@ elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
     ntasks_gausfcanl=${ntasks_gausfcanl:-1}
     export APRUN_GAUSFCANL="${launcher} -n ${ntasks_gausfcanl} --cpus-per-task=${NTHREADS_GAUSFCANL}"
 
+elif [[ "${step}" = "analdiag" ]] || [[ "${step}" = "ediag" ]]; then
+
+    export USE_CFP="YES"
+
 elif [[ "${step}" = "offlineanl" ]]; then
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}

env/WCOSS2.env

@@ -205,6 +205,10 @@ elif [[ "${step}" = "sfcanl" ]]; then
     ntasks_regrid=6
     export APRUN_REGRID="${launcher} -n ${ntasks_regrid} "
 
+elif [[ "${step}" = "analdiag" ]] || [[ "${step}" = "ediag" ]]; then
+
+    export USE_CFP="YES"
+
 elif [[ "${step}" = "offlineanl" ]]; then
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-14}

jobs/JGDAS_ATMOS_ANALYSIS_DIAG

@@ -1,27 +1,28 @@
 #! /usr/bin/env bash
 
-source "${HOMEgfs}/ush/jjob_header.sh" -e "anal" -c "base anal analdiag"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "analdiag" -c "base anal analdiag"
 
 ##############################################
 # Set variables used in the script
 ##############################################
-export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"}
+#export DO_CALC_ANALYSIS=${DO_CALC_ANALYSIS:-"YES"}
 
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
 # shellcheck disable=SC2153
-GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
-export gPDY=${GDATE:0:8}
-export gcyc=${GDATE:8:2}
-export GDUMP="gdas"
-export GDUMP_ENS="enkf${GDUMP}"
+#GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
+#export gPDY=${GDATE:0:8}
+#export gcyc=${GDATE:8:2}
+#export GDUMP="gdas"
+#export GDUMP_ENS="enkf${GDUMP}"
 
-export OPREFIX="${RUN/enkf/}.t${cyc}z."
-export GPREFIX="${GDUMP}.t${gcyc}z."
-export APREFIX="${RUN}.t${cyc}z."
+#export OPREFIX="${RUN/enkf/}.t${cyc}z."
+#export GPREFIX="${GDUMP}.t${gcyc}z."
+#export APREFIX="${RUN}.t${cyc}z."
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+    COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
     COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL
 mkdir -m 775 -p "${COMOUT_ATMOS_ANALYSIS}"
 

jobs/JGDAS_ENKF_DIAG

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-source "${HOMEgfs}/ush/jjob_header.sh" -e "eobs" -c "base anal eobs analdiag ediag"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "ediag" -c "base anal eobs analdiag ediag"
 
 ##############################################
 # Set variables used in the script
@@ -10,83 +10,76 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eobs" -c "base anal eobs analdiag edi
 # Begin JOB SPECIFIC work
 ##############################################
 # shellcheck disable=SC2153
-GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
-export gPDY=${GDATE:0:8}
-export gcyc=${GDATE:8:2}
-export GDUMP="gdas"
-export GDUMP_ENS="enkf${GDUMP}"
+#GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
+#export gPDY=${GDATE:0:8}
+#export gcyc=${GDATE:8:2}
+#export GDUMP="gdas"
+#export GDUMP_ENS="enkf${GDUMP}"
 
 export CASE=${CASE_ENS}
 
-export OPREFIX="${RUN/enkf/}.t${cyc}z."
+#export OPREFIX="${RUN/enkf/}.t${cyc}z."
 export APREFIX="${RUN}.t${cyc}z."
-export GPREFIX="${GDUMP_ENS}.t${gcyc}z."
-GPREFIX_DET="${GDUMP}.t${gcyc}z."
+#export GPREFIX="${GDUMP_ENS}.t${gcyc}z."
+#GPREFIX_DET="${GDUMP}.t${gcyc}z."
 
-RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
-    COMIN_OBS:COM_OBS_TMPL
+#RUN=${RUN/enkf/} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+#    COMIN_OBS:COM_OBS_TMPL
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
+    COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
     COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL
 
-RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COMIN_OBS_PREV:COM_OBS_TMPL \
-    COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL
+#RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+#    COMIN_OBS_PREV:COM_OBS_TMPL \
+#    COMIN_ATMOS_ANALYSIS_DET_PREV:COM_ATMOS_ANALYSIS_TMPL
 
-MEMDIR="ensstat" RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
-    COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
+#MEMDIR="ensstat" RUN=${GDUMP_ENS} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+#    COMIN_ATMOS_HISTORY_PREV:COM_ATMOS_HISTORY_TMPL
 
-export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}ensmean.atm.f006.nc"
-if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then
-    export err=1
-    err_exit "FILE MISSING: ATMGES_ENSMEAN == ${ATMGES_ENSMEAN}"
-fi
+#export ATMGES_ENSMEAN="${COMIN_ATMOS_HISTORY_PREV}/${GPREFIX}ensmean.atm.f006.nc"
+#if [[ ! -f "${ATMGES_ENSMEAN}" ]]; then
+#    export err=1
+#    err_exit "FILE MISSING: ATMGES_ENSMEAN == ${ATMGES_ENSMEAN}"
+#fi
 
 # Link observational data
-export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr"
-if [[ ! -f ${PREPQC} ]]; then
-    echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING"
-fi
-export TCVITL="${COMIN_OBS}/${OPREFIX}syndata.tcvitals.tm00"
-if [[ ${DONST} == "YES" ]]; then
-    export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
-fi
-export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
+#export PREPQC="${COMIN_OBS}/${OPREFIX}prepbufr"
+#if [[ ! -f ${PREPQC} ]]; then
+#    echo "WARNING: Global PREPBUFR FILE ${PREPQC} MISSING"
+#fi
+#export TCVITL="${COMIN_OBS}/${OPREFIX}syndata.tcvitals.tm00"
+#if [[ ${DONST} == "YES" ]]; then
+#    export NSSTBF="${COMIN_OBS}/${OPREFIX}nsstbufr"
+#fi
+#export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
 
 # Guess Bias correction coefficients related to control
-export GBIAS=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias.txt
-export GBIASPC=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias_pc.txt
-export GBIASAIR=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias_air.txt
-export GRADSTAT=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}radstat.tar
+#export GBIAS=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias.txt
+#export GBIASPC=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias_pc.txt
+#export GBIASAIR=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}abias_air.txt
+#export GRADSTAT=${COMIN_ATMOS_ANALYSIS_DET_PREV}/${GPREFIX_DET}radstat.tar
 
 # Bias correction coefficients related to ensemble mean
-export ABIAS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias.txt"
-export ABIASPC="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_pc.txt"
-export ABIASAIR="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air.txt"
-export ABIASe="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_int.txt"
+#export ABIAS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias.txt"
+#export ABIASPC="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_pc.txt"
+#export ABIASAIR="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air.txt"
+#export ABIASe="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_int.txt"
 
 # Diagnostics related to ensemble mean
-export GSISTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}gsistat.ensmean.tar"
-export CNVSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}cnvstat.ensmean.tar"
-export OZNSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}oznstat.ensmean.tar"
-export RADSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}radstat.ensmean.tar"
+export CNVSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}cnvstat_ensmean.tar"
+export OZNSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}oznstat_ensmean.tar"
+export RADSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}radstat_ensmean.tar"
 
 # Select observations based on ensemble mean
-export RUN_SELECT="YES"
-export USE_SELECT="NO"
-export SELECT_OBS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}obsinput.ensmean"
+#export RUN_SELECT="YES"
+#export USE_SELECT="NO"
+#export SELECT_OBS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}obsinput.ensmean"
 
 export DIAG_SUFFIX="_ensmean"
 export DIAG_COMPRESS="NO"
 
 # GSI namelist options specific to eobs
-export SETUP_INVOBS="passive_bc=.false.,${SETUP_INVOBS}"
-
-# Ensure clean stat tarballs for ensemble mean
-for fstat in ${CNVSTAT} ${OZNSTAT} ${RADSTAT}; do
-    if [[ -f "${fstat}" ]]; then
-        rm -f "${fstat}"
-    fi
-done
+#export SETUP_INVOBS="passive_bc=.false.,${SETUP_INVOBS}"
 
 ###############################################################
 # Run relevant script

jobs/JGDAS_ENKF_SELECT_OBS

@@ -84,15 +84,15 @@ export ABIASAIR="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_air.txt"
 export ABIASe="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}abias_int.txt"
 
 # Diagnostics related to ensemble mean
-export GSISTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}gsistat.ensmean.txt"
-export CNVSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}cnvstat.ensmean.tar"
-export OZNSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}oznstat.ensmean.tar"
-export RADSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}radstat.ensmean.tar"
+export GSISTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}gsistat_ensmean.txt"
+export CNVSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}cnvstat_ensmean.tar"
+export OZNSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}oznstat_ensmean.tar"
+export RADSTAT="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}radstat_ensmean.tar"
 
 # Select observations based on ensemble mean
 export RUN_SELECT="YES"
 export USE_SELECT="NO"
-export SELECT_OBS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}obsinput.ensmean"
+export SELECT_OBS="${COMOUT_ATMOS_ANALYSIS}/${APREFIX}obsinput_ensmean.tar"
 
 export DIAG_SUFFIX="_ensmean"
 

jobs/JGDAS_ENKF_UPDATE

@@ -9,23 +9,20 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "eupd" -c "base anal eupd"
 ##############################################
 # Begin JOB SPECIFIC work
 ##############################################
-# shellcheck disable=SC2153
-GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
-export gPDY=${GDATE:0:8}
-export gcyc=${GDATE:8:2}
-export GDUMP="gdas"
-export GDUMP_ENS="enkf${GDUMP}"
+# shellcheck disable=SC2155
+export GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours")
+export GDUMP="enkfgdas"  # EnKF ensemble always uses RUN=enkfgdas for prior members
 
 export APREFIX="${RUN}.t${cyc}z."
-export GPREFIX="${GDUMP_ENS}.t${gcyc}z."
+export GPREFIX="${GDUMP}.t${GDATE:8:2}z."
 
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMIN_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL
 
 MEMDIR="ensstat" YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_ATMOS_ANALYSIS_STAT:COM_ATMOS_ANALYSIS_TMPL
 
-MEMDIR="ensstat" RUN="enkfgdas" YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \
+MEMDIR="ensstat" RUN="enkfgdas" YMD=${GDATE:0:8} HH=${GDATE:8:2} declare_from_tmpl -rx \
     COMIN_ATMOS_HISTORY_STAT_PREV:COM_ATMOS_HISTORY_TMPL
 
 ###############################################################

jobs/JGLOBAL_ATMOS_ANALYSIS_CALC

@@ -28,6 +28,7 @@ RUN=${rCDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
 
 YMD=${PDY} HH=${cyc} declare_from_tmpl -rx \
     COMOUT_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
+    COMIN_ATMOS_ANALYSIS:COM_ATMOS_ANALYSIS_TMPL \
     COMIN_ATMOS_RESTART:COM_ATMOS_RESTART_TMPL
 
 RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx \

parm/archive/enkf.yaml.j2

@@ -69,10 +69,10 @@ enkf:
         # Ensemble mean state
         {% if not DO_JEDIATMENS %}
             {% set da_stat_files = ["enkfstat.txt",
-                                    "gsistat.ensmean.txt",
-                                    "cnvstat.ensmean.tar",
-                                    "oznstat.ensmean.tar",
-                                    "radstat.ensmean.tar"] %}
+                                    "gsistat_ensmean.txt",
+                                    "cnvstat_ensmean.tar",
+                                    "oznstat_ensmean.tar",
+                                    "radstat_ensmean.tar"] %}
             {% set da_conf_files = [] %}
         {% else %}
             {% if lobsdiag_forenkf %}
@@ -109,7 +109,7 @@ enkf:
         # soil DA increments
         {% if DO_GSISOILDA %}
             {% for fhr in IAUFHRS %}
-        - "{{ COMIN_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}increment.sfc.i{{ '%03d' % fhr }}.nc"
+        - "{{ COMIN_ATMOS_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}ensmean_increment.sfc.i{{ '%03d' % fhr }}.nc"
             {% endfor %}
         {% endif %}