oafuncs 0.0.81__tar.gz → 0.0.83__tar.gz

oafuncs-0.0.83/MANIFEST.in

@@ -0,0 +1,2 @@
+include oafuncs/oa_down/User_Agent-list.txt
+include oafuncs/data_store/OAFuncs.png

oafuncs-0.0.83/PKG-INFO

@@ -0,0 +1,91 @@
+Metadata-Version: 2.1
+Name: oafuncs
+Version: 0.0.83
+Summary: My short description for my project.
+Home-page: https://github.com/Industry-Pays/OAFuncs
+Author: Kun Liu
+Author-email: liukun0312@stu.ouc.edu.cn
+License: MIT
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.9.0
+Description-Content-Type: text/markdown
+License-File: LICENSE.txt
+Requires-Dist: matplotlib
+Requires-Dist: numpy
+Requires-Dist: scipy
+Requires-Dist: xarray
+Requires-Dist: Cartopy
+Requires-Dist: netCDF4
+Requires-Dist: requests
+Requires-Dist: bs4
+Requires-Dist: rich
+Requires-Dist: pathlib
+Requires-Dist: pandas
+
+
+# oafuncs
+
+## Description
+
+**Python Function**
+
+```text
+In the field of geoscience, some commonly used and universal operations!
+
+Just for the convenience of daily use, some complex operations are integrated into general functions.
+
+The code will be optimized and updated from time to time, with additions, deletions, or modifications…
+
+Existing functions will not be completely removed, they might just have a different function name, or the parameter passing might have been optimized…
+
+Note: If there are any requirements, you can email to liukun0312@stu.ouc.edu.cn. Within my capabilities, I can consider implementing them.
+```
+
+## PyPI
+
+```html
+https://pypi.org/project/oafuncs
+```
+
+## Github
+
+```html
+https://github.com/Industry-Pays/OAFuncs
+```
+
+## Example
+
+```python
+import oafuncs
+
+# 查询当前所有可用函数
+oafuncs.oa_help.query()
+# 根据函数名获取使用方法
+oafuncs.oa_help.use('query')
+```
+
+```shell
+# 此小板块于2024/12/26更新，仅为示例，不代表最新情况
+函数数量：
+49
+函数列表：
+['MidpointNormalize', 'add_cartopy', 'add_gridlines', 'add_lonlat_unit', 'check_ncfile', 'choose_cmap', 'clear_folder', 'cmap2colors', 'convert_longitude', 'copy_file', 'create_cmap', 'create_cmap_rgbtxt', 'create_gif', 'download', 'download5doi', 'draw_time_range', 'extract5nc', 'fig_minus', 'file_size', 'find_file', 'get_time_list', 'get_ua', 'get_var', 'how_to_use', 'install_lib', 'interp_2d', 'link_file', 'make_folder', 'merge5nc', 'modify_var_attr', 'modify_var_value', 'nc_isel', 'plot_contourf', 'plot_contourf_cartopy', 'plot_contourf_lonlat', 'plot_quiver', 'query', 'remove', 'remove_empty_folder', 'rename_file', 'rename_var_or_dim', 'send', 'show', 'sign_in_love_ocean', 'sign_in_meteorological_home', 'sign_in_scientific_research', 'upgrade_lib', 'use', 'write2nc']
+模块全路径：
+oafuncs.oa_help.query
+函数提示：
+
+    description: 查看oafuncs模块的函数列表
+    example: query()
+```
+
+## Structure
+
+<img title="" src="./oafuncs/data_store/OAFuncs.png" alt="">

oafuncs-0.0.83/README.md

