Merge pull request #860 from UV-CDAT/issue_628_regridder_regird2_mthod_gens_nan

Issue 628 regridder regird2 mthod gens nan

Author: David Lonie

Packages/cdms2/Lib/tvariable.py

@@ -73,6 +73,7 @@ def ascontiguousarray(self):
             m= numpy.ascontiguousarray(m)
         out = TransientVariable(out,mask=m,attributes=self.attributes)
         out.setAxisList(self.getAxisList())
+        out.setMissing(self.getMissing())
         return out
 
     ascontiguous = ascontiguousarray

testing/cdms2/CMakeLists.txt

@@ -1,6 +1,10 @@
 
 # cdms2 tests
 
+add_test("test_ascontiguous_regrid_nan_issue"
+  ${CMAKE_INSTALL_PREFIX}/bin/python
+  ${cdat_SOURCE_DIR}/testing/cdms2/test_ascontiguous_regrid_nan_issue.py
+  )
 add_test("test_dim_unlimited"
     ${CMAKE_INSTALL_PREFIX}/bin/python 
     ${cdat_SOURCE_DIR}/testing/cdms2/test_dim_unlimited.py

testing/cdms2/test_ascontiguous_regrid_nan_issue.py

@@ -0,0 +1,34 @@
+import cdms2,MV2,regrid2,cdutil
+
+
+a=MV2.reshape(MV2.sin(MV2.arange(20000)),(2,1,100,100))
+
+lon=cdms2.createAxis(MV2.arange(100)*3.6)
+lon.designateLongitude()
+lon.units="degrees_east"
+lon.id="longitude"
+
+lat = cdms2.createAxis(MV2.arange(100)*1.8-90.)
+lat.id="latitude"
+lat.designateLatitude()
+lat.units="degrees_north"
+
+lev = cdms2.createAxis([1000.])
+lev.id="plev"
+lev.designateLevel()
+lev.units="hPa"
+
+t=cdms2.createAxis([0,31.])
+t.id="time"
+t.designateTime()
+t.units="days since 2014"
+
+cdutil.setTimeBoundsMonthly(t)
+a.setAxisList((t,lev,lat,lon))
+a=MV2.masked_less(a,.5)
+grd=cdms2.createGaussianGrid(64)
+
+a=a.ascontiguous()
+a=a.regrid(grd,regridTool="regrid2")
+a=cdutil.averager(a,axis='txy')
+assert a[0]==0.7921019540305255