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

oafuncs/_script/data_interp_geo.py

@@ -78,17 +78,18 @@ def _interp_single_worker(*args):
         data_filled = data_slice
 
     # 创建xarray DataArray
+    
     da = xr.DataArray(
         data_filled,
-        coords={"latitude": source_lats, "longitude": source_lons},
-        dims=("latitude", "longitude"),
+        coords={"lat": source_lats, "lon": source_lons},
+        dims=("lat", "lon"),
     )
 
     # 创建Grid2D对象
     grid = pyxr.Grid2D(da)
 
     # 使用bicubic方法插值
-    result = grid.bicubic(coords={"longitude": target_lons.ravel(), "latitude": target_lats.ravel()}, bounds_error=False, num_threads=1).reshape(target_lons.shape)
+    result = grid.bicubic(coords={"lon": target_lons.flatten(), "lat": target_lats.flatten()}, bounds_error=False, num_threads=1).reshape(target_lons.shape)
 
     return result
 
@@ -99,6 +100,7 @@ def interp_2d_func_geo(
     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方法。
@@ -150,23 +152,40 @@ def interp_2d_func_geo(
     source_data = source_data.reshape((1,) * num_dims_to_add + source_data.shape)
     t, z, y, x = source_data.shape
 
-    # 准备并行处理参数
-    params = []
-    for t_index in range(t):
-        for z_index in range(z):
-            params.append(
-                (
+    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,
                 )
-            )
-
-    # 并行执行插值
-    with PEx() as executor:
-        results = executor.run(_interp_single_worker, params)
+                results.append(result)
 
-    # 还原到原始维度
-    return np.squeeze(np.array(results).reshape((t, z) + target_x_coordinates.shape))
+        # 还原到原始维度
+        return np.squeeze(np.array(results).reshape((t, z) + target_x_coordinates.shape))

oafuncs/oa_data.py

@@ -150,6 +150,8 @@ 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,
@@ -167,6 +169,7 @@ def interp_2d_geo(
     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进行地理插值，适用于全球尺度的地理数据与区域数据。
@@ -184,6 +187,7 @@ def interp_2d_geo(
         source_y_coordinates: 源数据纬度 (-90 to 90)
         source_data: 多维数组，最后两个维度为空间维度
         interpolation_method: 插值方法: 只会使用 'bicubic' 方法。
+        use_parallel: 是否使用并行处理，默认开启。
 
     Returns:
         np.ndarray: 插值后的数据数组
@@ -211,7 +215,8 @@ def interp_2d_geo(
             target_y_coordinates=target_y_coordinates,
             source_x_coordinates=source_x_coordinates,
             source_y_coordinates=source_y_coordinates,
-            source_data=source_data,
+            source_data=np.array(source_data),
+            use_parallel=use_parallel,
         )
     else:
         print("[yellow]警告: pyinterp模块未安装，无法使用球面坐标插值。尝试使用平面插值作为备选方案。[/yellow]")

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

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

{oafuncs-0.0.98.24.dist-info → oafuncs-0.0.98.26.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=QiIDwAy0Gqvv-ulWFcMk0nND81GU3Cf_xgGJtJ7p2mc,11397
+oafuncs/oa_data.py,sha256=vjQrCgzNlureBjGk0SK9luKmoPwfwmBsF_gX50xQvHQ,11594
 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,7 @@ 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=edddYkI2D0X8VIIrVUILz7cBXnosbmV8wZehp3w04Jw,6540
+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 +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.24.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.24.dist-info/METADATA,sha256=ZeGzkxArxlWU9YOHhouWFTTNffZrZVY64OrqNxXKQTc,4273
-oafuncs-0.0.98.24.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-oafuncs-0.0.98.24.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.24.dist-info/RECORD,,
+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,,