oafuncs 0.0.98.26__py3-none-any.whl → 0.0.98.27__py3-none-any.whl

oafuncs/oa_data.py

@@ -1,18 +1,3 @@
-#!/usr/bin/env python
-# coding=utf-8
-"""
-Author: Liu Kun && 16031215@qq.com
-Date: 2024-09-17 17:12:47
-LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-13 19:11:08
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_data.py
-Description:
-EditPlatform: vscode
-ComputerInfo: XPS 15 9510
-SystemInfo: Windows 11
-Python Version: 3.11
-"""
-
 from typing import Any, List, Union
 
 import numpy as np
@@ -21,7 +6,7 @@ import xarray as xr
 from rich import print
 from scipy.interpolate import interp1d
 
-__all__ = ["interp_along_dim", "interp_2d", "interp_2d_geo", "ensure_list", "mask_shapefile"]
+__all__ = ["interp_along_dim", "interp_2d", "ensure_list", "mask_shapefile"]
 
 
 def ensure_list(input_value: Any) -> List[str]:
@@ -150,8 +135,6 @@ def interp_2d(
         >>> print(result.shape)  # Expected output: (3, 3)
     """
     from ._script.data_interp import interp_2d_func
-    
-    source_data = np.asarray(source_data)
 
     return interp_2d_func(
         target_x_coordinates=target_x_coordinates,
@@ -163,76 +146,6 @@ def interp_2d(
     )
 
 
-def interp_2d_geo(
-    target_x_coordinates: Union[np.ndarray, List[float]],
-    target_y_coordinates: Union[np.ndarray, List[float]],
-    source_x_coordinates: Union[np.ndarray, List[float]],
-    source_y_coordinates: Union[np.ndarray, List[float]],
-    source_data: np.ndarray,
-    use_parallel: bool = True,
-) -> np.ndarray:
-    """
-    使用pyinterp进行地理插值，适用于全球尺度的地理数据与区域数据。
-
-    特点:
-    - 正确处理经度跨越日期线的情况
-    - 自动选择最佳插值策略
-    - 处理规则网格和非规则数据
-    - 支持多维数据并行处理
-
-    Args:
-        target_x_coordinates: 目标点经度 (-180 to 180 或 0 to 360)
-        target_y_coordinates: 目标点纬度 (-90 to 90)
-        source_x_coordinates: 源数据经度 (-180 to 180 或 0 to 360)
-        source_y_coordinates: 源数据纬度 (-90 to 90)
-        source_data: 多维数组，最后两个维度为空间维度
-        interpolation_method: 插值方法: 只会使用 'bicubic' 方法。
-        use_parallel: 是否使用并行处理，默认开启。
-
-    Returns:
-        np.ndarray: 插值后的数据数组
-
-    Examples:
-        >>> # 全球数据插值示例
-        >>> target_lon = np.arange(-180, 181, 1)
-        >>> target_lat = np.arange(-90, 91, 1)
-        >>> source_lon = np.arange(-180, 181, 5)
-        >>> source_lat = np.arange(-90, 91, 5)
-        >>> source_data = np.cos(np.deg2rad(source_lat.reshape(-1, 1))) * np.cos(np.deg2rad(source_lon))
-        >>> result = interp_2d_geo(target_lon, target_lat, source_lon, source_lat, source_data)
-    """
-    # 使用importlib检查pyinterp是否可用，避免直接import导致的警告
-    import importlib.util
-
-    pyinterp_available = importlib.util.find_spec("pyinterp") is not None
-
-    if pyinterp_available:
-        # 只在pyinterp可用时才导入相关模块
-        from ._script.data_interp_geo import interp_2d_func_geo
-
-        return interp_2d_func_geo(
-            target_x_coordinates=target_x_coordinates,
-            target_y_coordinates=target_y_coordinates,
-            source_x_coordinates=source_x_coordinates,
-            source_y_coordinates=source_y_coordinates,
-            source_data=np.array(source_data),
-            use_parallel=use_parallel,
-        )
-    else:
-        print("[yellow]警告: pyinterp模块未安装，无法使用球面坐标插值。尝试使用平面插值作为备选方案。[/yellow]")
-        print("[yellow]推荐使用 pip install pyinterp 安装pyinterp以获得更准确的地理数据插值结果。[/yellow]")
-        try:
-            return interp_2d(
-                target_x_coordinates=target_x_coordinates,
-                target_y_coordinates=target_y_coordinates,
-                source_x_coordinates=source_x_coordinates,
-                source_y_coordinates=source_y_coordinates,
-                source_data=source_data,
-            )
-        except Exception as e:
-            raise ImportError(f"pyinterp不可用且备选插值方法也失败: {e}")
-
-
 def mask_shapefile(
     data_array: np.ndarray,
     longitudes: np.ndarray,

{oafuncs-0.0.98.26.dist-info → oafuncs-0.0.98.27.dist-info}/METADATA

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

{oafuncs-0.0.98.26.dist-info → oafuncs-0.0.98.27.dist-info}/RECORD

@@ -1,6 +1,6 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
 oafuncs/oa_cmap.py,sha256=pUFAGzbIg0WLxObBP2t_--ZIg00Dxdojx0y7OjTeqEo,11551
-oafuncs/oa_data.py,sha256=vjQrCgzNlureBjGk0SK9luKmoPwfwmBsF_gX50xQvHQ,11594
+oafuncs/oa_data.py,sha256=Wp7Yn6n-WNddAp1UtwK5CSEdGSrzzgOH5gtaOHBaxtw,8065
 oafuncs/oa_date.py,sha256=WhM6cyD4G3IeghjLTHhAMtlvJbA7kwQG2sHnxdTgyso,6303
 oafuncs/oa_draw.py,sha256=IaBGDx-EOxyMM2IuJ4zLZt6ruHHV5qFStPItmUOXoWk,17635
 oafuncs/oa_file.py,sha256=j9gXJgPOJsliu4IOUc4bc-luW4yBvQyNCEmMyDVjUwQ,16404
@@ -12,7 +12,6 @@ oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
 oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
 oafuncs/_script/data_interp.py,sha256=EiZbt6n5BEaRKcng88UgX7TFPhKE6TLVZniS01awXjg,5146
-oafuncs/_script/data_interp_geo.py,sha256=5ozhMcTTKiw-182scSvBa2s7EuF43P0tv9rLcQv37kc,7313
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
 oafuncs/_script/netcdf_merge.py,sha256=tM9ePqLiEsE7eIsNM5XjEYeXwxjYOdNz5ejnEuI7xKw,6066
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
@@ -39,8 +38,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.26.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.26.dist-info/METADATA,sha256=jZe0cEvft0kKDqsA46aPF79paC0i7NPSx95QCDNAbVg,4273
-oafuncs-0.0.98.26.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-oafuncs-0.0.98.26.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.26.dist-info/RECORD,,
+oafuncs-0.0.98.27.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.27.dist-info/METADATA,sha256=hz_q6P9Mu1TkhuD9gychMUh7lE9pqMZl50PtKLHYTGo,4273
+oafuncs-0.0.98.27.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+oafuncs-0.0.98.27.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.27.dist-info/RECORD,,

oafuncs/_script/data_interp_geo.py

@@ -1,191 +0,0 @@
-import importlib.util
-from typing import List, Union
-
-import numpy as np
-
-from oafuncs.oa_tool import PEx
-
-# 检查pyinterp是否可用
-pyinterp_available = importlib.util.find_spec("pyinterp") is not None
-
-if pyinterp_available:
-    import pyinterp
-    import pyinterp.backends.xarray as pyxr
-    import xarray as xr
-
-
-def _fill_nan_with_nearest(data: np.ndarray, source_lons: np.ndarray, source_lats: np.ndarray) -> np.ndarray:
-    """
-    使用最近邻方法填充NaN值，适合地理数据。
-    """
-    if not np.isnan(data).any():
-        return data
-
-    # 创建掩码，区分有效值和NaN值
-    mask = ~np.isnan(data)
-    if not np.any(mask):
-        return data  # 全是NaN，无法填充
-
-    # 使用pyinterp的RTree进行最近邻插值填充NaN
-    try:
-        if not pyinterp_available:
-            raise ImportError("pyinterp not available")
-
-        # 获取有效数据点的位置和值
-        valid_points = np.column_stack((source_lons[mask].ravel(), source_lats[mask].ravel()))
-        valid_values = data[mask].ravel()
-
-        # 创建RTree
-        tree = pyinterp.RTree()
-        tree.insert(valid_points.astype(np.float64), valid_values.astype(np.float64))
-
-        # 获取所有点的坐标
-        all_points = np.column_stack((source_lons.ravel(), source_lats.ravel()))
-
-        # 最近邻插值
-        filled_values = tree.query(all_points[:, 0], all_points[:, 1], k=1)
-
-        return filled_values.reshape(data.shape)
-
-    except Exception:
-        # 备选方案：使用scipy的最近邻
-        from scipy.interpolate import NearestNDInterpolator
-
-        points = np.column_stack((source_lons[mask].ravel(), source_lats[mask].ravel()))
-        values = data[mask].ravel()
-
-        if len(values) > 0:
-            interp = NearestNDInterpolator(points, values)
-            return interp(source_lons.ravel(), source_lats.ravel()).reshape(data.shape)
-        else:
-            return data  # 无有效值可用于填充
-
-
-def _interp_single_worker(*args):
-    """
-    单slice插值worker，只使用pyinterp的bicubic方法，失败直接报错。
-    参数: data_slice, source_lons, source_lats, target_lons, target_lats
-    """
-    if not pyinterp_available:
-        raise ImportError("pyinterp package is required for geographic interpolation")
-
-    data_slice, source_lons, source_lats, target_lons, target_lats = args
-
-    # 预处理：填充NaN值以确保数据完整
-    if np.isnan(data_slice).any():
-        data_filled = _fill_nan_with_nearest(data_slice, source_lons, source_lats)
-    else:
-        data_filled = data_slice
-
-    # 创建xarray DataArray
-    
-    da = xr.DataArray(
-        data_filled,
-        coords={"lat": source_lats, "lon": source_lons},
-        dims=("lat", "lon"),
-    )
-
-    # 创建Grid2D对象
-    grid = pyxr.Grid2D(da)
-
-    # 使用bicubic方法插值
-    result = grid.bicubic(coords={"lon": target_lons.flatten(), "lat": target_lats.flatten()}, bounds_error=False, num_threads=1).reshape(target_lons.shape)
-
-    return result
-
-
-def interp_2d_func_geo(
-    target_x_coordinates: Union[np.ndarray, List[float]],
-    target_y_coordinates: Union[np.ndarray, List[float]],
-    source_x_coordinates: Union[np.ndarray, List[float]],
-    source_y_coordinates: Union[np.ndarray, List[float]],
-    source_data: np.ndarray,
-    use_parallel: bool = True,
-) -> np.ndarray:
-    """
-    使用pyinterp进行地理插值，只使用bicubic方法。
-
-    Args:
-        target_x_coordinates: 目标点经度 (-180 to 180 或 0 to 360)
-        target_y_coordinates: 目标点纬度 (-90 to 90)
-        source_x_coordinates: 源数据经度 (-180 to 180 或 0 to 360)
-        source_y_coordinates: 源数据纬度 (-90 to 90)
-        source_data: 多维数组，最后两个维度为空间维度
-
-    Returns:
-        np.ndarray: 插值后的数据数组
-    """
-    if not pyinterp_available:
-        raise ImportError("pyinterp package is required for geographic interpolation")
-
-    # 验证纬度范围
-    if np.nanmin(target_y_coordinates) < -90 or np.nanmax(target_y_coordinates) > 90:
-        raise ValueError("Target latitude must be in range [-90, 90].")
-    if np.nanmin(source_y_coordinates) < -90 or np.nanmax(source_y_coordinates) > 90:
-        raise ValueError("Source latitude must be in range [-90, 90].")
-
-    # 确保使用numpy数组
-    source_x_coordinates = np.array(source_x_coordinates)
-    source_y_coordinates = np.array(source_y_coordinates)
-    target_x_coordinates = np.array(target_x_coordinates)
-    target_y_coordinates = np.array(target_y_coordinates)
-
-    # 创建网格坐标（如果是一维的）
-    if source_x_coordinates.ndim == 1:
-        source_x_coordinates, source_y_coordinates = np.meshgrid(source_x_coordinates, source_y_coordinates)
-    if target_x_coordinates.ndim == 1:
-        target_x_coordinates, target_y_coordinates = np.meshgrid(target_x_coordinates, target_y_coordinates)
-
-    # 验证源数据形状
-    if source_x_coordinates.shape != source_data.shape[-2:] or source_y_coordinates.shape != source_data.shape[-2:]:
-        raise ValueError("Shape of source_data does not match shape of source_x_coordinates or source_y_coordinates.")
-
-    # 处理多维数据
-    data_dims = source_data.ndim
-    if data_dims < 2:
-        raise ValueError(f"Source data must have at least 2 dimensions, but got {data_dims}.")
-    elif data_dims > 4:
-        raise ValueError(f"Source data has {data_dims} dimensions, but this function currently supports up to 4.")
-
-    # 扩展到4D
-    num_dims_to_add = 4 - data_dims
-    source_data = source_data.reshape((1,) * num_dims_to_add + source_data.shape)
-    t, z, y, x = source_data.shape
-
-    if use_parallel:
-        # 准备并行处理参数
-        params = []
-        for t_index in range(t):
-            for z_index in range(z):
-                params.append(
-                    (
-                        source_data[t_index, z_index],
-                        source_x_coordinates[0, :],  # 假设经度在每行都相同
-                        source_y_coordinates[:, 0],  # 假设纬度在每列都相同
-                        target_x_coordinates,
-                        target_y_coordinates,
-                    )
-                )
-
-        # 并行执行插值
-        with PEx() as executor:
-            results = executor.run(_interp_single_worker, params)
-
-        # 还原到原始维度
-        return np.squeeze(np.array(results).reshape((t, z) + target_x_coordinates.shape))
-    else:
-        # 单线程处理
-        results = []
-        for t_index in range(t):
-            for z_index in range(z):
-                result = _interp_single_worker(
-                    source_data[t_index, z_index],
-                    source_x_coordinates[0, :],  # 假设经度在每行都相同
-                    source_y_coordinates[:, 0],  # 假设纬度在每列都相同
-                    target_x_coordinates,
-                    target_y_coordinates,
-                )
-                results.append(result)
-
-        # 还原到原始维度
-        return np.squeeze(np.array(results).reshape((t, z) + target_x_coordinates.shape))