Merge pull request #250 from UV-CDAT/fixSST

Fix sst.  All tests pass on my desktop. There's a problem with Travis' site.

Author: mcenerney1

src/python/computation/units.py

@@ -13,7 +13,7 @@
 # Each value is a synonymous unit which is supported by udunits.
 # NOTES: 'gpm' appears in JRA25_ANN_climo.nc, probably stands for "geopotential meters".
 unit_synonyms = {
-    'mb':'millibar', 'pa':'pascal', 'gpm':'meters'
+    'mb':'millibar', 'pa':'pascal', 'gpm':'meters', 'C':'Celsius'
     }
 
 # Each key of the following dictionary is a unit not supported by udunits in a manner appropriate

src/python/frontend/diags.py

@@ -680,16 +680,13 @@ def makeplots(res, vcanvas, vcanvas2, varid, frname, plot, package, displayunits
                                 logger.warning("multiple displayunits not supported at this time, using: %s" % displayunits[0])
                             displayunits=displayunits[0]
                         try:
-                            scale = udunits(1.0, var.units)
-                            scale = scale.to(displayunits).value
+                            var = convert_units(var,displayunits)
                         except:
                             try:
                                 scale = float(displayunits)
                             except:
                                 logger.critical('Invalid display units: '+ displayunits)
                                 sys.exit()
-                        var = var*scale
-                        var.units = displayunits
                         var.id = '' #this was clearer earlier; var=anything makes an id
 
                     if hasattr(plot, 'customizeTemplates'):

src/python/graphics/default_levels.py

@@ -62,7 +62,8 @@
          'OBS': {'difference': [-6, -5, -4, -3, -2, -1, -0.5, 0, 0.5, 1, 2, 3, 4, 5, 6], 'contours': [0, 0.5, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]}}, 
 'PSL': {'MODEL': {'difference': [-15, -10, -8, -6, -4, -2, -1, 0, 1, 2, 4, 6, 8, 10, 15], 'contours': [984, 988, 992, 996, 1000, 1004, 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040]}, 
         'OBS': {'difference': [-15, -10, -8, -6, -4, -2, -1, 0, 1, 2, 4, 6, 8, 10, 15], 'contours': [984, 988, 992, 996, 1000, 1004, 1008, 1012, 1016, 1020, 1024, 1028, 1032, 1036, 1040]}}, 
-'SST': {'MODEL': {'difference': [-5, -4, -3, -2, -1, -0.5, -0.2, 0, 0.2, 0.5, 1, 2, 3, 4, 5], 'contours': [-1, 0, 1, 3, 6, 9, 12, 15, 18, 20, 22, 24, 26, 28, 29]}, 
+'SST': {'displayunits':'celsius',
+        'MODEL': {'difference': [-5, -4, -3, -2, -1, -0.5, -0.2, 0, 0.2, 0.5, 1, 2, 3, 4, 5], 'contours': [-1, 0, 1, 3, 6, 9, 12, 15, 18, 20, 22, 24, 26, 28, 29]}, 
         'OBS': {'difference': [-5, -4, -3, -2, -1, -0.5, -0.2, 0, 0.2, 0.5, 1, 2, 3, 4, 5], 'contours': [-1, 0, 1, 3, 6, 9, 12, 15, 18, 20, 22, 24, 26, 28, 29]}}, 
 'FLNS': {'MODEL': {'difference': [-70, -50, -40, -30, -20, -10, -5, 0, 5, 10, 20, 30, 40, 50, 70], 'contours': [10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150]}, 
          'OBS': {'difference': [-70, -50, -40, -30, -20, -10, -5, 0, 5, 10, 20, 30, 40, 50, 70], 'contours': [10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150]}}, 
@@ -137,4 +138,4 @@
 'SIWC_226': {'MODEL': {'difference': [-7.0, -6.0, -5.0, -4.0, -3.0, -2.0, -1.0, 0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0], 'contours': [0.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0]}}, 
 'TCLDAREA': {'MODEL': {'difference': [-50, -40, -30, -20, -15, -10, -5, 0, 5, 10, 15, 20, 30, 40, 50], 'contours': [5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 75, 80, 85, 90, 95]}, 
              'OBS': {'difference': [-50, -40, -30, -20, -15, -10, -5, 0, 5, 10, 15, 20, 30, 40, 50], 'contours': [5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 75, 80, 85, 90, 95]}}, 
-'CLW_COSP': {'MODEL': {'difference': [-50, -40, -30, -20, -15, -10, -5, 0, 5, 10, 15, 20, 30, 40, 50], 'contours': [5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 75, 80, 85, 90, 95]}} }
+'CLW_COSP': {'MODEL': {'difference': [-50, -40, -30, -20, -15, -10, -5, 0, 5, 10, 15, 20, 30, 40, 50], 'contours': [5, 10, 15, 20, 25, 30, 40, 50, 60, 70, 75, 80, 85, 90, 95]}} }

