oafuncs 0.0.84__py2.py3-none-any.whl → 0.0.86__py2.py3-none-any.whl

oafuncs/oa_cmap.py

@@ -16,17 +16,23 @@ Python Version: 3.11
 import matplotlib as mpl
 import matplotlib.pyplot as plt
 import numpy as np
+from rich import print
 
-__all__ = ["show", "cmap2colors", "create_cmap", "create_cmap_rgbtxt", "choose_cmap"]
+__all__ = ["show", "to_color", "create", "create_rgbtxt", "get"]
 
 # ** 将cmap用填色图可视化（官网摘抄函数）
-def show(colormaps: list):
+def show(colormaps):
     """
-    Helper function to plot data with associated colormap.
-    example:
-    cmap = ListedColormap(["darkorange", "gold", "lawngreen", "lightseagreen"])
-    show([cmap])
+    Description:
+        Helper function to plot data with associated colormap.
+    Parameters:
+        colormaps : list of colormaps, or a single colormap; can be a string or a colormap object.
+    Example:
+        cmap = ListedColormap(["darkorange", "gold", "lawngreen", "lightseagreen"])
+        show([cmap]); show("viridis"); show(["viridis", "cividis"])
     """
+    if isinstance(colormaps, str) or isinstance(colormaps, mpl.colors.Colormap):
+        colormaps = [colormaps]
     np.random.seed(19680801)
     data = np.random.randn(30, 30)
     n = len(colormaps)
@@ -38,12 +44,17 @@ def show(colormaps: list):
 
 
 # ** 将cmap转为list，即多个颜色的列表
-def cmap2colors(cmap, n=256):
+def to_color(cmap, n=256):
     """
-    cmap        : cmap名称
-    n           : 提取颜色数量
-    return      : 提取的颜色列表
-    example     : out_colors = cmap2colors('viridis', 256)
+    Description:
+        Convert a colormap to a list of colors
+    Parameters:
+        cmap : str; the name of the colormap
+        n    : int, optional; the number of colors
+    Return:
+        out_colors : list of colors
+    Example:
+        out_colors = to_color('viridis', 256)
     """
     c_map = mpl.colormaps.get_cmap(cmap)
     out_colors = [c_map(i) for i in np.linspace(0, 1, n)]
@@ -51,16 +62,22 @@ def cmap2colors(cmap, n=256):
 
 
 # ** 自制cmap，多色，可带位置
-def create_cmap(colors: list, nodes=None, under=None, over=None):  # 利用颜色快速配色
+def create(colors: list, nodes=None, under=None, over=None):  # 利用颜色快速配色
     """
-    func        : 自制cmap，自动确定颜色位置（等比例）
-    description : colors可以是颜色名称，也可以是十六进制颜色代码
-    param        {*} colors 颜色
-    param        {*} nodes 颜色位置，默认不提供，等间距
-    return       {*} cmap
-    example     : cmap = create_cmap(['#C2B7F3','#B3BBF2','#B0CBF1','#ACDCF0','#A8EEED'])
-                cmap = create_cmap(['aliceblue','skyblue','deepskyblue'],[0.0,0.5,1.0])
+    Description:
+        Create a custom colormap
+    Parameters:
+        colors : list of colors
+        nodes  : list of positions
+        under  : color
+        over   : color
+    Return:
+        cmap : colormap
+    Example:
+        cmap = create(['#C2B7F3','#B3BBF2','#B0CBF1','#ACDCF0','#A8EEED'])
+        cmap = create(['aliceblue','skyblue','deepskyblue'],[0.0,0.5,1.0])
     """
+
     if nodes is None:  # 采取自动分配比例
         cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", colors)
     else:  # 按照提供比例分配
@@ -73,17 +90,30 @@ def create_cmap(colors: list, nodes=None, under=None, over=None):  # 利用颜
 
 
 # ** 根据RGB的txt文档制作色卡（利用Grads调色盘）
-def create_cmap_rgbtxt(rgbtxt_file,split_mark=','):  # 根据RGB的txt文档制作色卡/根据rgb值制作
+def create_rgbtxt(rgbtxt_file,split_mark=','):  # 根据RGB的txt文档制作色卡/根据rgb值制作
     """
-    func        : 根据RGB的txt文档制作色卡
-    description : rgbtxt_file='E:/python/colorbar/test.txt'
-    param        {*} rgbtxt_file txt文件路径
-    return       {*} camp
-    example     : cmap=create_cmap_rgbtxt(path,split_mark=',') #
-
-    txt example : 251,251,253
-                225,125,25
-                250,205,255
+    Description
+    -----------
+    Make a color card according to the RGB txt document, each line in the txt file is an RGB value, separated by commas, such as: 251,251,253
+    
+    Parameters
+    ----------
+    rgbtxt_file : str, the path of txt file
+    split_mark  : str, optional, default is ','; the split mark of rgb value
+
+    Returns
+    -------
+    cmap : colormap
+
+    Example
+    -------
+    cmap=create_rgbtxt(path,split_mark=',')
+    
+    txt example
+    -----------
+    251,251,253
+    225,125,25
+    250,205,255
     """
     with open(rgbtxt_file) as fid:
         data = fid.readlines()
@@ -94,27 +124,36 @@ def create_cmap_rgbtxt(rgbtxt_file,split_mark=','):  # 根据RGB的txt文档制
         rgb[i][1] = data[i].split(split_mark)[1]
         rgb[i][2] = data[i].split(split_mark)[2]
     max_rgb = np.max(rgb)
-    if max_rgb > 2:  # 如果rgb值大于2，则认为是0-255的值，需要归一化
+    if max_rgb > 2:  # if the value is greater than 2, it is normalized to 0-1
         rgb = rgb / 255.0
-    icmap = mpl.colors.ListedColormap(rgb, name="my_color")
-    return icmap
+    my_cmap = mpl.colors.ListedColormap(rgb, name="my_color")
+    return my_cmap
 
 
 # ** 选择cmap
