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.

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

Fix radiance verification failing to find diag files #1031

Merged
merged 3 commits into from
Sep 26, 2022
+21 −20
Merged

Fix radiance verification failing to find diag files #1031

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
304049d
Ref #1028
EdwardSafford-NOAA Sep 23, 2022
c2a7988
Ref #1028
EdwardSafford-NOAA Sep 23, 2022
1bfae09
Ref #1028
EdwardSafford-NOAA Sep 23, 2022
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
8 changes: 4 additions & 4 deletions scripts/exgdas_atmos_verfrad.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,15 @@ if [[ -s ${radstat} && -s ${biascr} ]]; then
netcdf=1
fi

if [[ -f "diag_${type}_ges.${PDATE}*.${Z}" ]]; then
if [[ $(find . -maxdepth 1 -type f -name diag_${type}_ges.${PDATE}*.${Z} | wc -l) > 0 ]]; then
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
mv diag_${type}_ges.${PDATE}*.${Z} ${type}.${Z}
${UNCOMPRESS} ./${type}.${Z}
else
echo "WARNING: diag_${type}_ges.${PDATE}*.${Z} not available, skipping"
fi

if [[ $USE_ANL -eq 1 ]]; then
if [[ -f "diag_${type}_anl.${PDATE}*.${Z}" ]]; then
if [[ $(find . -maxdepth 1 -type f -name diag_${type}_anl.${PDATE}*.${Z} | wc -l) > 0 ]]; then
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
mv diag_${type}_anl.${PDATE}*.${Z} ${type}_anl.${Z}
${UNCOMPRESS} ./${type}_anl.${Z}
else
Expand Down Expand Up @@ -183,7 +183,7 @@ if [[ -s ${radstat} && -s ${biascr} ]]; then
# optionally run clean_tankdir script
#
if [[ ${CLEAN_TANKVERF:-0} -eq 1 ]]; then
${USHradmon}/clean_tankdir.sh glb 60
"${USHradmon}/clean_tankdir.sh glb 60"
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
rc_clean_tankdir=$?
echo "rc_clean_tankdir = $rc_clean_tankdir"
fi
Expand Down Expand Up @@ -214,7 +214,7 @@ export CHGRP_CMD=${CHGRP_CMD:-"chgrp ${group_name:-rstprod}"}
rlist="saphir"
for rtype in $rlist; do
if compgen -G "$TANKverf_rad/*${rtype}*" > /dev/null; then
${CHGRP_CMD} $TANKverf_rad/*${rtype}*
${CHGRP_CMD} "$TANKverf_rad/*${rtype}*"
WalterKolczynski-NOAA marked this conversation as resolved.
Show resolved Hide resolved
fi
done

Expand Down
19 changes: 10 additions & 9 deletions ush/radmon_verf_angle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,13 @@ else
angl_ctl=angle.${ctl_file}
fi

angl_file=""
if [[ $REGIONAL_RR -eq 1 ]]; then
angl_file=${rgnHH}.${data_file}.${rgnTM}
fi


rm input
if [[ -f input ]]; then rm input; fi

nchanl=-999
cat << EOF > input
Expand Down Expand Up @@ -209,18 +210,18 @@ EOF
${USHradmon}/rstprod.sh

tar_file=radmon_angle.tar
if compgen -G "angle*.ieee_d* angle*.ctl*" > /dev/null; then
if compgen -G "angle*.ieee_d*" > /dev/null || compgen -G "angle*.ctl*" > /dev/null; then
tar -cf $tar_file angle*.ieee_d* angle*.ctl*
${COMPRESS} ${tar_file}
mv $tar_file.${Z} ${TANKverf_rad}/.

if [[ $RAD_AREA = "rgn" ]]; then
cwd=$(pwd)
cd ${TANKverf_rad}
tar -xf ${tar_file}.${Z}
rm ${tar_file}.${Z}
cd ${cwd}
fi
if [[ $RAD_AREA = "rgn" ]]; then
cwd=$(pwd)
cd ${TANKverf_rad}
tar -xf ${tar_file}.${Z}
rm ${tar_file}.${Z}
cd ${cwd}
fi
fi

if [[ $ctr -gt 0 && $fail -eq $ctr || $fail -gt $ctr ]]; then
Expand Down
4 changes: 2 additions & 2 deletions ush/radmon_verf_bcoef.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ else
fi


rm input
if [[ -f input ]]; then rm input; fi


cat << EOF > input
Expand Down Expand Up @@ -206,7 +206,7 @@ EOF

${USHradmon}/rstprod.sh

if compgen -G "bcoef*.ieee_d* bcoef*.ctl*" > /dev/null; then
if compgen -G "bcoef*.ieee_d*" > /dev/null || compgen -G "bcoef*.ctl*" > /dev/null; then
tar_file=radmon_bcoef.tar
tar -cf $tar_file bcoef*.ieee_d* bcoef*.ctl*
${COMPRESS} ${tar_file}
Expand Down
2 changes: 1 addition & 1 deletion ush/radmon_verf_bcor.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ EOF
${USHradmon}/rstprod.sh
tar_file=radmon_bcor.tar

if compgen -G "bcor*.ieee_d* bcor*.ctl*" > /dev/null; then
if compgen -G "bcor*.ieee_d*" > /dev/null || compgen -G "bcor*.ctl*" > /dev/null; then
tar -cf $tar_file bcor*.ieee_d* bcor*.ctl*
${COMPRESS} ${tar_file}
mv $tar_file.${Z} ${TANKverf_rad}/.
Expand Down
4 changes: 2 additions & 2 deletions ush/radmon_verf_time.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ if [[ $err -eq 0 ]]; then

for dtype in ${gesanl}; do

rm input
if [[ -f input ]]; then rm input; fi

if [[ $dtype == "anl" ]]; then
data_file=${type}_anl.${PDATE}.ieee_d
Expand Down Expand Up @@ -252,7 +252,7 @@ EOF

${USHradmon}/rstprod.sh

if compgen -G "time*.ieee_d* time*.ctl*" > /dev/null; then
if compgen -G "time*.ieee_d*" > /dev/null || compgen -G "time*.ctl*" > /dev/null; then
tar_file=radmon_time.tar
tar -cf $tar_file time*.ieee_d* time*.ctl*
${COMPRESS} ${tar_file}
Expand Down