src/python/packages/amwg/amwg.py

@@ -149,9 +149,10 @@ def commvar2var( cls, varnom, filetable, season, reduction_function, recurse=Tru
         #print "dbg in commvar2var to compute varnom=",varnom,"from filetable=",filetable
         for svd in cls.common_derived_variables[varnom]:  # loop over ways to compute varnom
             invarnoms = svd.inputs()
-                #print "dbg first round, invarnoms=",invarnoms
-                #print "dbg filetable variables=",filetable.list_variables()
-            if len( set(invarnoms) - set(filetable.list_variables_incl_axes()) )<=0:
+            #print "dbg first round, invarnoms=",invarnoms
+            #print "dbg filetable variables=",filetable.list_variables()
+            if len( (set(invarnoms) - set(filetable.list_variables_incl_axes()))
+                    - set(builtin_variables) )<=0:
                 func = svd._func
                 computable = True
                 break
@@ -172,7 +173,8 @@ def commvar2var( cls, varnom, filetable, season, reduction_function, recurse=Tru
 
         available = rvs + dvs
         availdict = { v.id()[1]:v for v in available }
-        inputs = [ availdict[v].id() for v in svd._inputs if v in availdict] + builtin_variables
+        inputs = [ availdict[v].id() for v in svd._inputs if v in availdict ] +\
+            [ v for v in svd._inputs if v in builtin_variables ]
         #print "dbg1 rvs ids=",[rv.id() for rv in rvs]
         if not computable and recurse==True:
             # Maybe the input variables are themselves computed.  We'll only do this one
@@ -198,10 +200,12 @@ def commvar2var( cls, varnom, filetable, season, reduction_function, recurse=Tru
                 func = svd._func
                 available = rvs + dvs
                 availdict = { v.id()[1]:v for v in available }
-                inputs = [ availdict[v].id() for v in svd._inputs if v in availdict] + builtin_variables
-                computable = True
-                #print "dbg in second round, found",varnom,"computable by",func,"from",inputs
-                break
+                inputs = [ availdict[v].id() for v in svd._inputs if v in availdict ] +\
+                    [ v for v in svd._inputs if v in builtin_variables ]
+                if len( (set(invarnoms) - set( availdict.keys()) -set(builtin_variables) ))<=0:
+                    computable = True
+                    #print "dbg in second round, found",varnom,"computable by",func,"from",inputs
+                    break
         if len(rvs)<=0:
             logger.warning("no inputs found for %s in filetable %s",varnom, filetable.id())
             logger.warning("filetable source files= %s",filetable._filelist[0:10])

src/python/packages/amwg/amwg1.py

@@ -303,7 +303,7 @@ def rmse( self ):
         """ This function computes the rmse and correlation between the model and observations.
         It also scales the data to the units in devel_levels before these computations."""
         from metrics.graphics.default_levels import default_levels
-        from metrics.computation.units import scale_data
+        from metrics.computation.units import convert_variable
         from metrics.computation.compute_rmse import compute_rmse
         #pdb.set_trace()
 
@@ -314,8 +314,8 @@ def rmse( self ):
                 #convert to the units specified in the default levels disctionay
                 displayunits = default_levels[self.var].get('displayunits', None)
                 if displayunits is not None and variable_values[key] is not None:
-                    logger.debug("%s, %s", displayunits, variable_values[key].units)
-                    variable_values[key] = scale_data( displayunits, variable_values[key])
+                    logger.debug("%s, %s", displayunits, getattr(variable_values[key],'units',''))
+                    variable_values[key] = convert_variable( variable_values[key], displayunits )
 
         RMSE = self.undefined
         CORR = self.undefined

src/python/packages/amwg/atmos_derived_vars.py

@@ -72,7 +72,7 @@
             func=aminusb )],
 
     # miscellaneous:
-        'PRECT':[derived_var(
+    'PRECT':[derived_var(
             vid='PRECT', inputs=['pr'], outputs=['PRECT'],
             func=(lambda x:x)),
                  derived_var(