@@ -0,0 +1,58 @@
+# oafuncs
+
+## Description
+
+**Python Function**
+
+```text
+In the field of geoscience, some commonly used and universal operations!
+
+Just for the convenience of daily use, some complex operations are integrated into general functions.
+
+The code will be optimized and updated from time to time, with additions, deletions, or modifications…
+
+Existing functions will not be completely removed, they might just have a different function name, or the parameter passing might have been optimized…
+
+Note: If there are any requirements, you can email to liukun0312@stu.ouc.edu.cn. Within my capabilities, I can consider implementing them.
+```
+
+## PyPI
+
+```html
+https://pypi.org/project/oafuncs
+```
+
+## Github
+
+```html
+https://github.com/Industry-Pays/OAFuncs
+```
+
+## Example
+
+```python
+import oafuncs
+
+# 查询当前所有可用函数
+oafuncs.oa_help.query()
+# 根据函数名获取使用方法
+oafuncs.oa_help.use('query')
+```
+
+```shell
+# 此小板块于2024/12/26更新，仅为示例，不代表最新情况
+函数数量：
+49
+函数列表：
+['MidpointNormalize', 'add_cartopy', 'add_gridlines', 'add_lonlat_unit', 'check_ncfile', 'choose_cmap', 'clear_folder', 'cmap2colors', 'convert_longitude', 'copy_file', 'create_cmap', 'create_cmap_rgbtxt', 'create_gif', 'download', 'download5doi', 'draw_time_range', 'extract5nc', 'fig_minus', 'file_size', 'find_file', 'get_time_list', 'get_ua', 'get_var', 'how_to_use', 'install_lib', 'interp_2d', 'link_file', 'make_folder', 'merge5nc', 'modify_var_attr', 'modify_var_value', 'nc_isel', 'plot_contourf', 'plot_contourf_cartopy', 'plot_contourf_lonlat', 'plot_quiver', 'query', 'remove', 'remove_empty_folder', 'rename_file', 'rename_var_or_dim', 'send', 'show', 'sign_in_love_ocean', 'sign_in_meteorological_home', 'sign_in_scientific_research', 'upgrade_lib', 'use', 'write2nc']
+模块全路径：
+oafuncs.oa_help.query
+函数提示：
+
+    description: 查看oafuncs模块的函数列表
+    example: query()
+```
+
+## Structure
+
+<img title="" src="./oafuncs/data_store/OAFuncs.png" alt="">

{oafuncs-0.0.81 → oafuncs-0.0.83}/oafuncs/oa_cmap.py

@@ -100,6 +100,7 @@ def create_cmap_rgbtxt(rgbtxt_file,split_mark=','):  # 根据RGB的txt文档制
     return icmap
 
 
+# ** 选择cmap
 def choose_cmap(cmap_name=None, query=False):
     """
     description: Choosing a colormap from the list of available colormaps or a custom colormap

{oafuncs-0.0.81 → oafuncs-0.0.83}/oafuncs/oa_data.py

@@ -1,31 +1,97 @@
 #!/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-11-21 13:13:20
+LastEditTime: 2024-12-13 19:11:08
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_data.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
 Python Version: 3.11
-'''
-
+"""
 
+import itertools
 import multiprocessing as mp
 from concurrent.futures import ThreadPoolExecutor
 
 import numpy as np
 from scipy.interpolate import griddata
 
-__all__ = ['interp_2d', 'interp_2d_parallel']
+__all__ = ["interp_2d"]
 
-# ** 高维插值函数，插值最后两个维度
 
+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.
+
+    Parameters:
+    - target_x (array-like): 1D array of target grid's x-coordinates.
+    - target_y (array-like): 1D array of target grid's y-coordinates.
+    - origin_x (array-like): 1D array of original grid's x-coordinates.
+    - origin_y (array-like): 1D array of original grid's y-coordinates.
+    - data (numpy.ndarray): Multi-dimensional array where the last two dimensions correspond to the original grid.
+    - method (str, optional): Interpolation method, default is 'linear'. Other options include 'nearest', 'cubic', etc.
+    - parallel (bool, optional): Flag to enable parallel processing. Default is True.
+
+    Returns:
+    - interpolated_data (numpy.ndarray): Interpolated data with the same leading dimensions as the input data, but with the last two dimensions corresponding to the target grid.
+
+    Raises:
+    - ValueError: If the shape of the data does not match the shape of the origin_x or origin_y grids.
+
+    Usage:
+    - Interpolate a 2D array:
+        result = interp_2d(target_x, target_y, origin_x, origin_y, data_2d)
+    - Interpolate a 3D array (where the last two dimensions are spatial):
+        result = interp_2d(target_x, target_y, origin_x, origin_y, data_3d)
+    - Interpolate a 4D array (where the last two dimensions are spatial):
+        result = interp_2d(target_x, target_y, origin_x, origin_y, data_4d)
+    """
+
+    def interp_single(data_slice, target_points, origin_points, method):
+        return griddata(origin_points, data_slice.ravel(), target_points, method=method).reshape(target_y.shape)
+
+    # 确保目标网格和初始网格都是二维的
+    if len(target_y.shape) == 1:
+        target_x, target_y = np.meshgrid(target_x, target_y)
+    if len(origin_y.shape) == 1:
+        origin_x, origin_y = np.meshgrid(origin_x, origin_y)
+
+    # 根据经纬度网格判断输入数据的形状是否匹配
+    if origin_x.shape != data.shape[-2:] or origin_y.shape != data.shape[-2:]:
+        raise ValueError("Shape of data does not match shape of origin_x or origin_y.")
+
+    # 创建网格和展平数据
+    target_points = np.column_stack((target_y.ravel(), target_x.ravel()))
+    origin_points = np.column_stack((origin_y.ravel(), origin_x.ravel()))
+
+    # 根据是否并行选择不同的执行方式
+    if parallel:
+        with ThreadPoolExecutor(max_workers=mp.cpu_count() - 2) as executor:
+            if len(data.shape) == 2:
+                interpolated_data = list(executor.map(interp_single, [data], [target_points], [origin_points], [method]))
+            elif len(data.shape) == 3:
+                interpolated_data = list(executor.map(interp_single, [data[i] for i in range(data.shape[0])], [target_points] * data.shape[0], [origin_points] * data.shape[0], [method] * data.shape[0]))
+            elif len(data.shape) == 4:
+                index_combinations = list(itertools.product(range(data.shape[0]), range(data.shape[1])))
+                interpolated_data = list(executor.map(interp_single, [data[i, j] for i, j in index_combinations], [target_points] * len(index_combinations), [origin_points] * len(index_combinations), [method] * len(index_combinations)))
+                interpolated_data = np.array(interpolated_data).reshape(data.shape[0], data.shape[1], *target_y.shape)
+    else:
+        if len(data.shape) == 2:
+            interpolated_data = interp_single(data, target_points, origin_points, method)
+        elif len(data.shape) == 3:
+            interpolated_data = np.stack([interp_single(data[i], target_points, origin_points, method) for i in range(data.shape[0])])
+        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)
 
-def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
+
+# ** 高维插值函数，插值最后两个维度
+def interp_2d_20241213(target_x, target_y, origin_x, origin_y, data, method="linear"):
     """
     高维插值函数，默认插值最后两个维度，传输数据前请确保数据的维度正确
     参数:
