Merge pull request #93 from kthyng/updates_select_interp

Updates select interp
axiom-data-science · Sep 13, 2023 · cd004a4 · cd004a4
2 parents 45faaf4 + aa5a819
commit cd004a4
Show file tree

Hide file tree

Showing 10 changed files with 1,011 additions and 383 deletions.
diff --git a/docs/whats_new.rst b/docs/whats_new.rst
@@ -1,6 +1,11 @@
 :mod:`What's New`
 -----------------
 
+v1.2.0 (September 13, 2023)
+===========================
+* Improvements to interpolation
+
+
 v1.1.4 (January 27, 2023)
 =========================
 * fixed docs to run fully

diff --git a/extract_model/__init__.py b/extract_model/__init__.py
@@ -9,7 +9,8 @@
 import extract_model.accessor  # noqa: F401
 
 from .extract_model import sel2d, sel2dcf, select, selZ  # noqa: F401
-from .utils import filter, order, preprocess, sub_bbox, sub_grid  # noqa: F401
+from .preprocessing import preprocess
+from .utils import filter, guess_model_type, order, sub_bbox, sub_grid  # noqa: F401
 
 
 try:

diff --git a/extract_model/accessor.py b/extract_model/accessor.py
@@ -262,28 +262,34 @@ def interp2d(
                 latitude=lats,
                 locstream=locstream,
                 weights=weights,
+                horizontal_interp=True,
+                horizontal_interp_code="xesmf",
                 iT=iT,
                 T=T,
                 iZ=iZ,
                 Z=Z,
                 extrap=extrap,
                 extrap_val=extrap_val,
+                return_info=True,
             )
         else:
-            da, weights = em.select(
+            da, kwargs_out = em.select(
                 self.da.to_dataset(),
                 longitude=lons,
                 latitude=lats,
                 locstream=locstream,
                 weights=weights,
+                horizontal_interp=True,
+                horizontal_interp_code="xesmf",
                 iT=iT,
                 T=T,
                 iZ=iZ,
                 Z=Z,
                 extrap=extrap,
                 extrap_val=extrap_val,
+                return_info=True,
             )
-            self.weights_map[hashenc] = weights
+            self.weights_map[hashenc] = kwargs_out["weights"]
 
         return da[varname]