oafuncs 0.0.94__py2.py3-none-any.whl → 0.0.96__py2.py3-none-any.whl

oafuncs/oa_data.py

@@ -18,10 +18,11 @@ import multiprocessing as mp
 from concurrent.futures import ThreadPoolExecutor
 
 import numpy as np
+import xarray as xr
 from scipy.interpolate import griddata
+import salem
 
-
-__all__ = ["interp_2d", "ensure_list"]
+__all__ = ["interp_2d", "ensure_list", "mask_shapefile"]
 
 
 def ensure_list(input_data):
@@ -44,7 +45,6 @@ def ensure_list(input_data):
         return [str(input_data)]
 
 
-
 def interp_2d(target_x, target_y, origin_x, origin_y, data, method="linear", parallel=True):
     """
     Perform 2D interpolation on the last two dimensions of a multi-dimensional array.
@@ -87,6 +87,8 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method="linear", par
         raise ValueError("Shape of data does not match shape of origin_x or origin_y.")
 
     # 创建网格和展平数据
+    target_x, target_y = np.array(target_x), np.array(target_y)
+    origin_x, origin_y = np.array(origin_x), np.array(origin_y)
     target_points = np.column_stack((target_y.ravel(), target_x.ravel()))
     origin_points = np.column_stack((origin_y.ravel(), origin_x.ravel()))
 
@@ -109,12 +111,38 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method="linear", par
         elif len(data.shape) == 4:
             interpolated_data = np.stack([np.stack([interp_single(data[i, j], target_points, origin_points, method) for j in range(data.shape[1])]) for i in range(data.shape[0])])
 
-    return np.array(interpolated_data)
+    return np.squeeze(np.array(interpolated_data))
+
 
+def mask_shapefile(data: np.ndarray, lons: np.ndarray, lats: np.ndarray, shapefile_path: str) -> xr.DataArray:
+    """
+    Masks a 2D data array using a shapefile.
 
+    Parameters:
+    - data: 2D numpy array of data to be masked.
+    - lons: 1D numpy array of longitudes.
+    - lats: 1D numpy array of latitudes.
+    - shapefile_path: Path to the shapefile used for masking.
+
+    Returns:
+    - Masked xarray DataArray.
+    """
+    """
+    https://cloud.tencent.com/developer/article/1701896
+    """
+    try:
+        # import geopandas as gpd
+        # shp_f = gpd.read_file(shapefile_path)
+        shp_f = salem.read_shapefile(shapefile_path)
+        data_da = xr.DataArray(data, coords=[("latitude", lats), ("longitude", lons)])
+        masked_data = data_da.salem.roi(shape=shp_f)
+        return masked_data
+    except Exception as e:
+        print(f"An error occurred: {e}")
+        return None
 
-if __name__ == "__main__":
 
+if __name__ == "__main__":
     pass
     """ import time
 

oafuncs/oa_down/hycom_3hourly.py

@@ -536,8 +536,10 @@ def _get_base_url(dataset_name, version_name, var, ymdh_str):
             mdh_str = ymdh_str[4:]
             # GLBy0.08 93.0
             # data time range in each year: year-01-01 12:00 to year+1-01-01 09:00
-            if mdh_str <= "010109":
+            if "010100" <= mdh_str <= "010109":
                 year_str = int(ymdh_str[:4]) - 1
+            else:
+                year_str = int(ymdh_str[:4])
         base_url = None
         for key, value in var_group.items():
             if var in value:
@@ -547,6 +549,13 @@ def _get_base_url(dataset_name, version_name, var, ymdh_str):
             print("Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]")
     elif classification_method == "single_var_year_different":
         base_url = None
+        if dataset_name == "ESPC_D" and version_name == "V02":
+            mdh_str = ymdh_str[4:]
+            # ESPC-D-V02
+            if "010100" <= mdh_str <= "010109":
+                year_str = int(ymdh_str[:4]) - 1
+            else:
+                year_str = int(ymdh_str[:4])
         for key, value in single_var_group.items():
             if var in value:
                 base_url = url_dict[key][str(year_str)]
@@ -1276,9 +1285,9 @@ if __name__ == "__main__":
 
     options = {
         "var": var_list,
-        "time_s": "2018010100",
-        "time_e": "2020123121",
-        "store_path": r"F:\Data\HYCOM\3hourly",
+        "time_s": "2025010300",
+        "time_e": "2025010321",
+        "store_path": r"I:\Data\HYCOM\3hourly",
         "lon_min": 105,
         "lon_max": 130,
         "lat_min": 15,
@@ -1289,7 +1298,7 @@ if __name__ == "__main__":
         "level": None,  # or 1-40 levels
         "ftimes": 1,
         # "idm_engine": r"D:\Programs\Internet Download Manager\IDMan.exe",  # 查漏补缺不建议开启
-        "fill_time": False,
+        "fill_time": None,
     }
 
     if single_var:

oafuncs/oa_nc.py

@@ -254,13 +254,13 @@ def merge(file_list, var_name=None, dim_name=None, target_filename=None):
 
     merged_data = xr.Dataset(merged_data)
 
