Merge pull request #1060 from UV-CDAT/issue_118_zonal_regrid_esmf_seg_fault

fix #118

Author: aashish24

Packages/cdms2/Lib/avariable.py

@@ -993,6 +993,10 @@ def regrid (self, togrid, missing=None, order=None, mask=None, **keywords):
             if fromgrid.getBounds() is not None and hasattr(regrid2,"ESMFRegrid"):
                 regridTool = 'esmf'
                 regridMethod = 'linear'
+                # Hum ok if only 1 longitude regrid fails, let's check
+                if len(togrid.getLongitude())==1:
+                  # esmf can't deal with this
+                  regridTool   = "regrid2"
 
             # let user override
             userSpecifiesMethod = False

testing/cdms2/CMakeLists.txt

@@ -9,6 +9,10 @@ add_test("test_dim_unlimited"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdms2/test_dim_unlimited.py
     TestCDATLite)
+  add_test("CDMS_Test_Zonal_regrid_Switch_to_Regrid2"
+    "${PYTHON_EXECUTABLE}"
+    ${cdat_SOURCE_DIR}/testing/cdms2/test_regrid_zonal_switch_to_regrid2.py)
+
 add_test("CDMS_Test_01"
     "${PYTHON_EXECUTABLE}"
     ${cdat_SOURCE_DIR}/testing/cdms2/cdtest01.py)

testing/cdms2/test_regrid_zonal_switch_to_regrid2.py

@@ -0,0 +1,10 @@
+import cdms2
+import os,sys
+
+f=cdms2.open(os.path.join(sys.prefix,"sample_data","clt.nc"))
+
+s=f("clt",slice(0,1))
+
+g=cdms2.createGaussianGrid(64)
+gl = cdms2.createZonalGrid(g)
+regridded = s.regrid(gl)