@@ -52,7 +118,7 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
 
     if origin_x.shape != dims[-2:] or origin_y.shape != dims[-2:]:
         print(origin_x.shape, dims[-2:])
-        raise ValueError('Shape of data does not match shape of origin_x or origin_y.')
+        raise ValueError("Shape of data does not match shape of origin_x or origin_y.")
 
     # 将目标网格展平成一维数组
     target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
@@ -69,7 +135,7 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
         for i in range(dims[0]):
             dt = griddata(origin_points, np.ravel(data[i, :, :]), target_points, method=method)
             interpolated_data.append(np.reshape(dt, target_y.shape))
-            print(f'Interpolating {i+1}/{dims[0]}...')
+            print(f"Interpolating {i+1}/{dims[0]}...")
         interpolated_data = np.array(interpolated_data)
     elif len_dims == 4:
         interpolated_data = []
@@ -78,8 +144,8 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
             for j in range(dims[1]):
                 dt = griddata(origin_points, np.ravel(data[i, j, :, :]), target_points, method=method)
                 interpolated_data[i].append(np.reshape(dt, target_y.shape))
-                print(f'\rInterpolating {i*dims[1]+j+1}/{dims[0]*dims[1]}...', end='')
-        print('\n')
+                print(f"\rInterpolating {i*dims[1]+j+1}/{dims[0]*dims[1]}...", end="")
+        print("\n")
         interpolated_data = np.array(interpolated_data)
 
     return interpolated_data
@@ -87,8 +153,8 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method='linear'):
 
 # ** 高维插值函数，插值最后两个维度，使用多线程进行插值
 # 在本地电脑上可以提速三倍左右，超算上暂时无法加速