-    print("Writing data to file ...")
+    print("\nWriting data to file ...")
     if os.path.exists(target_filename):
         print("Warning: The target file already exists.")
         print("Removing existing file ...")
         os.remove(target_filename)
     merged_data.to_netcdf(target_filename)
-    print(f'File "{target_filename}" has been created.')
+    print(f'\nFile "{target_filename}" has been created.')
 
 
 def _modify_var(nc_file_path, variable_name, new_value):

{oafuncs-0.0.94.dist-info → oafuncs-0.0.96.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oafuncs
-Version: 0.0.94
+Version: 0.0.96
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -27,9 +27,12 @@ Requires-Dist: pathlib
 Requires-Dist: requests
 Requires-Dist: bs4
 Requires-Dist: matplotlib
-Requires-Dist: Cartopy
 Requires-Dist: netCDF4
 Requires-Dist: xlrd
+Requires-Dist: geopandas
+Requires-Dist: Cartopy
+Requires-Dist: rasterio
+Requires-Dist: salem
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{oafuncs-0.0.94.dist-info → oafuncs-0.0.96.dist-info}/RECORD

@@ -1,15 +1,15 @@
 oafuncs/__init__.py,sha256=glcIlhQ9xSK4WtL58dq7Od2S3JPqsuEyhUQ-VWO8hOc,1426
 oafuncs/oa_cmap.py,sha256=azVg9QR_IlG9lXCCXXVs1LS1kFci8yjxDmb_VA_TdTQ,7408
-oafuncs/oa_data.py,sha256=40cZsixCaMDW2kg8kzh60bvD9PPPFn9ZXlQuPr7QhpQ,6563
+oafuncs/oa_data.py,sha256=Skhi70IY7T4lHd_eu3BxcSAfpXMH8SzUURR8gB7bj74,7679
 oafuncs/oa_draw.py,sha256=QypQp4vJIrbAyFddEVxd9K9Q4d85PRYqYQi9xDUmSZw,11150
 oafuncs/oa_file.py,sha256=EUL9osp7scZ3JTCwTUlKNfS1d_9xOsFrIkmFxzZAbdg,14233
 oafuncs/oa_help.py,sha256=loyzTbjU_0VpSIBvAEUA_tqxG8MVsO0xFE_2hgQ3zMw,4188
-oafuncs/oa_nc.py,sha256=pdc3vEI-5uFYnyzXHAIHNlyeci4MJkeWgKJwjHJ3olI,18343
+oafuncs/oa_nc.py,sha256=SHjpGziWTIwzUHv4R5HaxL-7BC9j3y9XLThcbCD5bvc,18347
 oafuncs/oa_python.py,sha256=Q-6UGGw_dJff7Ef8i87fsLPoGeHV5jBzfb-7HP4THR0,4018
-oafuncs/data_store/OAFuncs.png,sha256=Cc0TDi9H5mWBporXYw9K0bUWC0oSsI-Qj3FGAXUtGKM,3332020
+oafuncs/data_store/OAFuncs.png,sha256=y1_x-mUP3gFjcy6m8FqfvQO_HgjzPhQKfXjnSHjslZE,3436152
 oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=kRX5eTUCbAiz3zTaQM1501paOYS_3fizDN4Pa0mtNUA,585
-oafuncs/oa_down/hycom_3hourly.py,sha256=9ge6l8xMB-VBzCd1Fr4pIDZfUY_PbrBkWyvur0V27bs,64941
+oafuncs/oa_down/hycom_3hourly.py,sha256=lCdbYQd7o_2jMgwmbrClNo5omrj5b5cnWnp6lnXMloQ,65307
 oafuncs/oa_down/hycom_3hourly_20250129.py,sha256=zbUp5NNBMzDXEqSC0-Z9H_EoM6Fg-6tXymK0AXH9qRk,65553
 oafuncs/oa_down/idm.py,sha256=XfYCNnQWADxOhhJd-T8sNYN0nGiRrAs7zbQcsB5-UmI,1668
 oafuncs/oa_down/literature.py,sha256=2bF9gSKQbzcci9LcKE81j8JEjIJwON7jbwQB3gDDA3E,11331
@@ -22,8 +22,8 @@ oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw
 oafuncs/oa_tool/__init__.py,sha256=bNTy9abznDhg3k_Irx0YieXl37r-oDRMtTAxf57Stzs,487
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
 oafuncs/oa_tool/parallel.py,sha256=kYbiIFDB7EoxasmXGSomaEDVUsg9Rfvdgbw93lBOY7o,3770
-oafuncs-0.0.94.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.94.dist-info/METADATA,sha256=rKL0f-sli0TN2wL2WAU_-bA89eGzVu0aTyCK5K38RLU,3545
-oafuncs-0.0.94.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
-oafuncs-0.0.94.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.94.dist-info/RECORD,,
+oafuncs-0.0.96.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.96.dist-info/METADATA,sha256=Nh6i-B0Mt9WoTMNYRZ8-bTj9cjHXK_7NDPaZxEPOLk0,3618
+oafuncs-0.0.96.dist-info/WHEEL,sha256=9Hm2OB-j1QcCUq9Jguht7ayGIIZBRTdOXD1qg9cCgPM,109
+oafuncs-0.0.96.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.96.dist-info/RECORD,,