For a list of D2D elements and descriptions click here.
@@ -474,9 +474,9 @@ minimum and maximum values must be supplied along with the default value. You can also specify a resolution if you wish. The default is 1.serverConfig.D2DAccumulativeElements= {
- "GFS-40km": ["tp", "cp"],
+ "GFS40": ["tp", "cp"],
"NAM80": ["tp", "cp"],
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py
index 38dd008354..51944197f6 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/Extrapolate.py
@@ -55,8 +55,8 @@ from math import *
# Add or delete models according to whether or not they are available at your office.
#
-#sourceList = ["NAM12", "GFS-40km", "RAP-40km"]
-sourceList = ["NAM12", "GFS-40km", "RAP-13km", "wrfnmm", "wrfarw", "WSETA"]
+#sourceList = ["NAM12", "GFS40", "RUC40"]
+sourceList = ["NAM12", "GFS40", "RUC13", "wrfnmm", "wrfarw", "WSETA"]
toolName = 'Extrapolate'
#
@@ -126,7 +126,7 @@ class Procedure (SmartScript.SmartScript):
self.fragmentCmd(["variableElement"], timeRange)
h=starth
- modelList = ["NAM12", "GFS-40km", "RAP-13km", "wrfnmm", "wrfarw", "WSETA", "Fcst"] #####################################################
+ modelList = ["NAM12", "GFS40", "RUC13", "wrfnmm", "wrfarw", "WSETA", "Fcst"] #####################################################
if varDict["Source:"] not in modelList and varDict["Source:"] != "Observed (enter below)":
modelList.append((varDict["Source:"]))
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py
index 929a7c4bfa..d268b70202 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCMWindTool.py
@@ -49,7 +49,7 @@ VariableList = [("Product to\ndecode:", [], "check",
("Product to\n decode:", [], "check",
["TCMCP1", "TCMCP2", "TCMCP3", "TCMCP4", "TCMCP5",
"TCPWP1", "TCPWP2", "TCPWP3", "TCPWP4", "TCPWP5"]),
- ("Background\nModel:", "Fcst", "radio", ["GFS-40km", "NAM12", "ECMWFHiRes", "Fcst"]),
+ ("Background\nModel:", "Fcst", "radio", ["GFS40", "NAM12", "ECMWFHiRes", "Fcst"]),
("Number of Pie Slices?", "4", "radio", ["4", "8", "12", "16"]),
("Eye Diameter:", 0, "scale", [0, 100], 1),
("34 knot radius at 3 days (NM):", 100, "scale", [0, 1000], 10),
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py
index 73b509199b..766c8bf316 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/smartTools/MoveFeatureBySpeed.py
@@ -47,12 +47,12 @@ from math import *
# Add or delete models according to whether or not they are available at your office.
#
-#sourceList = ["NAM12", "GFS-40km", "RUC80"]
-sourceList = ["NAM12", "GFS-40km", "RAP-40km", "wrfnmm", "wrfarw", "WSETA"]
+#sourceList = ["NAM12", "GFS40", "RUC80"]
+sourceList = ["NAM12", "GFS40", "RUC40", "wrfnmm", "wrfarw", "WSETA"]
threeHour = ["NAM12"]
-sixHour = ["GFS-40km"]
-RUC = ["RAP-13km", "RAP-40km"]
+sixHour = ["GFS40"]
+RUC = ["RUC13", "RUC40"]
resolution = 2.5
@@ -86,7 +86,7 @@ class Tool (SmartScript.SmartScript):
"Extrapolate features foward or backward in time based on observed or model speed"
self.logToolUse("Smart Tool execution")
- modelList = ["NAM12", "GFS-40km", "RAP-40km", "RAP-13km", "wrfnmm", "wrfarw", "WSETA", "Fcst"] #####################################################
+ modelList = ["NAM12", "GFS40", "RUC40", "RUC13", "wrfnmm", "wrfarw", "WSETA", "Fcst"] #####################################################
if varDict["Source:"] not in modelList and varDict["Source:"] != "Observed (enter below)":
modelList.append((varDict["Source:"]))
diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
index 4f641b8131..aedac1e2ef 100644
--- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
+++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
@@ -55,6 +55,7 @@
# Nov 07, 2013 2476 dgilling Fix _getGridsResult() for retrieving
# Wx/Discrete in First mode.
# Dec 23, 2013 16893 ryu Added unloadWEs() method (created by njensen)
+# Apr 29, 2014 3097 randerso Fixed getGrids() to return non-scalar grids as tuples in all cases
#
########################################################################
import types, string, time, sys
@@ -477,7 +478,9 @@ class SmartScript(BaseTool.BaseTool):
else:
# discrete or weather
keys = JUtil.javaObjToPyVal(jxlgrid.getKeyList())
- xlgrid.append(keys)
+ xlgrid = (xlgrid[0], keys)
+ else:
+ xlgrid = (xlgrid[0], xlgrid[1])
xlated.append(xlgrid)
retVal = xlated
else:
@@ -487,12 +490,14 @@ class SmartScript(BaseTool.BaseTool):
if len(result) == 1:
if result[0].dtype != numpy.int8:
# scalar
- result = result[0]
+ retVal = result[0]
else:
# discrete or weather
keys = JUtil.javaObjToPyVal(slice.getKeyList())
- result.append(keys)
- retVal = result
+ retVal = (result[0], keys)
+ else:
+ # vector
+ retVal = (result[0], result[1])
if retVal is None or retVal == []:
if noDataError == 1:
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
index e0a65eb87c..2e8a40b35f 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
@@ -141,6 +141,8 @@ import com.raytheon.viz.gfe.types.MutableInteger;
* to simplify maintenance of this class.
* Changed handling of enabling/disabling Topo parm
* 04/02/2014 #2969 randerso Fix error when Toop parm is unloaded.
+ * 05/01/2014 #3105 dgilling Ensure mutable db gets into availableServerDatabases
+ * if it has to be created during ParmManager construction.
*
*
* @author chammack
@@ -1314,6 +1316,11 @@ public class ParmManager implements IParmManager, IMessageClient {
ServerResponse sr = this.dataManager.getClient()
.createNewDb(mutableDbId);
containsMutable = sr.isOkay();
+
+ if (containsMutable) {
+ this.availableServerDatabases.add(mutableDbId);
+ Collections.sort(this.availableServerDatabases);
+ }
}
if (containsMutable) {
diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
index 9655c5113f..2e5cfe46b0 100644
--- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
+++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WEBrowserTypeRecord.java
@@ -297,7 +297,7 @@ public class WEBrowserTypeRecord {
*
* @param modelNames
* A list of model runs. Format for the strings should be model
- * DD/HH (e.g., "RAP-13km 03/12" or "GFS-40km 30/00")
+ * DD/HH (e.g., "RUC13 03/12" or "GFS40 30/00")
* @return A single map containing all parms present in the model runs
* mapped to all possible pressure values.
*/
@@ -325,7 +325,7 @@ public class WEBrowserTypeRecord {
*
* @param modelNames
* A list of model runs. Format for the strings should be model
- * DD/HH (e.g., "RAP-13km 03/12" or "GFS-40km 30/00")
+ * DD/HH (e.g., "RUC13 03/12" or "GFS40 30/00")
* @return A single map containing all parms present in the model runs
* mapped to all possible "misc." pressure values.
*/
@@ -352,7 +352,7 @@ public class WEBrowserTypeRecord {
*
* @param model
* The model run name and time, specified in "model DD/HH" format
- * (e.g., "RAP-13km 03/12" or "GFS-40km 30/00").
+ * (e.g., "RUC13 03/12" or "GFS40 30/00").
* @param parmName
* The parm name (e.g., "t" or "pop").
* @return An array containing all valid pressure level values for the
@@ -375,7 +375,7 @@ public class WEBrowserTypeRecord {
*
* @param model
* The model run name and time, specified in "model DD/HH" format
- * (e.g., "RAP-13km 03/12" or "GFS-40km 30/00").
+ * (e.g., "RUC13 03/12" or "GFS40 30/00").
* @param parmName
* The parm name (e.g., "t" or "pop").
* @return An array containing all valid "misc." pressure level values for