-def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='linear'):
-    '''
+def interp_2d_parallel_20241213(target_x, target_y, origin_x, origin_y, data, method="linear"):
+    """
     param        {*} target_x 目标经度网格 1D 或 2D
     param        {*} target_y 目标纬度网格 1D 或 2D
     param        {*} origin_x 初始经度网格 1D 或 2D
@@ -98,22 +164,23 @@ def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='lin
     return       {*} 插值结果
     description : 高维插值函数，默认插值最后两个维度，传输数据前请确保数据的维度正确
     example     : interpolated_data = interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='linear')
-    '''
-    def interp_single2d(target_y, target_x, origin_y, origin_x, data, method='linear'):
+    """
+
+    def interp_single2d(target_y, target_x, origin_y, origin_x, data, method="linear"):
         target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
         origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
         dt = griddata(origin_points, np.ravel(data[:, :]), target_points, method=method)
         return np.reshape(dt, target_y.shape)
 
-    def interp_single3d(i, target_y, target_x, origin_y, origin_x, data, method='linear'):
+    def interp_single3d(i, target_y, target_x, origin_y, origin_x, data, method="linear"):
         target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
         origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
         dt = griddata(origin_points, np.ravel(data[i, :, :]), target_points, method=method)
         return np.reshape(dt, target_y.shape)
 
-    def interp_single4d(i, j, target_y, target_x, origin_y, origin_x, data, method='linear'):
+    def interp_single4d(i, j, target_y, target_x, origin_y, origin_x, data, method="linear"):
         target_points = np.column_stack((np.ravel(target_y), np.ravel(target_x)))
         origin_points = np.column_stack((np.ravel(origin_y), np.ravel(origin_x)))
 
@@ -129,19 +196,31 @@ def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='lin
     len_dims = len(dims)
 
     if origin_x.shape != dims[-2:] or origin_y.shape != dims[-2:]:
-        raise ValueError('数据形状与 origin_x 或 origin_y 的形状不匹配.')
+        raise ValueError("数据形状与 origin_x 或 origin_y 的形状不匹配.")
 
     interpolated_data = []
 
     # 使用多线程进行插值
-    with ThreadPoolExecutor(max_workers=mp.cpu_count()-2) as executor:
-        print(f'Using {mp.cpu_count()-2} threads...')
+    with ThreadPoolExecutor(max_workers=mp.cpu_count() - 2) as executor:
+        print(f"Using {mp.cpu_count()-2} threads...")
         if len_dims == 2:
             interpolated_data = list(executor.map(interp_single2d, [target_y], [target_x], [origin_y], [origin_x], [data], [method]))
         elif len_dims == 3:
-            interpolated_data = list(executor.map(interp_single3d, [i for i in range(dims[0])], [target_y]*dims[0], [target_x]*dims[0], [origin_y]*dims[0], [origin_x]*dims[0], [data]*dims[0], [method]*dims[0]))
+            interpolated_data = list(executor.map(interp_single3d, [i for i in range(dims[0])], [target_y] * dims[0], [target_x] * dims[0], [origin_y] * dims[0], [origin_x] * dims[0], [data] * dims[0], [method] * dims[0]))
         elif len_dims == 4:
-            interpolated_data = list(executor.map(interp_single4d, [i for i in range(dims[0]) for j in range(dims[1])], [j for i in range(dims[0]) for j in range(dims[1])], [target_y]*dims[0]*dims[1], [target_x]*dims[0]*dims[1], [origin_y]*dims[0]*dims[1], [origin_x]*dims[0]*dims[1], [data]*dims[0]*dims[1], [method]*dims[0]*dims[1]))
+            interpolated_data = list(
+                executor.map(
+                    interp_single4d,
+                    [i for i in range(dims[0]) for j in range(dims[1])],
+                    [j for i in range(dims[0]) for j in range(dims[1])],
+                    [target_y] * dims[0] * dims[1],
+                    [target_x] * dims[0] * dims[1],
+                    [origin_y] * dims[0] * dims[1],
+                    [origin_x] * dims[0] * dims[1],
+                    [data] * dims[0] * dims[1],
+                    [method] * dims[0] * dims[1],
+                )
+            )
             interpolated_data = np.array(interpolated_data).reshape(dims[0], dims[1], target_y.shape[0], target_x.shape[1])
 
     interpolated_data = np.array(interpolated_data)
@@ -149,7 +228,7 @@ def interp_2d_parallel(target_x, target_y, origin_x, origin_y, data, method='lin
     return interpolated_data
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     import time
 
     import matplotlib.pyplot as plt
@@ -169,15 +248,15 @@ if __name__ == '__main__':
     data = np.random.rand(10, 10, 11, 11)
 
     start = time.time()
-    interpolated_data = interp_2d(target_x, target_y, origin_x, origin_y, data)
-    print(f'Interpolation time: {time.time()-start:.2f}s')
+    interpolated_data = interp_2d(target_x, target_y, origin_x, origin_y, data, parallel=False)
+    print(f"Interpolation time: {time.time()-start:.2f}s")
 
     print(interpolated_data.shape)
 
     # 高维插值多线程
     start = time.time()
-    interpolated_data = interp_2d_parallel(target_x, target_y, origin_x, origin_y, data)
-    print(f'Interpolation time: {time.time()-start:.2f}s')
+    interpolated_data = interp_2d(target_x, target_y, origin_x, origin_y, data)
+    print(f"Interpolation time: {time.time()-start:.2f}s")
 
     print(interpolated_data.shape)
     print(interpolated_data[0, 0, :, :].shape)

{oafuncs-0.0.81 → oafuncs-0.0.83}/oafuncs/oa_down/__init__.py

@@ -1,20 +1,21 @@
 #!/usr/bin/env python
 # coding=utf-8
-'''
+"""
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 16:09:20
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-01 19:49:40
+LastEditTime: 2024-12-26 08:09:01
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\__init__.py
-Description:  
+Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
 SystemInfo: Windows 11
 Python Version: 3.11
-'''
+"""
 
 # from .love_ocean import sign as love_ocean
 # from .meteorological_home import sign as meteorological_home
 
 from .hycom_3hourly import *
 from .literature import *
+from .user_agent import *