added support for esmpy instead of ESMF

geocryology · Mar 6, 2024 · 893882f · 893882f
1 parent b106b84
commit 893882f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/globsim/interpolate/ERAIinterpolate.py b/globsim/interpolate/ERAIinterpolate.py
@@ -14,13 +14,18 @@
 
 try:
     import ESMF
+
     # Check ESMF version.  7.0.1 behaves differently than 7.1.0r
     ESMFv = int(re.sub("[^0-9]", "", ESMF.__version__))
     ESMFnew = ESMFv > 701
 
-except ImportError:
-    print("*** ESMF not imported, interpolation not possible. ***")
-    pass
+except ModuleNotFoundError:
+        print("*** ESMF not imported, trying esmpy. ***")
+        try:
+            import esmpy as ESMF
+        except ImportError:
+            print('Could not import ESMF or esmpy')
+            pass
 
 
 class ERAIinterpolate(GenericInterpolate):

diff --git a/globsim/interpolate/GenericInterpolate.py b/globsim/interpolate/GenericInterpolate.py
@@ -26,10 +26,13 @@
     ESMFv = int(re.sub("[^0-9]", "", ESMF.__version__))
     ESMFnew = ESMFv > 701
 
-except ImportError:
-    print("*** ESMF not imported, interpolation not possible. ***")
-    pass
-
+except ModuleNotFoundError:
+        print("*** ESMF not imported, trying esmpy. ***")
+        try:
+            import esmpy as ESMF
+        except ImportError:
+            print('Could not import ESMF or esmpy')
+            pass
 
 class GenericInterpolate:
 

diff --git a/globsim/interpolate/create_grid_helper.py b/globsim/interpolate/create_grid_helper.py
@@ -1,5 +1,20 @@
-import ESMF
 import numpy as np
+import re
+
+try:
+    import ESMF
+
+    # Check ESMF version.  7.0.1 behaves differently than 7.1.0r
+    ESMFv = int(re.sub("[^0-9]", "", ESMF.__version__))
+    ESMFnew = ESMFv > 701
+
+except ModuleNotFoundError:
+        print("*** ESMF not imported, trying esmpy. ***")
+        try:
+            import esmpy as ESMF
+        except ImportError:
+            print('Could not import ESMF or esmpy')
+            pass
 
 from globsim.boundingbox import BoundingBox