-def choose_cmap(cmap_name=None, query=False):
+def get(cmap_name=None, query=False):
     """
-    description: Choosing a colormap from the list of available colormaps or a custom colormap
-    param {*} cmap_name:
-    param {*} query:
-    return {*}
+    Description:
+        Choosing a colormap from the list of available colormaps or a custom colormap
+    Parameters:
+        cmap_name : str, optional; the name of the colormap
+        query     : bool, optional; whether to query the available colormap names
+    Return:
+        cmap : colormap
+    Example:
+        cmap = get('viridis')
+        cmap = get('diverging_1')
+        cmap = get('cold_1')
+        cmap = get('warm_1')
+        cmap = get('colorful_1')
     """
 
     my_cmap_dict = {
-        "diverging_1": create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
-        "cold_1": create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC"]),
-        "warm_1": create_cmap(["#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
-        # "land_1": create_custom(["#3E6436", "#678A59", "#91A176", "#B8A87D", "#D9CBB2"], under="#A6CEE3", over="#FFFFFF"), # 陆地颜色从深绿到浅棕，表示从植被到沙地的递减
-        # "ocean_1": create_custom(["#126697", "#2D88B3", "#4EA1C9", "#78B9D8", "#A6CEE3"], under="#8470FF", over="#3E6436"), # 海洋颜色从深蓝到浅蓝，表示从深海到浅海的递减
+        "diverging_1": create(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
+        "cold_1": create(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC"]),
+        "warm_1": create(["#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"]),
+        # "land_1": create_custom(["#3E6436", "#678A59", "#91A176", "#B8A87D", "#D9CBB2"], under="#A6CEE3", over="#FFFFFF"),
+        # "ocean_1": create_custom(["#126697", "#2D88B3", "#4EA1C9", "#78B9D8", "#A6CEE3"], under="#8470FF", over="#3E6436"), 
         # "ocean_land_1": create_custom(
         #     [
         #         "#126697",  # 深蓝（深海）
@@ -130,11 +169,21 @@ def choose_cmap(cmap_name=None, query=False):
         #         "#3E6436",  # 深绿（高山）
         #     ]
         # ),
-        "colorful_1": create_cmap(["#6d00db", "#9800cb", "#F2003C", "#ff4500", "#ff7f00", "#FE28A2", "#FFC0CB", "#DDA0DD", "#40E0D0", "#1a66f2", "#00f7fb", "#8fff88", "#E3FF00"]),
+        "colorful_1": create(["#6d00db", "#9800cb", "#F2003C", "#ff4500", "#ff7f00", "#FE28A2", "#FFC0CB", "#DDA0DD", "#40E0D0", "#1a66f2", "#00f7fb", "#8fff88", "#E3FF00"]),
     }
     if query:
+        print("Available cmap names:")
+        print('-' * 20)
+        print('Defined by myself:')
         for key, _ in my_cmap_dict.items():
             print(key)
+        print('-' * 20)
+        print('Matplotlib built-in:')
+        print(mpl.colormaps())
+        print("-" * 20)
+    
+    if cmap_name is None:
+        return
 
     if cmap_name in my_cmap_dict:
         return my_cmap_dict[cmap_name]
@@ -149,16 +198,16 @@ if __name__ == "__main__":
     # ** 测试自制cmap
     colors = ["#C2B7F3", "#B3BBF2", "#B0CBF1", "#ACDCF0", "#A8EEED"]
     nodes = [0.0, 0.2, 0.4, 0.6, 1.0]
-    c_map = create_cmap(colors, nodes)
+    c_map = create(colors, nodes)
     show([c_map])
 
     # ** 测试自制diverging型cmap
-    diverging_cmap = create_cmap(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
+    diverging_cmap = create(["#4e00b3", "#0000FF", "#00c0ff", "#a1d3ff", "#DCDCDC", "#FFD39B", "#FF8247", "#FF0000", "#FF5F9E"])
     show([diverging_cmap])
 
     # ** 测试根据RGB的txt文档制作色卡
     file_path = "E:/python/colorbar/test.txt"
-    cmap_rgb = create_cmap_rgbtxt(file_path)
+    cmap_rgb = create_rgbtxt(file_path)
 
     # ** 测试将cmap转为list
-    out_colors = cmap2colors("viridis", 256)
+    out_colors = to_color("viridis", 256)

oafuncs/oa_data.py

@@ -15,12 +15,12 @@ Python Version: 3.11
 
 import itertools
 import multiprocessing as mp
-from concurrent.futures import ThreadPoolExecutor
+from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor
 
 import numpy as np
 from scipy.interpolate import griddata
 
-__all__ = ["interp_2d"]
+__all__ = ["interp_2d","ParallelExecutor"]
 
 
 def interp_2d(target_x, target_y, origin_x, origin_y, data, method="linear", parallel=True):
@@ -90,6 +90,73 @@ def interp_2d(target_x, target_y, origin_x, origin_y, data, method="linear", par
     return np.array(interpolated_data)
 
 
+class ParallelExecutor:
+    """
+    通用并行计算类，支持多进程和多线程模式。
+
+    使用说明：
+        1. 创建实例时选择模式：
+            - mode="process" 使用多进程（适合 CPU 密集型任务）。
+            - mode="thread" 使用多线程（适合 IO 密集型任务）。
+
+        2. 调用 run 方法：
+            - 参数 func：需要并行执行的函数。
+            - 参数 param_list：参数列表，每个元素是传递给 func 的参数元组。
+
+    示例：
+        # 示例 1：计算平方
+        def compute_square(x):
+            return x * x
+
+        params = [(i,) for i in range(10)]
+        executor = ParallelExecutor(mode="process", max_workers=4)
+        results = executor.run(compute_square, params)
+        print("Results:", results)
+
+        # 示例 2：计算两数之和
+        def compute_sum(a, b):
+            return a + b
+
+        params = [(1, 2), (3, 4), (5, 6)]
+        executor = ParallelExecutor(mode="thread", max_workers=2)
+        results = executor.run(compute_sum, params)
+        print("Results:", results)
+
+    参数：
+        mode (str): 并行模式，"process" 表示多进程，"thread" 表示多线程。
+        max_workers (int): 最大并行工作数，默认为 CPU 核心数减 2。
+    """
+
+    def __init__(self, mode="process", max_workers=mp.cpu_count() - 2):
+        self.mode = mode
+        self.max_workers = max_workers
+        self.executor = ProcessPoolExecutor if mode == "process" else ThreadPoolExecutor
+
+    def run(self, func, param_list):
+        """
+        并行运行指定函数，并确保结果顺序与输入参数顺序一致。
+
+        参数：
+            func (callable): 需要并行执行的函数。
+            param_list (list): 参数列表，每个元素是传递给 func 的参数元组。
+
+        返回：
+            results (list): 按输入顺序返回的结果。
+        """
+        results = [None] * len(param_list)  # 预分配结果数组
+
+        with self.executor(max_workers=self.max_workers) as executor:
+            # 提交任务并保存其索引
+            future_to_index = {executor.submit(func, *params): idx for idx, params in enumerate(param_list)}
+
+            for future in future_to_index:
+                idx = future_to_index[future]  # 获取原始索引
+                results[idx] = future.result()  # 将结果存放到对应位置
+
+        return results
+
+
+# ---------------------------------------------------------------------------------- not used below ----------------------------------------------------------------------------------
 # ** 高维插值函数，插值最后两个维度
 def interp_2d_20241213(target_x, target_y, origin_x, origin_y, data, method="linear"):
     """
@@ -228,8 +295,25 @@ def interp_2d_parallel_20241213(target_x, target_y, origin_x, origin_y, data, me
     return interpolated_data
 
 
+def _test_sum(a,b):
+    return a+b
+
+
 if __name__ == "__main__":
-    import time
+    # 参数列表：每个参数是元组
+    params_list = [(1, 2), (3, 4), (5, 6), (7, 8), (9, 10)]
+
+    # 创建并行执行器
+    executor = ParallelExecutor()
+
+    # 并行运行
+    results = executor.run(_test_sum, params_list)
+
+    # 验证结果顺序
+    print("Params:", params_list)
+    print("Results:", results)
+    pass
+    """ import time
 
     import matplotlib.pyplot as plt
 
@@ -263,4 +347,4 @@ if __name__ == "__main__":
     plt.figure()
     plt.contourf(target_x, target_y, interpolated_data[0, 0, :, :])
     plt.colorbar()
-    plt.show()
+    plt.show() """

oafuncs/oa_draw.py

@@ -13,7 +13,7 @@ SystemInfo: Windows 11
 Python Version: 3.11
 """
 
-import math
+
 import warnings
 
 import cartopy.crs as ccrs
@@ -23,9 +23,8 @@ import matplotlib.pyplot as plt
 import numpy as np
 import xarray as xr
 from cartopy.mpl.ticker import LatitudeFormatter, LongitudeFormatter
-from mpl_toolkits.axes_grid1 import make_axes_locatable
 
-__all__ = ["fig_minus", "create_gif", "add_cartopy", "add_gridlines", 'MidpointNormalize', "add_lonlat_unit", "plot_contourf", "plot_contourf_lonlat", "plot_quiver", "plot_contourf_cartopy"]
+__all__ = ["fig_minus", "gif", "add_cartopy", "add_gridlines", "MidpointNormalize", "add_lonlat_unit", "contour", "contourf", "quiver"]
 
 warnings.filterwarnings("ignore")
 
@@ -76,15 +75,18 @@ def fig_minus(ax_x=None, ax_y=None, cbar=None, decimal=None, add_space=False):
 
 
 # ** 将生成图片/已有图片制作成动图
-def create_gif(image_list: list, gif_name: str, duration=0.2):  # 制作动图，默认间隔0.2
+def gif(image_list: list, gif_name: str, duration=0.2):  # 制作动图，默认间隔0.2
     """
-    func        : 制作动图，将已有图片拼接
-    description : Gif格式动图
-    param        {*} image_list 图片列表
-    param        {*} gif_name 动图名称（含路径）
-    param        {*} duration 动图间隔
-    return       {*} 自动保存至指定路径（包含于动图名称中）
-    example     :
+    Description
+        Make gif from images
+    Parameters
+        image_list : list, list of images
+        gif_name : str, name of gif
+        duration : float, duration of each frame
+    Returns
+        None
+    Example
+        gif(["1.png", "2.png"], "test.gif", duration=0.2)
     """
     import imageio.v2 as imageio
 
@@ -150,12 +152,11 @@ def add_gridlines(ax, projection=ccrs.PlateCarree(), color="k", alpha=0.5, lines
 
 # ** 添加地图
 def add_cartopy(ax, lon=None, lat=None, projection=ccrs.PlateCarree(), gridlines=True, landcolor="lightgrey", oceancolor="lightblue", cartopy_linewidth=0.5):
-
     # add coastlines
     ax.add_feature(cfeature.LAND, facecolor=landcolor)
     ax.add_feature(cfeature.OCEAN, facecolor=oceancolor)
     ax.add_feature(cfeature.COASTLINE, linewidth=cartopy_linewidth)
-    ax.add_feature(cfeature.BORDERS, linewidth=cartopy_linewidth, linestyle=":")
+    # ax.add_feature(cfeature.BORDERS, linewidth=cartopy_linewidth, linestyle=":")
 
     # add gridlines
     if gridlines:
@@ -201,141 +202,68 @@ class MidpointNormalize(mpl.colors.Normalize):
 
 # -----------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-
-# ** 设置colorbar格式
-class _MyFormatter(mpl.ticker.ScalarFormatter):
-    def __init__(self, cticks, fmt=None, useOffset=True, useMathText=True):
-        mpl.ticker.ScalarFormatter.__init__(self, useOffset, useMathText)
-        self.cticks = cticks
-        self.fmt = fmt
-        self.vmin = min(cticks)
-        self.vmax = max(cticks)
-        self.p_n = self.vmin < 0 and self.vmax > 0
-        self.magnitude_min = int(math.modf(math.log10(min(abs(cticks[cticks != 0]))))[1])
-        self.magnitude_max = int(math.modf(math.log10(max(abs(cticks))))[1])
-        # print(self.vmin, self.vmax)
-
-    def __call__(self, x, pos):
-        if ((abs(x) < 1e-2) or (abs(x) > 1e4)) and x != 0:
-            if self.magnitude_max - self.magnitude_min == 1 and (int(math.modf(math.log10(abs(x)))[1]) == self.magnitude_min):
-                a, b = "{:.1e}".format(x).split("e")
-                a = float(a) / 10
-                b = int(b) + 1
-            else:
-                a, b = "{:.2e}".format(x).split("e")
-                a = float(a)
-                b = int(b)
-            # return '${}{} \\times 10^{{{}}}$'.format(' ' if (self.p_n and x > 0) else '', a, b)
-            return "${}{:.2f}$".format(" " if (self.p_n and x > 0) else "", a)
-        elif x == 0:
-            return "0"
-        else:
-            return mpl.ticker.ScalarFormatter.__call__(self, x, pos)
-
-
-# ** 绘制单张填色图
-def plot_contourf(pic_data, picname=None, c_map="rainbow", minmax=None, labels=None, ticks_space=None, ticks=None, figsize=(12, 9)):
+# ** 绘制填色图
+def contourf(data,x=None,y=None,cmap='coolwarm',show=True,store=None,cartopy=False):
     """
-    func        : 绘制填色等值线图，单张
-    description : 绘制单张填色等值线图，输入参数为横纵坐标、等值数据、图例标注等
-    param       {*}pic_data : 填色等值线图的等值数据
-    param       {*}picname : 图片保存的文件名(含路径)
-    param       {*}c_map    : 颜色映射，默认rainbow
-    param       {*}minmax   : 指定绘图的最大、小值，默认不指定
-    param       {*}labels   : x、y轴以及图例的标注，默认不标注
-    param       {*}ticks_space : x、y轴刻度，以及所显示的标签，默认不显示
-    param       {*}figsize  : 图片大小，默认(12,9)
-    example     : plot_contourf(pic_data, pictpath, var_name, c_map='bwr', labels=None, ticks_space=None, ticks=None, h=0, figsize=(12, 9))
+    Description: 绘制填色图
+
+    param {*} data : 二维数据
+    param {*} x : x轴坐标
+    param {*} y : y轴坐标
+    param {*} cmap : 颜色映射
+    param {*} show : 是否显示
+    param {*} store : 是否保存
+    param {*} cartopy : 是否使用cartopy
+
+    return {*}
     """
-    cmap = mpl.colormaps.get_cmap(c_map)
-    if minmax is not None:
-        value_min, value_max = minmax[0], minmax[1]
+    data = np.array(data)
+    if x is None or y is None:
+        x = np.arange(data.shape[1])
+        y = np.arange(data.shape[0])
+    if cartopy:
+        fig, ax = plt.subplots(subplot_kw={'projection': ccrs.PlateCarree()})
+        add_cartopy(ax, lon=x, lat=y)
+        ax.contourf(x, y, data, transform=ccrs.PlateCarree(), cmap=cmap)
     else:
-        value_min, value_max = pic_data.nanmin(), pic_data.nanmax()
-    v_bry = max(abs(value_min), abs(value_max))
-    flag = (value_min < 0) and (value_max > 0)
-    norm = mpl.colors.TwoSlopeNorm(vmin=-1 * v_bry, vcenter=0, vmax=v_bry) if flag else mpl.colors.Normalize(vmin=value_min, vmax=value_max)
-    cticks = [num for num in np.linspace(-1 * v_bry if flag else value_min, v_bry if flag else value_max, 9)] if value_min != value_max else None
-    levels = np.linspace(-1 * v_bry, v_bry, 20) if flag else None if value_min == value_max else np.linspace(value_min, value_max, 20)
-
-    shape = np.array(pic_data).shape
-    x, y = np.meshgrid(np.arange(shape[1]), np.arange(shape[0]))
-
-    fig, ax = plt.subplots(figsize=figsize)
-    flag_lc = levels is not None and cticks is not None
-    CS = ax.contourf(x, y, pic_data, cmap=cmap, norm=norm, levels=levels, extend="both") if flag_lc else ax.contourf(x, y, pic_data, cmap=cmap, norm=norm, extend="both")
-    cb = fig.colorbar(CS, ax=ax, orientation="vertical", shrink=1, format="%.3g", spacing="uniform", ticks=cticks) if cticks is not None else fig.colorbar(CS, ax=ax, orientation="vertical", shrink=1, format="%.3g", spacing="uniform")
-    """%.3g采用的是自动调整格式，也可设置为%.3f，则改为3位小数"""
-
-    # 将格式化器设置为自定义的函数
-    class_cticks = np.array(cb.get_ticks())
-    # print(class_cticks)
-    cct = abs(class_cticks[class_cticks != 0])
-    if (min(cct) < 1e-2) or max(cct) > 1e4:  # 判断是否需要采用科学计数法
-        cb.formatter = _MyFormatter(class_cticks)
-        cb.update_ticks()
-
-    if labels is not None:
-        cb.set_label(labels["c"])
-        plt.xlabel(labels["x"])
-        plt.ylabel(labels["y"])
-    if ticks_space is not None and ticks is not None:
-        plt.xticks(np.arange(0, len(x[0, :]) + 1e-5, ticks_space["x"]), ticks["x"])
-        plt.yticks(np.arange(0, len(y[:, 0]) + 1e-5, ticks_space["y"]), ticks["y"])
-
-    plt.title("Min: {:.3g}, Max: {:.3g}".format(pic_data.min(), pic_data.max()))
-
-    plt.savefig(picname, bbox_inches="tight") if picname is not None else plt.show()
-    # plt.show()
-    plt.clf()
-    # 关闭当前figure
+        plt.contourf(x, y, data, cmap=cmap)
+    plt.colorbar()
+    plt.savefig(store, dpi=600, bbox_inches="tight") if store else plt.show()
     plt.close()
 
 
-# ** 画等高线图，带经纬度坐标轴
-def plot_contourf_lonlat(data, lon, lat, interval=5, picname=None, c_map="rainbow"):
+# ** 绘制等值线图
+def contour(data, x=None, y=None, cmap="coolwarm", show=True, store=None, cartopy=False):
     """
-    param        {*} data : 二维数据
-    param        {*} lon : 经度
-    param        {*} lat : 纬度
-    param        {*} interval : 经纬度间隔
-    param        {*} picname : 图片保存的文件名(含路径)
-    param        {*} c_map : 颜色映射，默认rainbow
-    return       {*} 无返回值
+    Description: 绘制等值线图
+
+    param {*} data : 二维数据
+    param {*} x : x轴坐标
+    param {*} y : y轴坐标
+    param {*} cmap : 颜色映射
+    param {*} show : 是否显示
+    param {*} store : 是否保存
+    param {*} cartopy : 是否使用cartopy
+
+    return {*}
     """
-    if len(lon.shape) == 2:
-        lon = lon[0, :]
-    if len(lat.shape) == 2:
-        lat = lat[:, 0]
-    # interval是经纬度间隔，单位为°
-    # 将lon，lat作为坐标轴刻度显示
-
-    def format_longitude(x):
-        if x > 180:
-            x -= 360
-        degrees = int(abs(x))
-        direction = "E" if x >= 0 else "W"
-        return f"{degrees}°{direction}" if x != 0 and x != 180 else f"{degrees}°"
-
-    def format_latitude(y):
-        if y > 90:
-            y -= 180
-        degrees = int(abs(y))
-        direction = "N" if y >= 0 else "S"
-        return f"{degrees}°{direction}" if y != 0 else f"{degrees}°"
-
-    plt.contourf(data, cmap=c_map)
-    x_space = int(len(lon) * interval / (lon[-1] - lon[0]))
-    y_space = int(len(lat) * interval / (lat[-1] - lat[0]))
-    plt.xticks(np.arange(0, len(lon), x_space), [format_longitude(lon[i]) for i in range(0, len(lon), x_space)])
-    plt.yticks(np.arange(0, len(lat), y_space), [format_latitude(lat[i]) for i in range(0, len(lat), y_space)])
-    plt.colorbar()
-    plt.savefig(picname, bbox_inches="tight") if picname is not None else plt.show()
+    data = np.array(data)
+    if x is None or y is None:
+        x = np.arange(data.shape[1])
+        y = np.arange(data.shape[0])
+    if cartopy:
+        fig, ax = plt.subplots(subplot_kw={"projection": ccrs.PlateCarree()})
+        add_cartopy(ax, lon=x, lat=y)
+        cr = ax.contour(x, y, data, transform=ccrs.PlateCarree(), cmap=cmap)
+    else:
+        cr = plt.contour(x, y, data, cmap=cmap)
+    plt.clabel(cr, inline=True, fontsize=10)
+    plt.savefig(store, dpi=600, bbox_inches="tight") if store else plt.show()
     plt.close()
 
 
 # ** 绘制矢量场
-def plot_quiver(u, v, lon, lat, picname=None, cmap="coolwarm", scale=0.25, width=0.002, x_space=5, y_space=5):
+def quiver(u, v, lon, lat, picname=None, cmap="coolwarm", scale=0.25, width=0.002, x_space=5, y_space=5):
     """
     param        {*} u : 二维数据
     param        {*} v : 二维数据
@@ -392,122 +320,6 @@ def plot_quiver(u, v, lon, lat, picname=None, cmap="coolwarm", scale=0.25, width
     plt.close()
 
 
-# ** 绘制填色图（带经纬度）
-def plot_contourf_cartopy(data, lon, lat, picname=None, cmap="rainbow", cn_fill_num=20, fig_size=(12, 9), title="Cartopy", land_color="green", ocean_color="lightgrey"):
-    """
-    param        {*} data : 二维数据
-    param        {*} lon : 经度
-    param        {*} lat : 纬度
-    param        {*} picname : 图片保存的文件名(含路径)
-    param        {*} cmap : 颜色映射，默认rainbow
-    param        {*} cn_fill_num : 等值线数量
-    param        {*} fig_size : 图片大小，默认(12,9)
-    param        {*} title : 图片标题
-    param        {*} land_color : 陆地颜色
-    param        {*} ocean_color : 海洋颜色
-    return       {*} 无返回值
-    """
-    if len(lon.shape) == 2:
-        lon = lon[0, :]
-    if len(lat.shape) == 2:
-        lat = lat[:, 0]
-
-    data_max = np.nanmax(data)
-    data_min = np.nanmin(data)
-    levels = np.linspace(data_min, data_max, cn_fill_num)
-    cbar_ticks = np.linspace(data_min, data_max, 9)
-
-    fig = plt.figure(figsize=fig_size)
-    proj = ccrs.PlateCarree()
-    ax = fig.add_subplot(1, 1, 1, projection=proj)
-
-    ax.set_extent([lon[0], lon[-1], lat[0], lat[-1]], crs=proj)
-
-    ax.add_feature(cfeature.LAND, facecolor=land_color, edgecolor="k")
-    ax.add_feature(cfeature.COASTLINE, linewidth=0.5)
-    # ax.add_feature(cfeature.BORDERS, linewidth=0.5, linestyle=":") # 加载国界线
-
-    ax.set_xticks(np.arange(lon[0], lon[-1] + 1e-5, 5), crs=proj)
-    ax.set_yticks(np.arange(lat[0], lat[-1] + 1e-5, 5), crs=proj)
-    lon_formatter = LongitudeFormatter(zero_direction_label=True)
-    ax.xaxis.set_major_formatter(lon_formatter)
-    lat_formatter = LatitudeFormatter()
-    ax.yaxis.set_major_formatter(lat_formatter)
-    # plt.title(title, fontsize=16)
-
-    cmap = plt.get_cmap(cmap)
-    X, Y = np.meshgrid(lon, lat)
-
-    # Fill color for land and ocean
-    # ax.background_patch.set_facecolor(ocean_color)
-    ax.patch.set_facecolor(ocean_color)
-    ax.add_feature(cfeature.LAND, facecolor=land_color)
-
-    cticks = cbar_ticks
-    norm = mpl.colors.BoundaryNorm(cticks, cmap.N)
-
-    cnplot = ax.contourf(X, Y, data, levels=levels, cmap=cmap, norm=norm, transform=proj, extend="both", alpha=1, zorder=0)
-    # cllevels = np.linspace(data_min, data_max, 9)
-    # clplot = ax.contour(X, Y, data, levels=levels[9::10], colors='k', linewidths=0.5, transform=proj, zorder=1, alpha=0.8, linestyle='--')
-    # 添加色标，并选择位置
-    divider = make_axes_locatable(ax)
-    location = 3
-    if location == 1:  # 左侧
-        cax = divider.new_horizontal(size="5%", pad=1, axes_class=plt.Axes, pack_start=True)
-        fig.add_axes(cax)
-        cbar = plt.colorbar(cnplot, cax=cax, orientation="vertical", extend="both")
-    elif location == 2:  # 下方
-        cax = divider.new_vertical(size="5%", pad=0.3, axes_class=plt.Axes, pack_start=True)
-        fig.add_axes(cax)
-        cbar = plt.colorbar(cnplot, cax=cax, orientation="horizontal", extend="both")
-    elif location == 3:  # 右侧
-        cax = divider.new_horizontal(size="5%", pad=0.1, axes_class=plt.Axes)
-        fig.add_axes(cax)
-        # cbar = plt.colorbar(cnplot, cax=cax, orientation='vertical', extend='both', format='%.0f')
-        cbar = fig.colorbar(mpl.cm.ScalarMappable(cmap=cmap, norm=norm), cax=cax, orientation="vertical", extend="both", format="%.3f")
-        cax.yaxis.set_ticks_position("right")
-        cax.yaxis.set_label_position("right")
-    else:  # 上方
-        cax = divider.new_vertical(size="5%", pad=0.2, axes_class=plt.Axes)
-        fig.add_axes(cax)
-        cbar = plt.colorbar(cnplot, cax=cax, orientation="horizontal", extend="both")
-    cbar.ax.tick_params(labelsize=10)
-    cbar.ax.xaxis.set_tick_params(direction="in", width=1, length=2)
-    # 添加cbar_ticks
-    # cbar.set_ticks(np.arange(round(levels[0]), round(levels[-1]), round((levels[-1]-levels[0])/9)))  # 设置色标刻度
-    # cbar.set_ticks(cbar_ticks)  # 设置色标刻度
-
-    cbar.set_ticks(cticks)
-    # cbar.ax.ticks = np.linspace(data_min, data_max, 8)
-    # cbar.set_ticks(np.arange(round(levels[0]), round(levels[-1]), round((levels[-1]-levels[0])/9)))  # 设置色标刻度
-
-    # 单独设置label
-    cbar.set_label(title, fontsize=10, weight="bold")
-    # cax.set_position([0.1, 0.2, 0.02, 0.6]) # 调整色标位置
-    fig.savefig(picname, bbox_inches="tight", dpi=600) if picname is not None else plt.show()
-    plt.close()
-
-
 
 if __name__ == "__main__":
-    # ** 绘制填色图
-    data = np.random.randn(100, 100)
-    picname = "test.png"
-    plot_contourf(data, picname, c_map="rainbow", minmax=None, labels=None, ticks_space=None, ticks=None, figsize=(12, 9))
-    # ** 绘制矢量场
-    u = np.random.randn(100, 100)
-    v = np.random.randn(100, 100)
-    lon = np.linspace(0, 360, 100)
-    lat = np.linspace(-90, 90, 100)
-    picname = "test.png"
-    plot_quiver(u, v, lon, lat, picname, cmap="coolwarm", scale=0.25, width=0.002, x_space=5, y_space=5)
-    # ** 绘制经纬度填色图
-    data = np.random.randn(100, 100)
-    lon = np.linspace(0, 360, 100)
-    lat = np.linspace(-90, 90, 100)
-    picname = "test.png"
-    plot_contourf_lonlat(data, lon, lat, interval=5, picname=picname, c_map="rainbow")
-    # ** 制作动图
-    image_list = ["test1.png", "test2.png", "test3.png"]
-    gif_name = "test.gif"
-    create_gif(image_list, gif_name, duration=0.2)
+    pass

oafuncs/oa_help.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-10-06 19:25:29
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-26 10:43:40
+LastEditTime: 2025-01-01 21:09:58
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_help.py
 Description:
 EditPlatform: vscode
@@ -14,8 +14,11 @@ Python Version: 3.12
 """
 
 import oafuncs
+import pkgutil
+import importlib
+from rich import print
 
-__all__ = ["query", "use"]
+__all__ = ["query", "use", "log"]
 
 
 def query():
@@ -28,15 +31,93 @@ def query():
     print(len(funcs))
     print("函数列表：")
     print(funcs)
+    
+    # 判断同名函数个数
+    func_dict = dict()
+    for func in funcs:
+        func_dict[func] = 0
+    for module_info in pkgutil.iter_modules(oafuncs.__path__, oafuncs.__name__ + "."):
+        module = importlib.import_module(module_info.name)
+        for func in funcs:
+            if hasattr(module, func):
+                func_dict[func] += 1
+    print("同名函数：")
+    for func, count in func_dict.items():
+        if count > 1:
+            print(f"{func} : {count}")
 
 
-def use(func="get_var"):
+def _use_single(func="get_var", module="oafuncs"):
     """
     description: 查看函数的模块全路径和函数提示
     param {func} : 函数名
     example: use('get_var')
     """
+    module = importlib.import_module(module)
     print("模块全路径：")
-    print(getattr(oafuncs, func).__module__ + "." + func)
+    print(getattr(module, func).__module__ + "." + func)
     print("函数提示：")
-    print(getattr(oafuncs, func).__doc__)
+    print(getattr(module, func).__doc__)
+
+
+def use(func_name='log'):
+    """
+    description: 查看本库指定函数的所有模块全路径和函数提示
+    param {func_name} : 函数名
+    example: use('get_var')
+    """
+    found = False
+    # 假设oafuncs是一个包
+    if hasattr(oafuncs, "__path__"):
+        print("-" * 40)  # 分隔线
+        # 遍历包内的所有模块
+        for module_info in pkgutil.iter_modules(oafuncs.__path__, oafuncs.__name__ + "."):
+            module_name = module_info.name
+            module = importlib.import_module(module_name)
+            if hasattr(module, func_name):
+                found = True
+                func_obj = getattr(module, func_name)
+                print(f"[bold purple]模块全路径：\n[bold green]{func_obj.__module__}.{func_name}\n")
+                help(func_obj)
+                """ doc = func_obj.__doc__
+                print("函数提示：")
+                if doc:
+                    print(doc)
+                else:
+                    print("无文档字符串") """
+                print("-" * 40)  # 分隔线
+    else:
+        # 如果oafuncs只是一个模块，直接查找
+        if hasattr(oafuncs, func_name):
+            found = True
+            func_obj = getattr(oafuncs, func_name)
+            print(f"模块全路径：\n{func_obj.__module__}.{func_name}\n")
+            help(func_obj)
+            """ doc = func_obj.__doc__
+            print("函数提示：")
+            if doc:
+                print(doc)
+            else:
+                print("无文档字符串") """
+    if not found:
+        print(f"在oafuncs中没有找到名为 '{func_name}' 的函数。")
+
+
+def log():
+    """
+    description: 查看更新日志
+    example: log()
+    """
+    print("更新日志：")
+    print(
+        """
+        2025-01-01
+        1. 添加了log函数，可以查看更新日志。
+        2. 修改部分函数名，尽可能简化函数名。
+        """
+    )
+
+
+if __name__ == "__main__":
+    # use("find_file")
+    query()

oafuncs/oa_nc.py

@@ -19,7 +19,7 @@ import netCDF4 as nc
 import numpy as np
 import xarray as xr
 
-__all__ = ["get_var", "extract5nc", "write2nc", "merge5nc", "modify_var_value", "modify_var_attr", "rename_var_or_dim", "check_ncfile", "convert_longitude", "nc_isel"]
+__all__ = ["get_var", "extract", "save", "merge", "modify", "rename", "check_file", "convert_longitude", "isel"]
 
 
 def get_var(file, *vars):
@@ -38,7 +38,7 @@ def get_var(file, *vars):
     return datas
 
 
-def extract5nc(file, varname, only_value=True):
+def extract(file, varname, only_value=True):
     """
     描述：
     1、提取nc文件中的变量
@@ -48,7 +48,7 @@ def extract5nc(file, varname, only_value=True):
     file: 文件路径
     varname: 变量名
     only_value: 变量和维度是否只保留数值
-    example: data, dimdict = extract5nc(file_ecm, 'h')
+    example: data, dimdict = extract(file_ecm, 'h')
     """
     ds = xr.open_dataset(file)
     vardata = ds[varname]
@@ -101,7 +101,7 @@ def _calculate_scale_and_offset(data, n=16):
     return scale_factor, add_offset
 
 
-def write2nc(file, data, varname=None, coords=None, mode="w", scale_offset_switch=True, compile_switch=True):
+def save(file, data, varname=None, coords=None, mode="w", scale_offset_switch=True, compile_switch=True):
     """
     description: 写入数据到nc文件
 
@@ -114,7 +114,7 @@ def write2nc(file, data, varname=None, coords=None, mode="w", scale_offset_switc
     scale_offset_switch: 是否使用scale_factor和add_offset，默认为True
     compile_switch: 是否使用压缩参数，默认为True
 
-    example: write2nc(r'test.nc', data, 'data', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
+    example: save(r'test.nc', data, 'data', {'time': np.linspace(0, 120, 100), 'lev': np.linspace(0, 120, 50)}, 'a')
     """
     # 设置压缩参数
     kwargs = {"zlib": True, "complevel": 4} if compile_switch else {}
@@ -175,7 +175,7 @@ def write2nc(file, data, varname=None, coords=None, mode="w", scale_offset_switc
                     var.setncattr(key, value)
 
 
-def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
+def merge(file_list, var_name=None, dim_name=None, target_filename=None):
     """
     批量提取 nc 文件中的变量，按照某一维度合并后写入新的 nc 文件。
     如果 var_name 是字符串，则认为是单变量；如果是列表，且只有一个元素，也是单变量；
@@ -188,9 +188,9 @@ def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
     target_filename：合并后的目标文件名
     
     example: 
-    merge5nc(file_list, var_name='data', dim_name='time', target_filename='merged.nc')
-    merge5nc(file_list, var_name=['data1', 'data2'], dim_name='time', target_filename='merged.nc')
-    merge5nc(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
+    merge(file_list, var_name='data', dim_name='time', target_filename='merged.nc')
+    merge(file_list, var_name=['data1', 'data2'], dim_name='time', target_filename='merged.nc')
+    merge(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
     """
     if isinstance(file_list, str):
         file_list = [file_list]
@@ -248,7 +248,7 @@ def merge5nc(file_list, var_name=None, dim_name=None, target_filename=None):
     print(f'File "{target_filename}" has been created.')
 
 
-def modify_var_value(nc_file_path, variable_name, new_value):
+def _modify_var(nc_file_path, variable_name, new_value):
     """
     使用 netCDF4 库修改 NetCDF 文件中特定变量的值
 
@@ -257,7 +257,7 @@ def modify_var_value(nc_file_path, variable_name, new_value):
     variable_name (str): 要修改的变量名
     new_value (numpy.ndarray): 新的变量值
 
-    example: modify_var_value('test.nc', 'data', np.random.rand(100, 50))
+    example: modify_var('test.nc', 'data', np.random.rand(100, 50))
     """
     try:
         # Open the NetCDF file
@@ -272,7 +272,7 @@ def modify_var_value(nc_file_path, variable_name, new_value):
         print(f"An error occurred while modifying variable {variable_name} in {nc_file_path}: {e}")
 
 
-def modify_var_attr(nc_file_path, variable_name, attribute_name, attribute_value):
+def _modify_attr(nc_file_path, variable_name, attribute_name, attribute_value):
     """
     使用 netCDF4 库添加或修改 NetCDF 文件中特定变量的属性。
 
@@ -281,7 +281,7 @@ def modify_var_attr(nc_file_path, variable_name, attribute_name, attribute_value
     variable_name (str): 要操作的变量名
     attribute_name (str): 属性名
     attribute_value (任意类型): 属性值
-    example: modify_var_attr('test.nc', 'data', 'long_name', 'This is a test variable.')
+    example: modify_attr('test.nc', 'temperature', 'long_name', 'Temperature in Celsius')
     """
     try:
         ds = nc.Dataset(nc_file_path, "r+")
@@ -301,7 +301,25 @@ def modify_var_attr(nc_file_path, variable_name, attribute_name, attribute_value
         raise RuntimeError(f"An error occurred: {e}")
 
 
-def rename_var_or_dim(ncfile_path, old_name, new_name):
+def modify(nc_file,var_name,attr_name=None,new_value=None):
+    """
+    description: 修改nc文件中的变量值或属性值
+    parameters:
+        nc_file: str, nc文件路径
+        var_name: str, 变量名
+        attr_name: str, 属性名; None表示修改变量值
+        new_value: 任意类型, 新的变量值或属性值
+    example: 
+        modify(nc_file, 'h', 'long_name', 'Height')
+        modify(nc_file, 'h', None, np.random.rand(100, 50))
+    """
+    if attr_name is None:
+        _modify_var(nc_file, var_name, new_value)
+    else:
+        _modify_attr(nc_file, var_name, attr_name, new_value)
+
+
+def rename(ncfile_path, old_name, new_name):
     """
     Rename a variable and/or dimension in a NetCDF file.
 
@@ -310,7 +328,7 @@ def rename_var_or_dim(ncfile_path, old_name, new_name):
     old_name (str): The name of the variable or dimension to be renamed.
     new_name (str): The new name for the variable or dimension.
 
-    example: rename_var_or_dim('test.nc', 'time', 'ocean_time')
+    example: rename('test.nc', 'time', 'ocean_time')
     """
     try:
         with nc.Dataset(ncfile_path, "r+") as dataset:
@@ -335,7 +353,17 @@ def rename_var_or_dim(ncfile_path, old_name, new_name):
         print(f"An error occurred: {e}")
 
 
-def check_ncfile(ncfile, if_delete=False):
+def check_file(ncfile, if_delete=False):
+    '''
+    Description: 检查nc文件是否损坏
+    
+    Parameters:
+        ncfile: str, nc文件路径
+        if_delete: bool, 是否删除损坏的文件，默认为False
+    
+    Example:
+        check_file(ncfile, if_delete=True)
+    '''
     if not os.path.exists(ncfile):
         return False
 
@@ -377,7 +405,7 @@ def convert_longitude(ds, lon_name="longitude", convert=180):
     """
     to_which = int(convert)
     if to_which not in [180, 360]:
-        raise ValueError("to_which must be '180' or '360'")
+        raise ValueError("convert value must be '180' or '360'")
 
     if to_which == 180:
         ds = ds.assign_coords({lon_name: (ds[lon_name] + 180) % 360 - 180})
@@ -387,7 +415,7 @@ def convert_longitude(ds, lon_name="longitude", convert=180):
     return ds.sortby(lon_name)
 
 
-def nc_isel(ncfile, dim_name, slice_list):
+def isel(ncfile, dim_name, slice_list):
     """
     Description: Choose the data by the index of the dimension
 
@@ -399,6 +427,9 @@ def nc_isel(ncfile, dim_name, slice_list):
     slice_list example: slice_list = [[y*12+m for m in range(11,14)] for y in range(84)]
                     or
                         slice_list = [y * 12 + m for y in range(84) for m in range(11, 14)]
+    
+    Example:
+        isel(ncfile, 'time', slice_list)
     """
     ds = xr.open_dataset(ncfile)
     slice_list = np.array(slice_list).flatten()
@@ -410,4 +441,4 @@ def nc_isel(ncfile, dim_name, slice_list):
 
 if __name__ == "__main__":
     data = np.random.rand(100, 50)
-    write2nc(r"test.nc", data, "data", {"time": np.linspace(0, 120, 100), "lev": np.linspace(0, 120, 50)}, "a")
+    save(r"test.nc", data, "data", {"time": np.linspace(0, 120, 100), "lev": np.linspace(0, 120, 50)}, "a")

{oafuncs-0.0.84.dist-info → oafuncs-0.0.86.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.84
+Version: 0.0.86
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.84.dist-info → oafuncs-0.0.86.dist-info}/RECORD

@@ -1,12 +1,12 @@
 oafuncs/__init__.py,sha256=glcIlhQ9xSK4WtL58dq7Od2S3JPqsuEyhUQ-VWO8hOc,1426
-oafuncs/oa_cmap.py,sha256=rURQujDWzydNVtXOanDtChD248_bapubNsO2dX3Nb-E,6466
-oafuncs/oa_data.py,sha256=DUKc--EyQfIcxAwy2Rv_oDMuE5uw9CVrt0bMAfVog98,12482
-oafuncs/oa_draw.py,sha256=cZG4XfHEk2IoyBEQqkWat2CWbuyI7utFU9X4NGFEhuA,21250
+oafuncs/oa_cmap.py,sha256=azVg9QR_IlG9lXCCXXVs1LS1kFci8yjxDmb_VA_TdTQ,7408
+oafuncs/oa_data.py,sha256=2MkWCsESVPjZPnLnbQIwrBJUhcF9x-WXbZhni3I44ss,15617
+oafuncs/oa_draw.py,sha256=PUk8DdGBUapCXrOVQ-d_DD6EccB_eHAX3r6jwrnQTk8,11126
 oafuncs/oa_file.py,sha256=-AdRnFEtRTpIMXr5geYe5fEhyiMOFad5ethi_lF-Ogo,12277
-oafuncs/oa_help.py,sha256=BFLoOyD5uVeOc8qQ3yAyzIR1q3JAj4GhqQfetd3KML4,1034
-oafuncs/oa_nc.py,sha256=Gj0xLfqgQI3hNnr9SED1WFj2JU4GsJj2on_8EVdSk20,15595
+oafuncs/oa_help.py,sha256=zQEYXFn6eCiEgzSy_gSjhdP3u-KRK4Hl-iGIvPC8EAs,3729
+oafuncs/oa_nc.py,sha256=OeWtv__oPsLNLBS6mOIUCvb8X9GEj4qjjc10lJE-IHE,16432
 oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
-oafuncs/data_store/OAFuncs.png,sha256=C6_1718zWoEvs3QRSt8eWhRedDV4QIhQUKk3LWb1Z6Y,3298028
+oafuncs/data_store/OAFuncs.png,sha256=w2pR7MUyeeWrT8BVTSy40EIRDIrfpdo1QvWvvjLOgjM,3258809
 oafuncs/oa_down/User_Agent-list.txt,sha256=pazxSip8_lphEBOPHG902zmIBUg8sBKXgmqp_g6j_E4,661062
 oafuncs/oa_down/__init__.py,sha256=pKPqxD0z09NEXWCemuemfgTct7Kcu3APPJqqB1FPXRM,565
 oafuncs/oa_down/hycom_3hourly.py,sha256=wYOZrV5mZVSTfx6a5QLay8Jg2sL2x3sWKWmxwidRzMo,62928
@@ -19,8 +19,8 @@ oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
 oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
 oafuncs/oa_tool/email.py,sha256=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
-oafuncs-0.0.84.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.84.dist-info/METADATA,sha256=2RgGeH47uDoGAB9Ql0I8CT7AzG3DoMb6xDPDp7NxyCE,3303
-oafuncs-0.0.84.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.84.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.84.dist-info/RECORD,,
+oafuncs-0.0.86.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.86.dist-info/METADATA,sha256=Bg1Cg7-c-UUc0gGBDqR3HsrbnK6Sz5JgEKz3vdz9SzA,3303
+oafuncs-0.0.86.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.86.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.86.dist-info/RECORD,,