Skip to content

Commit

Permalink
Update aero analysis for new bump files and archive aero diags (NOAA-…
Browse files Browse the repository at this point in the history
…EMC#1886)

This PR updates the global workflow so that it can handle the latest version of the JEDI
aero staticb, and also archives the aerosol diagnostic files.
  • Loading branch information
andytangborn authored Sep 26, 2023
1 parent 3d2b72e commit bb1e561
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_ARCHIVE
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export CDUMP=${RUN/enkf}
YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMOS_GEMPAK \
COM_ATMOS_GENESIS COM_ATMOS_HISTORY COM_ATMOS_INPUT COM_ATMOS_MASTER COM_ATMOS_RESTART \
COM_ATMOS_TRACK COM_ATMOS_WMO \
COM_CHEM_HISTORY \
COM_CHEM_HISTORY COM_CHEM_ANALYSIS\
COM_MED_RESTART \
COM_ICE_HISTORY COM_ICE_INPUT COM_ICE_RESTART \
COM_OBS COM_TOP \
Expand Down
1 change: 1 addition & 0 deletions scripts/exglobal_archive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ source "${HOMEgfs}/ush/file_utils.sh"

[[ ! -d ${ARCDIR} ]] && mkdir -p "${ARCDIR}"
nb_copy "${COM_ATMOS_ANALYSIS}/${APREFIX}gsistat" "${ARCDIR}/gsistat.${RUN}.${PDY}${cyc}"
nb_copy "${COM_CHEM_ANALYSIS}/${APREFIX}aerostat" "${ARCDIR}/aerostat.${RUN}.${PDY}${cyc}"
nb_copy "${COM_ATMOS_GRIB_1p00}/${APREFIX}pgrb2.1p00.anl" "${ARCDIR}/pgbanl.${RUN}.${PDY}${cyc}.grib2"

# Archive 1 degree forecast GRIB2 files for verification
Expand Down
3 changes: 3 additions & 0 deletions ush/hpssarch_gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,9 @@ if [[ ${type} == "gdas" ]]; then
if [[ -s "${COM_ATMOS_ANALYSIS}/${head}oznstat" ]]; then
echo "${COM_ATMOS_ANALYSIS/${ROTDIR}\//}/${head}oznstat"
fi
if [[ -s "${COM_CHEM_ANALYSIS}/${head}aerostat" ]]; then
echo "${COM_CHEM_ANALYSIS/${ROTDIR}\//}/${head}aerostat"
fi
if [[ -s "${COM_ATMOS_ANALYSIS}/${head}radstat" ]]; then
echo "${COM_ATMOS_ANALYSIS/${ROTDIR}\//}/${head}radstat"
fi
Expand Down
7 changes: 5 additions & 2 deletions ush/python/pygfs/task/aero_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ def get_berror_dict(self, config: Dict[str, Any]) -> Dict[str, List[str]]:
b_datestr = to_fv3time(config.BERROR_DATE)
berror_list = []

for ftype in ['cor_rh', 'cor_rv', 'stddev']:
for ftype in ['stddev']:
coupler = f'{b_datestr}.{ftype}.coupler.res'
berror_list.append([
os.path.join(b_dir, coupler), os.path.join(config.DATA, 'berror', coupler)
Expand All @@ -290,7 +290,10 @@ def get_berror_dict(self, config: Dict[str, Any]) -> Dict[str, List[str]]:
berror_list.append([
os.path.join(b_dir, tracer), os.path.join(config.DATA, 'berror', tracer)
])

radius = 'cor_aero_universe_radius'
berror_list.append([
os.path.join(b_dir, radius), os.path.join(config.DATA, 'berror', radius)
])
nproc = config.ntiles * config.layout_x * config.layout_y
for nn in range(1, nproc + 1):
berror_list.append([
Expand Down

0 comments on commit bb1e561

Please sign in to comment.