Skip to content
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.

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

Apply fixes to archiving jobs #2221

Merged
merged 3 commits into from
Jan 16, 2024
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
2 changes: 1 addition & 1 deletion jobs/JGLOBAL_ARCHIVE
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS COM_ATMOS_BUFR COM_ATMO
COM_OCEAN_HISTORY COM_OCEAN_INPUT COM_OCEAN_RESTART COM_OCEAN_XSECT COM_OCEAN_2D COM_OCEAN_3D \
COM_OCEAN_ANALYSIS \
COM_WAVE_GRID COM_WAVE_HISTORY COM_WAVE_STATION \
COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON
COM_ATMOS_OZNMON COM_ATMOS_RADMON COM_ATMOS_MINMON COM_CONF

for grid in "0p25" "0p50" "1p00"; do
YMD=${PDY} HH=${cyc} GRID=${grid} generate_com -rx "COM_ATMOS_GRIB_${grid}:COM_ATMOS_GRIB_GRID_TMPL"
Expand Down
8 changes: 6 additions & 2 deletions scripts/exglobal_atmos_products.sh
Original file line number Diff line number Diff line change
Expand Up @@ -167,14 +167,18 @@ done # for (( nset=1 ; nset <= downset ; nset++ ))

#---------------------------------------------------------------

# Create the index file for the sflux master, if it exists.
FLUX_FILE="${COM_ATMOS_MASTER}/${PREFIX}sfluxgrb${fhr3}.grib2"
if [[ -s "${FLUX_FILE}" ]]; then
${WGRIB2} -s "${FLUX_FILE}" > "${FLUX_FILE}.idx"
fi

# Section creating slfux grib2 interpolated products
# Create 1-degree sflux grib2 output
# move to COM and index it
if [[ "${FLXGF:-}" == "YES" ]]; then

# Files needed by ${INTERP_ATMOS_SFLUXSH}
FLUX_FILE="${COM_ATMOS_MASTER}/${PREFIX}sfluxgrb${fhr3}.grib2"

input_file="${FLUX_FILE}"
output_file_prefix="sflux_${fhr3}"
grid_string="1p00"
Expand Down
29 changes: 22 additions & 7 deletions ush/hpssarch_gen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ if [[ ${type} = "gfs" ]]; then
# This uses the bash extended globbing option
{
echo "./logs/${PDY}${cyc}/gfs!(arch).log"
echo "${COM_ATMOS_HISTORY/${ROTDIR}\//}/input.nml"
echo "${COM_CONF/${ROTDIR}\//}/ufs.input.nml"

if [[ ${MODE} = "cycled" ]]; then
if [[ -s "${COM_ATMOS_ANALYSIS}/${head}gsistat" ]]; then
Expand Down Expand Up @@ -368,7 +368,10 @@ if [[ ${type} == "gdas" ]]; then
echo "./logs/${PDY}${cyc}/gdas${fstep}.log"
fi
done
echo "./logs/${PDY}${cyc}/gdaspost*.log"
echo "./logs/${PDY}${cyc}/gdas*prod*.log"
if [[ "${WRITE_DOPOST}" == ".false." ]]; then
echo "./logs/${PDY}${cyc}/gdas*upp*.log"
fi

fh=0
while [[ ${fh} -le 9 ]]; do
Expand Down Expand Up @@ -407,10 +410,13 @@ if [[ ${type} == "gdas" ]]; then
fi
subtyplist="gome_metop-b omi_aura ompslp_npp ompsnp_n20 ompsnp_npp ompstc8_n20 ompstc8_npp sbuv2_n19"
for subtype in ${subtyplist}; do
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.${PDY}${cyc}.ieee_d${suffix}"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.ctl"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.ctl"
# On occassion, data is not available for some of these satellites. Check for existence.
if [[ -s "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}" ]]; then
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.${PDY}${cyc}.ieee_d${suffix}"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.anl.ctl"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.${PDY}${cyc}.ieee_d${suffix}"
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/${subtype}.ges.ctl"
fi
done
echo "${COM_ATMOS_OZNMON/${ROTDIR}\//}/${type}/stdout.${type}.tar.gz"
done
Expand Down Expand Up @@ -612,10 +618,19 @@ if [[ ${type} == "enkfgdas" || ${type} == "enkfgfs" ]]; then
fi
fi
done # loop over FHR
for fstep in eobs ecen esfc eupd efcs epos ; do
for fstep in efcs epos ; do
echo "logs/${PDY}${cyc}/${RUN}${fstep}*.log"
done

# eobs, ecen, esfc, and eupd are not run on the first cycle
for fstep in eobs ecen esfc eupd ; do
for log in "${ROTDIR}/logs/${PDY}${cyc}/${RUN}${fstep}"*".log"; do
if [[ -s "${log}" ]]; then
echo "logs/${PDY}${cyc}/${RUN}${fstep}*.log"
fi
done
done

# eomg* are optional jobs
for log in "${ROTDIR}/logs/${PDY}${cyc}/${RUN}eomg"*".log"; do
if [[ -s "${log}" ]]; then
Expand Down