Changeset 981 for MGET/Trunk/PythonPackage/src/GeoEco/DataProducts/HYCOM.py

Timestamp:

05/06/12 10:40:06 (13 months ago)

Author:

jjr8

Message:

Merged revision(s) 964-980 from MGET/Branches/Jason:
Added moon.py
........
* Incremented build number
* Working on #542: Add a tool for calculating the moon phase
........
Rebuilt ArcGIS 9.3 toolbox.
........
Fixed #544: On ArcGIS 9.3, 9.3 SP1, and 9.3.1, various "Interpolate ... at Points" tools fail with RuntimeError?: Failed to set the value of the ... field of a point from ArcGIS FeatureClass? ... to None due to TypeError?: an integer is required
........
Fixed #545: Fit GLM and Predict GLM From Rasters tools fail with RPy_Exception: could not find function "..."
........
Fixed/implemented:
* #542: Add a tool for calculating the moon phase
* #543: Binary output from Predict GLM, Predict GAM, etc. should be NoData? where inputs are NoData?
* Added temporal periodicity analysis tool.
........
Rebuilt ArcGIS 9.3 toolbox.
........
........
* Rebuilt ArcGIS 9.3 toolbox.
* Renamed 'Spatial Analysis' toolset to 'Spatial And Temporal Analysis'
........
* Fixed #488: Create Fishnet For Points tool does not work on ArcGIS 10
* Finished implementation of Periodicity.AnalyzeArcGISTable
........
Rebuilt ArcGIS toolbox. Fixed build break.
........
Rebuilt installation packages. This will be merged with the Trunk and released as MGET 0.8a40.
........

Location:

MGET/Trunk

Files:

• . (modified) (1 prop)
• PythonPackage/src/GeoEco/DataProducts/HYCOM.py (modified) (5 diffs)

MGET/Trunk/PythonPackage/src/GeoEco/DataProducts/HYCOM.py

@@ -1346 +1346 @@
         # Initialize the base class.
 
