Merge pull request #861 from UV-CDAT/issue_757_averager_0d_issue

Issue 757 averager 0d issue

Author: David Lonie

Packages/cdms2/Lib/MV2.py

@@ -402,7 +402,12 @@ def average (a, axis=None, weights=None, returned=False):
     ta = _makeMaskedArg(a)
     maresult = numpy.ma.average(ta, axis, weights, returned)
     axes, attributes, id, grid = _extractMetadata(a, omit=axis, omitall=(axis is None))
-    if returned: maresult, wresult = maresult
+    if returned:
+      if isinstance(maresult,tuple):
+        maresult, wresult = maresult
+      else:
+        #ok it's masked constant need to return both things by hand
+        wresult = numpy.ma.masked
     F=getattr(a,"fill_value",1.e20)
     r1 = TransientVariable(maresult, axes=axes, attributes=attributes, grid=grid, id=id,no_update_from=True, fill_value=F)
     if returned:

testing/cdms2/CMakeLists.txt

@@ -112,6 +112,11 @@ add_test("CDMS_asdatetime"
   ${CMAKE_INSTALL_PREFIX}/bin/python
   ${cdat_SOURCE_DIR}/testing/cdms2/test_cdms2_axis_as_datetime.py)
 
+add_test("test_cdms2_full_averagering_full_missing"
+  ${CMAKE_INSTALL_PREFIX}/bin/python
+  ${cdat_SOURCE_DIR}/testing/cdms2/test_full_averaging.py
+  )
+
 # Tests which should fail
 # set_tests_properties(testSo2TasACCESSFails PROPERTIES PASS_REGULAR_EXPRESSION "FAILED")
 

testing/cdms2/test_full_averaging.py

@@ -0,0 +1,9 @@
+import cdutil,MV2
+import cdms2,numpy
+
+cdms2.setAutoBounds("on")
+
+
+a = MV2.masked_greater(MV2.array([1,4,5,6,7,8,9.]),.5)
+
+assert numpy.ma.is_masked(cdutil.averager(a))