oafuncs 0.0.98.17__py3-none-any.whl → 0.0.98.19__py3-none-any.whl

oafuncs/_script/data_interp.py

@@ -1,4 +1,3 @@
-import importlib.util
 from typing import List, Union
 
 import numpy as np
@@ -6,85 +5,6 @@ from scipy.interpolate import griddata
 
 from oafuncs.oa_tool import PEx
 
-# 检查 pykdtree 是否可用
-_has_pykdtree = importlib.util.find_spec("pykdtree.kdtree") is not None
-
-
-def _fill_nan_nearest(arr: np.ndarray) -> np.ndarray:
-    """
-    用最近邻填充 NaN（只支持2D数组）
-    """
-    # 基础检查：如果输入为None，直接返回None
-    if arr is None:
-        return None
-
-    # 确保是2D ndarray
-    arr = np.asarray(arr)
-    if arr.ndim != 2:
-        raise ValueError(f"_fill_nan_nearest 只支持2D数组，但输入的维度是 {arr.ndim}")
-
-    # 保存原始dtype并转为float
-    orig_dtype = arr.dtype
-    arr = arr.astype(float, copy=True)  # 使用copy=True确保不修改原数据
-
-    # 检查是否有NaN需要填充
-    mask = np.isnan(arr)
-    if not mask.any():
-        return arr.copy()
-
-    try:
-        valid = np.array(np.where(~mask)).T
-        invalid = np.array(np.where(mask)).T
-
-        # 如果有效点为空，直接返回原数据
-        if valid.shape[0] == 0:
-            return arr.copy()
-
-        # 使用KDTree进行最近邻填充
-        if _has_pykdtree:
-            from pykdtree.kdtree import KDTree
-
-            tree = KDTree(valid)
-            _, idx = tree.query(invalid, k=1)
-            filled = arr.copy()
-            filled[tuple(invalid.T)] = arr[tuple(valid[idx.flatten()].T)]
-        else:
-            # 备用方法：使用scipy的distance_transform_edt
-            from scipy.ndimage import distance_transform_edt
-
-            idx = distance_transform_edt(mask, return_distances=False, return_indices=True)
-            filled = arr[tuple(idx)]
-
-        return filled.astype(orig_dtype)
-    except Exception as e:
-        import warnings
-
-        warnings.warn(f"Error in _fill_nan_nearest: {e}, shape={arr.shape}")
-        return arr.copy()  # 发生异常返回原始数据
-
-
-def _data_clip(data: np.ndarray, data_min, data_max) -> np.ndarray:
-    """
-    将数据裁剪至 [data_min, data_max]，超出或 NaN 用最近邻填补。
-    支持 1~4D。
-    """
-    arr = np.array(data, copy=True)  # 使用副本避免修改原数据
-    ndims = arr.ndim
-    if ndims != 2:
-        raise ValueError(f"_data_clip 只支持1~4维数组，但输入的维度是 {ndims}")
-    dtype = arr.dtype
-
-    # 检查是否需要裁剪
-    mask = np.isnan(arr) | (arr < data_min) | (arr > data_max)
-    if not np.any(mask):
-        return arr.astype(dtype)
-
-    # 将超出范围的值设为NaN
-    arr[mask] = np.nan
-
-    return _fill_nan_nearest(arr).astype(dtype)
-
-
 
 def _interp_single_worker(*args):
     """
@@ -104,10 +24,6 @@ def _interp_single_worker(*args):
     result = griddata(valid_points, valid_data, target_points, method=interpolation_method)
     result = result.reshape(target_shape)
 
-    # 第二步：用data_clip裁剪并填充
-    data_min, data_max = np.nanmin(data_slice), np.nanmax(data_slice)
-    result = _data_clip(result, data_min, data_max)
-
     return result
 
 

oafuncs/oa_data.py

@@ -23,7 +23,7 @@ from rich import print
 from scipy.interpolate import interp1d
 
 
-__all__ = ["interp_along_dim", "interp_2d", "ensure_list", "mask_shapefile", "data_clip"]
+__all__ = ["interp_along_dim", "interp_2d", "ensure_list", "mask_shapefile"]
 
 
 def ensure_list(input_value: Any) -> List[str]:
@@ -114,11 +114,6 @@ def interp_along_dim(
     return np.apply_along_axis(apply_interp_extrap, interpolation_axis, source_data)
 
 
-def data_clip(data: np.ndarray, data_min: float, data_max: float) -> np.ndarray:
-    from ._script.data_interp import _data_clip
-    _data_clip(data, data_min, data_max)
-
-
 def interp_2d(
     target_x_coordinates: Union[np.ndarray, List[float]],
     target_y_coordinates: Union[np.ndarray, List[float]],

{oafuncs-0.0.98.17.dist-info → oafuncs-0.0.98.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oafuncs
-Version: 0.0.98.17
+Version: 0.0.98.19
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.98.17.dist-info → oafuncs-0.0.98.19.dist-info}/RECORD

@@ -1,6 +1,6 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=DimWT4Bg7uE5Lx8hSw1REp7whpsR2pFRStAwk1cowEM,11494
-oafuncs/oa_data.py,sha256=NOp7Rmjjypb17CNjk3Ksz08R7LygCEP6K4mna9mSXa8,8626
+oafuncs/oa_data.py,sha256=y11xxaVNZ6_eveVjSG4PisRXYpKr_FFsBBh0mj_ss2g,8436
 oafuncs/oa_date.py,sha256=WhM6cyD4G3IeghjLTHhAMtlvJbA7kwQG2sHnxdTgyso,6303
 oafuncs/oa_draw.py,sha256=Wj2QBgyIPpV_dxaDrH10jqj_puK9ZM9rd-si-3VrsrE,17631
 oafuncs/oa_file.py,sha256=j9gXJgPOJsliu4IOUc4bc-luW4yBvQyNCEmMyDVjUwQ,16404
@@ -11,7 +11,7 @@ oafuncs/oa_tool.py,sha256=rpPkLqWhqMmqlCc5wjL8qMTg3gThCkSrYJckbX_0iJc,8631
 oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945710
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
 oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
-oafuncs/_script/data_interp.py,sha256=_k8EMSiFxutrqEVTLsL4mEPE6ssYq8bzmBlksCZ9nAE,7428
+oafuncs/_script/data_interp.py,sha256=KJ-p-UN3Op1MmtCoN4KdjFVHFE3GNHrTD3vBjzaYSjQ,4688
 oafuncs/_script/data_interp_geo.py,sha256=X89KxLYhpltWi0Sf96gIhBL3r1M5aExd_JCmgBmmvUc,3742
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
 oafuncs/_script/netcdf_merge.py,sha256=9hCyxfeUHnBzs50_0v0jzVfxpMxTX4dNTo0pmsp_T6g,4226
@@ -39,8 +39,8 @@ oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,5
 oafuncs/oa_sign/meteorological.py,sha256=8091SHo2L8kl4dCFmmSH5NGVHDku5i5lSiLEG5DLnOQ,6489
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
-oafuncs-0.0.98.17.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.17.dist-info/METADATA,sha256=8-0Gp7bgVD7qR4sfSQtKmoCl5yV8f7YBnEROZV28oJY,4273
-oafuncs-0.0.98.17.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-oafuncs-0.0.98.17.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.17.dist-info/RECORD,,
+oafuncs-0.0.98.19.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.19.dist-info/METADATA,sha256=PJ_1BA6QOeA2QHSb61jwOFA2pDD2H4QT--m3tf_f44I,4273
+oafuncs-0.0.98.19.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+oafuncs-0.0.98.19.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.19.dist-info/RECORD,,