From f1e6c7143fed38de2449db1dd9ec3c70a9da6a5d Mon Sep 17 00:00:00 2001 From: Iliana Genkova Date: Fri, 31 May 2024 22:20:40 +0000 Subject: [PATCH] Bring last minute NCO changes:bad bracket,do "grep --text" --- scripts/excdas_dump.sh | 15 +++++++++------ scripts/exdump_monitor.sh | 15 +++++++++------ scripts/exrap_dump.sh | 15 +++++++++------ scripts/exrtma_dump.sh | 15 +++++++++------ scripts/exurma_dump.sh | 15 +++++++++------ ush/bufr_avgdata.sh | 4 ++-- ush/bufr_datacount.sh | 8 ++++---- 7 files changed, 51 insertions(+), 36 deletions(-) diff --git a/scripts/excdas_dump.sh b/scripts/excdas_dump.sh index 79872e9..72173e6 100755 --- a/scripts/excdas_dump.sh +++ b/scripts/excdas_dump.sh @@ -327,20 +327,23 @@ err10=0 TANK_MAX_255003=${TANK_MAX_255003:-3221225472} #3Gb TANK_MAX_255004=${TANK_MAX_255004:-1610612736} #1.5Gb TANK_MAX_255030=${TANK_MAX_255030:-4187593114} #3.9Gb -if [ -s ${TANK}/${PDY}/b255/xx003 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then +if [ -s ${TANK}/${PDY}/b255/xx003 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then export SKIP_255003=YES msg="WARNING: TANK b255/xx003 exceeds TANK_MAX_255003 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx004 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then +if [ -s ${TANK}/${PDY}/b255/xx004 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then export SKIP_255004=YES msg="WARNING: TANK b255/xx004 exceeds TANK_MAX_255004 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx030 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then +if [ -s ${TANK}/${PDY}/b255/xx030 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then export SKIP_255030=YES msg="WARNING: TANK b255/xx030 exceeds TANK_MAX_255030 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi #end of block diff --git a/scripts/exdump_monitor.sh b/scripts/exdump_monitor.sh index 34940c0..d18df26 100755 --- a/scripts/exdump_monitor.sh +++ b/scripts/exdump_monitor.sh @@ -125,20 +125,23 @@ err10=0 TANK_MAX_255003=${TANK_MAX_255003:-3221225472} #3Gb TANK_MAX_255004=${TANK_MAX_255004:-1610612736} #1.5Gb TANK_MAX_255030=${TANK_MAX_255030:-4187593114} #3.9Gb -if [ -s ${TANK}/${PDY}/b255/xx003 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then +if [ -s ${TANK}/${PDY}/b255/xx003 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then export SKIP_255003=YES msg="WARNING: TANK b255/xx003 exceeds TANK_MAX_255003 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx004 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then +if [ -s ${TANK}/${PDY}/b255/xx004 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then export SKIP_255004=YES msg="WARNING: TANK b255/xx004 exceeds TANK_MAX_255004 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx030 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then +if [ -s ${TANK}/${PDY}/b255/xx030 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then export SKIP_255030=YES msg="WARNING: TANK b255/xx030 exceeds TANK_MAX_255030 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi #end of block diff --git a/scripts/exrap_dump.sh b/scripts/exrap_dump.sh index 7ccaf73..9af99cb 100755 --- a/scripts/exrap_dump.sh +++ b/scripts/exrap_dump.sh @@ -265,20 +265,23 @@ err12=0 TANK_MAX_255003=${TANK_MAX_255003:-3221225472} #3Gb TANK_MAX_255004=${TANK_MAX_255004:-1610612736} #1.5Gb TANK_MAX_255030=${TANK_MAX_255030:-4187593114} #3.9Gb -if [ -s ${TANK}/${PDY}/b255/xx003 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then +if [ -s ${TANK}/${PDY}/b255/xx003 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then export SKIP_255003=YES msg="WARNING: TANK b255/xx003 exceeds TANK_MAX_255003 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx004 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then +if [ -s ${TANK}/${PDY}/b255/xx004 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then export SKIP_255004=YES msg="WARNING: TANK b255/xx004 exceeds TANK_MAX_255004 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +# echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx030 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then +if [ -s ${TANK}/${PDY}/b255/xx030 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then export SKIP_255030=YES msg="WARNING: TANK b255/xx030 exceeds TANK_MAX_255030 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi #end of block diff --git a/scripts/exrtma_dump.sh b/scripts/exrtma_dump.sh index 5dd85cc..fdbf1f3 100755 --- a/scripts/exrtma_dump.sh +++ b/scripts/exrtma_dump.sh @@ -92,20 +92,23 @@ err5=0 TANK_MAX_255003=${TANK_MAX_255003:-3221225472} #3Gb TANK_MAX_255004=${TANK_MAX_255004:-1610612736} #1.5Gb TANK_MAX_255030=${TANK_MAX_255030:-4187593114} #3.9Gb -if [ -s ${TANK}/${PDY}/b255/xx003 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then +if [ -s ${TANK}/${PDY}/b255/xx003 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then export SKIP_255003=YES msg="WARNING: TANK b255/xx003 exceeds TANK_MAX_255003 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx004 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then +if [ -s ${TANK}/${PDY}/b255/xx004 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then export SKIP_255004=YES msg="WARNING: TANK b255/xx004 exceeds TANK_MAX_255004 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx030 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then +if [ -s ${TANK}/${PDY}/b255/xx030 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then export SKIP_255030=YES msg="WARNING: TANK b255/xx030 exceeds TANK_MAX_255030 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi #end of block diff --git a/scripts/exurma_dump.sh b/scripts/exurma_dump.sh index e8e23b7..9a5f00a 100755 --- a/scripts/exurma_dump.sh +++ b/scripts/exurma_dump.sh @@ -72,20 +72,23 @@ err6=0 TANK_MAX_255003=${TANK_MAX_255003:-3221225472} #3Gb TANK_MAX_255004=${TANK_MAX_255004:-1610612736} #1.5Gb TANK_MAX_255030=${TANK_MAX_255030:-4187593114} #3.9Gb -if [ -s ${TANK}/${PDY}/b255/xx003 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then +if [ -s ${TANK}/${PDY}/b255/xx003 ]&& [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx003)" -gt "$TANK_MAX_255003" ]; then export SKIP_255003=YES msg="WARNING: TANK b255/xx003 exceeds TANK_MAX_255003 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx004 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then +if [ -s ${TANK}/${PDY}/b255/xx004 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx004)" -gt "$TANK_MAX_255004" ]; then export SKIP_255004=YES msg="WARNING: TANK b255/xx004 exceeds TANK_MAX_255004 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi -if [ -s ${TANK}/${PDY}/b255/xx030 && "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then +if [ -s ${TANK}/${PDY}/b255/xx030 ] && [ "$(stat -c '%s' ${TANK}/${PDY}/b255/xx030)" -gt "$TANK_MAX_255030" ]; then export SKIP_255030=YES msg="WARNING: TANK b255/xx030 exceeds TANK_MAX_255030 => not dumped" - echo $msg | mail.py -s $msg -c iliana.genkova@noaa.gov + echo $msg | mail.py -s "$msg" +#echo $msg | mail.py -s "$msg" -c iliana.genkova@noaa.gov fi #end of block diff --git a/ush/bufr_avgdata.sh b/ush/bufr_avgdata.sh index 339fc12..f827a7e 100755 --- a/ush/bufr_avgdata.sh +++ b/ush/bufr_avgdata.sh @@ -338,7 +338,7 @@ for cycle_avg in $cycles; do > accum.obs.counts.${cycle_avg} for dtg in "${arr30d[@]}"; do set +x - grep -h -e " REPORTS" -e "^EOF @@@" \ + grep --text -h -e " REPORTS" -e "^EOF @@@" \ $OBCNTarch/${net}.${dtg}/*${cycle_avg}.status.*bufr_d | \ grep -e " in data group " -e "^EOF @@@" | grep -e " HAS" -e "^EOF @@@" | \ grep -v -e "Domain" >> delete @@ -354,7 +354,7 @@ for cycle_avg in $cycles; do done done -grep -e "^_" -e "^:" $DUMPLIST | grep -Fe "#>" > dumplist +grep --text -e "^_" -e "^:" $DUMPLIST | grep -Fe "#>" > dumplist # Generate a new average file diff --git a/ush/bufr_datacount.sh b/ush/bufr_datacount.sh index 4902aa0..012f9e2 100755 --- a/ush/bufr_datacount.sh +++ b/ush/bufr_datacount.sh @@ -105,7 +105,7 @@ echo $RETC > $COMOUT/${RUN}.${cycle}.dump_alert_flag.$tmmark # and 12-month ago 30-day avg files # ------------------------------------------------------------------------ -grep -e "^_" -e "^:" $LIST_CNT | grep -Fe "#>" > dumplist +grep --text -e "^_" -e "^:" $LIST_CNT | grep -Fe "#>" > dumplist if [ -s $COMIN/${RUN}.${cycle}.status.tm00.bufr_d ]; then status_bufr_d=$COMIN/${RUN}.${cycle}.status.tm00.bufr_d @@ -114,7 +114,7 @@ elif [ -s $COMOUT/${RUN}.${cycle}.status.tm00.bufr_d ]; then else status_bufr_d=/dev/null fi -grep -Fe " REPORTS" $status_bufr_d | grep -Fe " in data group " | \ +grep --text -Fe " REPORTS" $status_bufr_d | grep -Fe " in data group " | \ grep -Fe " HAS" | grep -v -Fe "Domain" > delete awk -F" HAS" '{print$2}' delete | awk -F" REPORTS" '{print$1}' | \ sed "s/[^0-9]/ /g" > delete.r @@ -126,7 +126,7 @@ rm delete delete.l delete.r > obcount_30davg.${NET}.current if [ -s $AVGDarch_IN/obcount_30davg.${NET}.current ]; then - grep "^# " $AVGDarch_IN/obcount_30davg.${NET}.current | \ + grep --text "^# " $AVGDarch_IN/obcount_30davg.${NET}.current | \ sed "s/# ......./ /g" | sed "s/[^0-9]/ /g" \ > obcount_30davg.${NET}.current fi @@ -146,7 +146,7 @@ for months_ago in 3 6 9 12; do > obcount_30davg.${NET}.${months_ago}months_ago if [ -s $AVGDarch_IN/obcount_30davg.${NET}.${arch_year}${arch_month} ]; then - grep "^# " $AVGDarch_IN/obcount_30davg.${NET}.${arch_year}${arch_month} | \ + grep --text "^# " $AVGDarch_IN/obcount_30davg.${NET}.${arch_year}${arch_month} | \ sed "s/# ......./ /g" | sed "s/[^0-9]/ /g" \ > obcount_30davg.${NET}.${months_ago}months_ago fi