xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1

Browse source 
Former-commit-id: 1753861b41 [formerly 1753861b41 [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]]
Former-commit-id: 15d91d4b2d
Former-commit-id: 2a46e1a813
This commit is contained in:
Steve Harris 2014-10-29 08:21:13 -05:00
commit e9b43ad7b6
5 changed files with 143 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/ObjAnal.py
View file

@ -1,22 +1,3 @@
##
# 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.
##
# ----------------------------------------------------------------------------
# SVN: $Revision: 134 $ $Date: 2010-08-26 17:32:30 +0000 (Thu, 26 Aug 2010) $
#
@ -24,10 +5,22 @@
# support, and with no warranty, express or implied, as to its usefulness for
# any purpose.
#
# ObjAnal - version 2.8 - various Objective Analysis routines
# ObjAnal - version 2.12 - various Objective Analysis routines
#
# Author: Tim Barker - SOO Boise, ID
#
# 2014/10/06 - Version 2.12. Fix typo with timetupe in logtime which handles
# when running in simulations.
# 2014/08/31 - Version 2.11. Get rid of debug print statement that shouldn't
# have been there in the first place.
# 2014/07/28 - Version 2.10. Fix issues when ActualElev=1 and landMask is
# used, and a control point near the edge of the landMask has
# an elevation that is wildly different than the grid elevation
# at at that location. Also introduce the concept of a 'missing'
# elevation value for the point obs. If the elevation is missing
# the code will use the grid elevation - regardless of the
# setting of ActualElev. Defaults to -500ft. Can be changed
# with new setMissingElevThreshold routine (but doubt anybody will)
# 2014/03/20 - Version 2.8. Better import of numpy. Used SmartScript for
# _gmtime instead of time module (for more effective playback)
# 2014/01/10 - Version 2.7. Fixed copy of self._empty
@ -93,8 +86,12 @@ class ObjAnal(SmartScript.SmartScript):
# otherwise.......use the elevation of the gridpoint that
# contains the station for elevation related
# calculations
# However...if the station elevation is lower than the missing
# elevation Threshold, then use the grid elevation
# even if ActualElev is equal to 1.
#
self.ActualElev=1
self.MissingElevThreshold=-500
#
# Default Serp parameters
# Cache (500 by default) (between 0 and 1000) amount of memory
@ -126,9 +123,7 @@ class ObjAnal(SmartScript.SmartScript):
#
self.DSquaredDist=-1
self.DSquaredMaxPoints=-1
#
#
#
return
#---------------------------------------------------------------------------
@ -189,25 +184,50 @@ class ObjAnal(SmartScript.SmartScript):
yloclist=[]
hloclist=[]
zlist=[]
if landMask is None:
newlandMask=(topoGrid*0)+1
else:
newLandMask=landMask
self.logtime("Point values used in analysis:",4)
for i in range(len(values)):
(name,x,y,elev,val)=values[i]
if (x>(self.xmax-1))or(x<0)or(y>(self.ymax-1))or(y<0):
continue
hloclist.append(elev)
#
# If the ob point elevation is missing - always use
# the gridpoint elevation
#
if elev>self.MissingElevThreshold:
hloclist.append(elev)
else:
hloclist.append(topoGrid[y,x])
xloclist.append(x)
yloclist.append(y)
#
# If using actual elevations (rather than grid elevation)
# we will estimate what the grid WOULD have at that elevation
# and use THAT for determining the change that needs to be
# made
# If using the grid elevation at the point, then the
# z value (change)is simply the observed value minus the guess
# grid value.
#
if self.ActualElev==1:
if self.ActualElev!=1:
self.logtime(" %12s %3d,%3d %5d Val:%5.1f -- grid:%5.1f -- change:%5.1f"%(name,x,y,elev,val,guessGrid[y,x],val-guessGrid[y,x]),4)
zlist.append(val-guessGrid[y,x])
#
# If using actual elevations - then need to make the z value the
# difference between what the guess grid WOULD have at the ob elevation
# rather than the guess grid value itself. Searches outward until
# it finds a guess grid point with an elevation less than 100 feet
# from the ob's elevation.
#
else:
pt=topoGrid[y,x]
obLandMask=newLandMask[y,x]
desiredDiff=100
bestval=guessGrid[y,x]
bestdif=abs(elev-pt)
if elev>self.MissingElevThreshold:
bestdif=abs(elev-pt)
else:
bestdif=0
bestele=pt
wid=1
#
@ -219,46 +239,48 @@ class ObjAnal(SmartScript.SmartScript):
# to change the grid at the observation gridpoint.
#
while ((bestdif>desiredDiff)and(wid<10)):
#print " searching with wid=%d"%wid
if ((y+wid)<self.ymax):
for ii in range(max(0,x-wid),min(x+wid+1,self.xmax)):
gelev=topoGrid[y+wid,ii]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[y+wid,ii]
if obLandMask==newLandMask[y+wid,ii]:
gelev=topoGrid[y+wid,ii]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[y+wid,ii]
if ((y-wid)>=0):
for ii in range(max(0,x-wid),min(x+wid+1,self.xmax)):
gelev=topoGrid[y-wid,ii]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[y-wid,ii]
if obLandMask==newLandMask[y-wid,ii]:
gelev=topoGrid[y-wid,ii]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[y-wid,ii]
if ((x+wid)<self.xmax):
for jj in range(max(0,y-wid),min(y+wid+1,self.ymax)):
gelev=topoGrid[jj,x+wid]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[jj,x+wid]
if obLandMask==newLandMask[jj,x+wid]:
gelev=topoGrid[jj,x+wid]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[jj,x+wid]
if ((x-wid)>=0):
for jj in range(max(0,y-wid),min(y+wid+1,self.ymax)):
gelev=topoGrid[jj,x-wid]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[jj,x-wid]
if obLandMask==newLandMask[jj,x-wid]:
gelev=topoGrid[jj,x-wid]
dif=abs(elev-gelev)
if dif<bestdif:
bestdif=dif
bestele=gelev
bestval=guessGrid[jj,x-wid]
if bestdif>desiredDiff:
wid+=1
estval=bestval
self.logtime(" %12s %3d,%3d, est at %5d:%5.1f --- grid at %5d:%5.1f --- (%5d diff) -- Val:%5.1f -- Change:%5.1f"%(name,x,y,elev,estval,pt,guessGrid[y,x],pt-elev,val,val-estval),4)
zlist.append(val-estval)
else:
self.logtime(" %12s %3d,%3d %5d Val:%5.1f -- grid:%5.1f -- change:%5.1f"%(name,x,y,elev,val,guessGrid[y,x],val-guessGrid[y,x]),4)
zlist.append(val-guessGrid[y,x])
#
# Do the requested analysis
#
@ -669,7 +691,7 @@ class ObjAnal(SmartScript.SmartScript):
# Get distance squared of control points to every gridpoint
#
self.logtime("Getting distance squared between control points and gridpoints",3)
dists=zeros((numpts,self.ymax,self.xmax),np.float32)
dists=np.zeros((numpts,self.ymax,self.xmax),np.float32)
for k in range(numpts):
d=self.getDistance(xarr[k],yarr[k],harr[k],scaledtopo,newlandMask)*self.gridres
dists[k]=(d*d).astype(np.float32)
@ -711,8 +733,8 @@ class ObjAnal(SmartScript.SmartScript):
# Barnes PASS 1
#
self.logtime("Barnes Pass 1",3)
totweights=zeros((self.ymax,self.xmax),np.float32)
totsum=zeros((self.ymax,self.xmax),np.float32)
totweights=np.zeros((self.ymax,self.xmax),np.float32)
totsum=np.zeros((self.ymax,self.xmax),np.float32)
for k in range(numpts):
#
# get scaled distance squared divided by kappa
@ -740,8 +762,8 @@ class ObjAnal(SmartScript.SmartScript):
# Barnes PASS 2
#
self.logtime("Barnes Pass 2",3)
totweights=zeros((self.ymax,self.xmax),np.float32)
totsum=zeros((self.ymax,self.xmax),np.float32)
totweights=np.zeros((self.ymax,self.xmax),np.float32)
totsum=np.zeros((self.ymax,self.xmax),np.float32)
for k in range(numpts):
#
# get scaled distance squared divided by gamma *kappa
@ -1080,6 +1102,15 @@ class ObjAnal(SmartScript.SmartScript):
self.verbose=0
return
#---------------------------------------------------------------------------
# setMissingElevThreshold - set the MissingElevThreshold value
# Obs with elevation values less than or equal to this threshold
# will use the topo grid elevation instead, even if ActualElev is set
# to 1.
#
def setMissingElevThreshold(self,value):
self.MissingElevThreshold=value
return
#---------------------------------------------------------------------------
# logtime - write a string with date/time stamp. Can dynamically control
# which get printed by using the importance and verbosity settings.
# Will only print message with importance less or equal to verbosity
@ -1089,7 +1120,7 @@ class ObjAnal(SmartScript.SmartScript):
#
def logtime(self,string,importance=0):
if importance<=self.verbose:
tt=self._gmtime().timetuple
tt=self._gmtime().timetuple()
ts="%4.4d/%2.2d/%2.2d %2.2d:%2.2d:%2.2d"%(tt[0],tt[1],tt[2],tt[3],tt[4],tt[5])
print "%s|ObjAnal - %s" % (ts,string)
sys.stdout.flush()

