Merge pull request #865 from UV-CDAT/issue_850_mkscale_great_range

fix #850

Author: David Lonie

Packages/vcs/Lib/utils.py

@@ -662,7 +662,6 @@ def minmax(*data) :
   Function : minmax
   Description of Function
     Return the minimum and maximum of a serie of array/list/tuples (or combination of these)
-    Values those absolute value are greater than 1.E20, are masked
     You can combined list/tuples/... pretty much any combination is allowed
     
   Examples of Use
@@ -682,9 +681,8 @@ def minmax(*data) :
   def myfunction(d,mx,mn):
     if d is None:
         return mx,mn
-    from numpy.ma import maximum,minimum,masked_where,absolute,greater,count
+    from numpy.ma import maximum,minimum,count
     try:
-      d=masked_where(greater(absolute(d),9.9E19),d)
       if count(d)==0 : return mx,mn
       mx=float(maximum(mx,float(maximum(d))))
       mn=float(minimum(mn,float(minimum(d))))

testing/vcs/CMakeLists.txt

@@ -20,6 +20,10 @@ add_test(vcs_verify_init
   ${CMAKE_INSTALL_PREFIX}/bin/python
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_init.py
 )
+add_test(vcs_mkscale_great_range
+  ${CMAKE_INSTALL_PREFIX}/bin/python
+  ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_mkscale_great_range.py
+)
 add_test(vcs_verify_boxfill_basics
   ${CMAKE_INSTALL_PREFIX}/bin/python
   ${cdat_SOURCE_DIR}/testing/vcs/test_vcs_boxfill_basics_no_plot.py

testing/vcs/test_vcs_mkscale_great_range.py

@@ -0,0 +1,3 @@
+import vcs,numpy
+
+assert numpy.allclose(vcs.mkscale(0,1.e35,16) , [0.0, 9.9999999999999995e+33, 1.9999999999999999e+34, 2.9999999999999997e+34, 3.9999999999999998e+34, 4.9999999999999998e+34, 5.9999999999999994e+34, 7e+34, 7.9999999999999996e+34, 9.0000000000000001e+34, 9.9999999999999997e+34])