Merge "Omaha #3595 Fix sed call and man/sigw indices for proper comparison." into omaha_14.4.1

Former-commit-id: 70561d721a [formerly 70561d721a [formerly bcc0d1c4f9516e90205d4c140ede99910d1af3b9]]
Former-commit-id: e7d524c06a
Former-commit-id: 93c71345ae
This commit is contained in:
Nate Jensen 2014-10-10 11:47:32 -05:00 committed by Gerrit Code Review
commit 6228516577
2 changed files with 61 additions and 5 deletions

View file

@ -1,4 +1,23 @@
#!/bin/csh
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
#
# A script wrapper around a UEngine call that is meant to get all available
# raob data in the A-II database over a specified range of times. The data
@ -14,6 +33,13 @@
# cleaning it up. The path to the finalized python is /tmp/a2gtraobNNNNN.py
# where NNNNN is a unix process id.
#
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# Oct 10, 2014 3595 nabowle Initial modification. Fix sed call.
#
set rmpy = yes
if ( "$1" == "p" ) then
set rmpy = no
@ -88,7 +114,7 @@ if ( "$method" == "daf" ) then
/awips2/python/bin/python $specpy
else
cd $UE_BIN_PATH
( uengine -r python < $specpy ) | grep -v '<' | sed -n '3,$p' | \
( uengine -r python < $specpy ) | grep -v '<' | sed -n '2,$p' | \
sed -f $staInf
endif
if ( "$rmpy" == "yes" ) rm -rf $specpy >& /dev/null

View file

@ -1,3 +1,33 @@
##
# This software was developed and / or modified by Raytheon Company,
# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
#
# U.S. EXPORT CONTROLLED TECHNICAL DATA
# This software product contains export-restricted data whose
# export/transfer/disclosure is restricted by U.S. law. Dissemination
# to non-U.S. persons whether in the United States or abroad requires
# an export license or other authorization.
#
# Contractor Name: Raytheon Company
# Contractor Address: 6825 Pine Street, Suite 340
# Mail Stop B8
# Omaha, NE 68106
# 402.291.0100
#
# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
# further licensing information.
##
# Gets all available raob data in the A-II database over a specified range of
# times. The data is output to stdout as ASCII.
#
# SOFTWARE HISTORY
#
# Date Ticket# Engineer Description
# ------------ ---------- ----------- --------------------------
# Oct 10, 2014 3595 nabowle Initial modification. Fix Man and SigW indices.
#
#
# pointDataQuery.stationName_lat_lon.py
from com.raytheon.uf.common.message.response import ResponseMessageGeneric
import PointDataQuery
@ -97,9 +127,9 @@ while i < len(tobs) :
if ntrop[i]<0 : ntrop[i] = 0
if nmxw[i]<0 : nmxw[i] = 0
if nman[i]==0 and nsigt[i]==0 and nsigw[i]==0 or rtyp[i]>2022:
iMan += 100
iMan += 25
iSigT += 120
iSigW += 120
iSigW += 80
iTrop += 5
iMxW += 5
i += 1
@ -150,7 +180,7 @@ while i < len(tobs) :
msg += "|" + "%.1f"%ddman[k];
k += 1
msg += ","
iMan += 100
iMan += 25
msg += str(nsigt[i]) + ","
kk = iSigT + nsigt[i]
@ -194,7 +224,7 @@ while i < len(tobs) :
msg += "|" + "%.1f"%ddsigw[k];
k += 1
msg += ","
iSigW += 120
iSigW += 80
msg += str(ntrop[i]) + ","
kk = iTrop + ntrop[i]