1
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDlg.java
View file

@ -1150,6 +1150,7 @@ public class GageTableDlg extends JFrame implements IEditTimeChangedListener {
} else {
// Check for equality first
response = o1.compareTo(o2);
response *= -1;
if (response != 0) {
if (o1.toString().trim().equalsIgnoreCase("M")) {
response = 1;

11
deltaScripts/14.3.1/DR2757/deleteFSSObsConfigFiles.sh Normal file
View file

@ -0,0 +1,11 @@
#!/bin/bash
echo "INFO: delete FSSObs config files - removing safeseas, snow and fog area configuration files."
echo "Replace site AKQ with current one."
cd /awips2/edex/data/utility/common_static/site/AKQ
rm -rf fog safeseas snow
echo "INFO: the update has completed successfully!"
exit 0

7
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
View file

@ -1940,9 +1940,10 @@ public class NsharpResourceHandler {
return;
}
if (!fromArchive) {
// start FixMark:nearByStnCompSnd d2dlite
if (!(sndType.contentEquals("NCUAIR") || sndType
.contentEquals("BUFRUA"))) {
// For those sounding report with forecast time, e.g. model/pfc sounding
if (timeLine.contains("V")) { //fix D2D loading issue. 10/8/2014
// if (!(sndType.contentEquals("NCUAIR") || sndType
// .contentEquals("BUFRUA"))) {
// Chin's NOTE:
// Can Not use reference time directly from the stnInfo,
// Timestamp refTime = stnInfo.getReftime()

51
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
View file

@ -16,7 +16,7 @@
* 01/08/2014 Chin Chen Only initializing inventory when in NCP
* 01/13/2014 Chin Chen TTR829- when interpolation, edit graph is allowed
* 01/22/2014 Chin Chen DR17003 issue: NSHARP sounding display throws errors when swapping into main pane when show text is turned on.
*
* 10/20/2014 Chin Chen DR16864, D2D does not use unload button. Check to make sure not D2D instance before access unload button.
* </pre>
*
* @author Chin Chen
@ -150,7 +150,7 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
private boolean spcGpCreated = false;
private boolean awcGpCreated = false;
private boolean imD2d = false; // fixMark:NcInventory
public static NsharpPaletteWindow getInstance() {
if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) {
@ -220,7 +220,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareStnIsOn) {
compareStnBtn.setText(COMP_STN_ON);
graphEditBtn.setEnabled(false);
@ -231,7 +232,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareSndIsOn) {
compareSndBtn.setText(COMP_SND_ON);
graphEditBtn.setEnabled(false);
@ -242,7 +244,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareTmIsOn) {
compareTmBtn.setText(COMP_TM_ON);
compareSndBtn.setEnabled(false);
@ -253,7 +256,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (editGraphOn) {
graphEditBtn.setText(EDIT_GRAPH_ON);
dataEditBtn.setEnabled(false);
@ -264,7 +268,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
}
} else if (currentGraphMode == NsharpConstants.GRAPH_TURB) {
@ -377,7 +382,7 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
public NsharpPaletteWindow() {
super();
instance = this;
boolean imD2d = false; // fixMark:NcInventory
//boolean imD2d = false; // fixMark:NcInventory
if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) {
if (VizPerspectiveListener.getCurrentPerspectiveManager()
.getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) {
@ -945,7 +950,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false);
cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else {
overlayIsOn = false;
overlayBtn.setText(OVLY_OFF);
@ -958,7 +964,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true);
cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
}
NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) {
@ -1001,7 +1008,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false);
cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else {
compareStnIsOn = false;
compareStnBtn.setText(COMP_STN_OFF);
@ -1014,7 +1022,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true);
cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
}
NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) {
@ -1059,7 +1068,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false);
cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else {
compareTmIsOn = false;
compareTmBtn.setText(COMP_TM_OFF);
@ -1072,7 +1082,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true);
cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
}
NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) {
@ -1115,7 +1126,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false);
cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else {
compareSndIsOn = false;
compareSndBtn.setText(COMP_SND_OFF);
@ -1128,7 +1140,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true);
cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
}
NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) {
@ -1187,7 +1200,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
compareSndBtn.setEnabled(true);
compareStnBtn.setEnabled(true);
overlayBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
}
} else {
editGraphOn = true;
@ -1200,7 +1214,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
compareSndBtn.setEnabled(false);
compareStnBtn.setEnabled(false);
overlayBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
}
NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) {