-        super(HYCOMGLBa008Equatorial3D, self).__init__(queryableAttributes=(QueryableAttribute(u'VariableName', _(u'HYCOM variable'), UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mixed_layer_density', u'mixed_layer_salinity', u'mixed_layer_temperature', u'mixed_layer_thickness', u'mixed_layer_u_velocity', u'mixed_layer_v_velocity', u'surface_boundary_layer_thickness', u'qtot', u'ssh', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True)),),
+        super(HYCOMGLBa008Equatorial3D, self).__init__(queryableAttributes=(QueryableAttribute(u'VariableName', _(u'HYCOM variable'), UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mld', u'mlp', u'qtot', u'ssh', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True)),),
                                                        queryableAttributeValues={u'VariableName': variableName},
                                                        lazyPropertyValues={'SpatialReference': Dataset.ConvertSpatialReference('proj4', '+proj=merc +R=6371001 +lon_0=-105.88 +no_defs', 'obj'),         # lon_0 and other georeferencing parameters were calculated by _HYCOMGridGLBa0083D.GetSpatialReferenceParametersForHYCOMGlobalGrid()
@@ -2048 +2048 @@
 u"""HYCOM 3D variable (dimensions x, y, and time), one of:
 
-* emp - Water flux into the ocean, in kg/m2/s.
+* emp - Water flux into the ocean, in kg/m^2/s.
 
 * mld - Mixed layer thickness, in m, defined as the depth at which the
-  temperature change from the surface temperature is 0.02 degrees C.
+  temperature change from the surface temperature is 0.2 degrees C.
 
 * mlp - Mixed layer thickness, in m, defined as the depth at which the
-  pressure change from the surface pressure is 0.03 kg/m3.
-
-* qtot - Surface downward heat flux, in w/m2.
+  pressure change from the surface pressure is 0.03 kg/m^3.
+
+* qtot - Surface downward heat flux, in W/m^2.
 
 * ssh - Sea surface height, in m, above the HYCOM reference spheroid.
@@ -2596 +2596 @@
 u"""HYCOM 3D variables to interpolate:
 
-* emp - Water flux into the ocean, in kg/m2/s.
+* emp - Water flux into the ocean, in kg/m^2/s.
 
 * mld - Mixed layer thickness, in m, defined as the depth at which the
-  temperature change from the surface temperature is 0.02 degrees C.
+  temperature change from the surface temperature is 0.2 degrees C.
 
 * mlp - Mixed layer thickness, in m, defined as the depth at which the
-  pressure change from the surface pressure is 0.03 kg/m3.
-
-* qtot - Surface downward heat flux, in w/m2.
+  pressure change from the surface pressure is 0.03 kg/m^3.
+
+* qtot - Surface downward heat flux, in W/m^2.
 
 * ssh - Sea surface height, in m, above the HYCOM reference spheroid.
@@ -3838 +3838 @@
 
 AddArgumentMetadata(HYCOMGLBa008Equatorial3D.__init__, u'variableName',
-    typeMetadata=UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mixed_layer_density', u'mixed_layer_salinity', u'mixed_layer_temperature', u'mixed_layer_thickness', u'mixed_layer_u_velocity', u'mixed_layer_v_velocity', u'qtot', u'ssh', u'surface_boundary_layer_thickness', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True),
+    typeMetadata=UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mld', u'mlp', u'qtot', u'ssh', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True),
     description=_(
 u"""HYCOM 3D variable (dimensions x, y, and time), one of:
 
-* emp - Water flux into the ocean, in kg/m2/s.
-
-* mixed_layer_density - Density of the mixed layer, in sigma units.
-
-* mixed_layer_salinity - Salinity of the mixed layer, in psu.
-
-* mixed_layer_temperature - Temperature of the mixed layer, in degrees
-  C.
-
-* mixed_layer_thickness - Thickness of the mixed layer, in m.
-
-* mixed_layer_u_velocity - Eastward sea water velocity of the mixed
-  layer, in m/s.
-
-* mixed_layer_v_velocity - Northward sea water velocity of the mixed
-  layer, in m/s.
-
-* qtot - Surface downward heat flux, in w/m2.
+* emp - Water flux into the ocean, in kg/m^2/s.
+
+* mld - Mixed layer thickness, in m, defined as the depth at which the
+  temperature change from the surface temperature is 0.2 degrees C.
+
+* mlp - Mixed layer thickness, in m, defined as the depth at which the
+  pressure change from the surface pressure is 0.03 kg/m^3.
+
+* qtot - Surface downward heat flux, in W/m^2.
 
 * ssh - Sea surface height, in m, above the HYCOM reference spheroid.
-
-* surface_boundary_layer_thickness - Thickness of the surface boundary
-  layer, in m.
 
 * surface_salinity_trend - Surface salinity trend, in psu/day.
@@ -4063 +4051 @@
 
 AddArgumentMetadata(HYCOMGLBa008Equatorial3D.InterpolateAtArcGISPoints, u'variableNames',
-    typeMetadata=ListTypeMetadata(elementType=UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mixed_layer_density', u'mixed_layer_salinity', u'mixed_layer_temperature', u'mixed_layer_thickness', u'mixed_layer_u_velocity', u'mixed_layer_v_velocity', u'qtot', u'ssh', u'surface_boundary_layer_thickness', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True), minLength=1),
+    typeMetadata=ListTypeMetadata(elementType=UnicodeStringTypeMetadata(allowedValues=[u'emp', u'mld', u'mlp', u'qtot', u'ssh', u'surface_salinity_trend', u'surface_temperature_trend'], makeLowercase=True), minLength=1),
     description=_(
 u"""HYCOM 3D variables to interpolate:
 
-* emp - Water flux into the ocean, in kg/m2/s.
-
-* mixed_layer_density - Density of the mixed layer, in sigma units.
-
-* mixed_layer_salinity - Salinity of the mixed layer, in psu.
-
-* mixed_layer_temperature - Temperature of the mixed layer, in degrees
-  C.
-
-* mixed_layer_thickness - Thickness of the mixed layer, in m.
-
-* mixed_layer_u_velocity - Eastward sea water velocity of the mixed
-  layer, in m/s.
-
-* mixed_layer_v_velocity - Northward sea water velocity of the mixed
-  layer, in m/s.
-
-* qtot - Surface downward heat flux, in w/m2.
+* emp - Water flux into the ocean, in kg/m^2/s.
+
+* mld - Mixed layer thickness, in m, defined as the depth at which the
+  temperature change from the surface temperature is 0.2 degrees C.
+
+* mlp - Mixed layer thickness, in m, defined as the depth at which the
+  pressure change from the surface pressure is 0.03 kg/m^3.
+
+* qtot - Surface downward heat flux, in W/m^2.
 
 * ssh - Sea surface height, in m, above the HYCOM reference spheroid.
-
-* surface_boundary_layer_thickness - Thickness of the surface boundary
-  layer, in m.
 
 * surface_salinity_trend - Surface salinity trend, in psu/day.