oafuncs 0.0.98.21__py3-none-any.whl → 0.0.98.22__py3-none-any.whl

oafuncs/_script/netcdf_merge.py

@@ -82,8 +82,8 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
 
     for var in pbar(merged_data, "Merging variables"):
         if isinstance(merged_data[var], list):
-            # 使用compat='override'确保合并时属性不会冲突
-            merged_data[var] = xr.concat(merged_data[var], dim=dim_name, compat="override")
+            # 使用 coords='minimal' 替代默认值，并移除可能冲突的 compat='override'
+            merged_data[var] = xr.concat(merged_data[var], dim=dim_name, coords="minimal")
             # 恢复原始填充值和缺失值属性
             if var in fill_values:
                 merged_data[var].attrs["_FillValue"] = fill_values[var]
@@ -100,19 +100,29 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
             if coord not in merged_ds.coords:
                 merged_ds = merged_ds.assign_coords({coord: ds0[coord]})
 
-    # 如果合并维度是坐标，检查所有文件的该坐标是否一致
+    """ # 修改合并维度验证逻辑，更合理地检查所有文件维度的兼容性
     if dim_name in merged_ds.coords and len(file_list) > 1:
-        logging.info(f"验证合并维度 {dim_name} 的一致性...")
-        for file in file_list[1:]:
+        logging.info(f"检查合并维度 {dim_name} 的有效性...")
+
+        # 收集所有文件的该维度值
+        all_dim_values = []
+        for file in file_list:
             with xr.open_dataset(file) as ds:
-                if dim_name in ds.coords and not ds[dim_name].equals(merged_ds[dim_name]):
-                    logging.warning(f"文件 {file} 的 {dim_name} 坐标与合并后的数据不一致，可能导致数据失真")
+                if dim_name in ds.coords:
+                    all_dim_values.append(ds[dim_name].values)
+
+        # 只有当有两个或更多不同值集合时才警告
+        unique_values_count = len({tuple(vals.tolist()) if hasattr(vals, "tolist") else tuple(vals) for vals in all_dim_values})
+        if unique_values_count > 1:
+            logging.warning(f"检测到 {unique_values_count} 种不同的 {dim_name} 坐标值集合，合并可能导致数据重新排列")
+        else:
+            logging.info(f"所有文件的 {dim_name} 坐标值完全一致，合并将保持原始顺序") """
 
     if os.path.exists(target_filename):
         logging.warning("The target file already exists. Removing it ...")
         os.remove(target_filename)
 
-    merged_ds.to_netcdf(target_filename,mode='w')
+    merged_ds.to_netcdf(target_filename, mode="w")
 
 
 # Example usage

oafuncs/oa_cmap.py

@@ -8,7 +8,9 @@ __all__ = ["show", "to_color", "create", "get"]
 
 
 # ** 将cmap用填色图可视化（官网摘抄函数）
-def show(colormaps: Union[str, mpl.colors.Colormap, List[Union[str, mpl.colors.Colormap]]]) -> None:
+def show(
+    colormaps: Union[str, mpl.colors.Colormap, List[Union[str, mpl.colors.Colormap]]],
+) -> None:
     """Helper function to plot data with associated colormap.
 
     This function creates a visualization of one or more colormaps by applying them
@@ -97,7 +99,14 @@ def to_color(colormap_name: str, num_colors: int = 256) -> List[tuple]:
 
 
 # ** 自制cmap，多色，可带位置
-def create(color_list: Optional[List[Union[str, tuple]]] = None, rgb_file: Optional[str] = None, color_positions: Optional[List[float]] = None, below_range_color: Optional[Union[str, tuple]] = None, above_range_color: Optional[Union[str, tuple]] = None, value_delimiter: str = ",") -> mpl.colors.Colormap:
+def create(
+    color_list: Optional[List[Union[str, tuple]]] = None,
+    rgb_file: Optional[str] = None,
+    color_positions: Optional[List[float]] = None,
+    below_range_color: Optional[Union[str, tuple]] = None,
+    above_range_color: Optional[Union[str, tuple]] = None,
+    value_delimiter: str = ",",
+) -> mpl.colors.Colormap:
     """Create a custom colormap from a list of colors or an RGB txt document.
 
     Args:
@@ -144,7 +153,7 @@ def create(color_list: Optional[List[Union[str, tuple]]] = None, rgb_file: Optio
 
     if rgb_file:
         try:
-            print(f"Reading RGB data from {rgb_file}...")
+            # print(f"Reading RGB data from {rgb_file}...")
 
             with open(rgb_file) as fid:
                 data = [line.strip() for line in fid if line.strip() and not line.strip().startswith("#")]
@@ -178,7 +187,7 @@ def create(color_list: Optional[List[Union[str, tuple]]] = None, rgb_file: Optio
             if max_rgb > 2:
                 rgb = rgb / 255.0
             cmap_color = mpl.colors.ListedColormap(rgb, name="my_color")
-            print(f"Successfully created colormap from {rgb_file}")
+            # print(f"Successfully created colormap from {rgb_file}")
         except FileNotFoundError:
             error_msg = f"RGB file not found: {rgb_file}"
             print(error_msg)
@@ -189,15 +198,15 @@ def create(color_list: Optional[List[Union[str, tuple]]] = None, rgb_file: Optio
             cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", color_list)
         else:
             cmap_color = mpl.colors.LinearSegmentedColormap.from_list("mycmap", list(zip(color_positions, color_list)))
-        print(f"Successfully created colormap from {len(color_list)} colors")
+        # print(f"Successfully created colormap from {len(color_list)} colors")
 
     # Set below/above range colors if provided
     if below_range_color is not None:
         cmap_color.set_under(below_range_color)
-        print(f"Set below-range color to {below_range_color}")
+        # print(f"Set below-range color to {below_range_color}")
     if above_range_color is not None:
         cmap_color.set_over(above_range_color)
-        print(f"Set above-range color to {above_range_color}")
+        # print(f"Set above-range color to {above_range_color}")
 
     return cmap_color
 

{oafuncs-0.0.98.21.dist-info → oafuncs-0.0.98.22.dist-info}/METADATA

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

{oafuncs-0.0.98.21.dist-info → oafuncs-0.0.98.22.dist-info}/RECORD

@@ -1,5 +1,5 @@
 oafuncs/__init__.py,sha256=T_-VtnWWllV3Q91twT5Yt2sUapeA051QbPNnBxmg9nw,1456
-oafuncs/oa_cmap.py,sha256=NVKwEkmMUKXh9L1svx_WHqemLOx3evgX3_-UVDxc9ko,11498
+oafuncs/oa_cmap.py,sha256=pUFAGzbIg0WLxObBP2t_--ZIg00Dxdojx0y7OjTeqEo,11551
 oafuncs/oa_data.py,sha256=Aat9ktxxRGevaqQya3IJWfXeoEs-FCXGUcNE2pKnzfU,10931
 oafuncs/oa_date.py,sha256=WhM6cyD4G3IeghjLTHhAMtlvJbA7kwQG2sHnxdTgyso,6303
 oafuncs/oa_draw.py,sha256=IaBGDx-EOxyMM2IuJ4zLZt6ruHHV5qFStPItmUOXoWk,17635
@@ -14,7 +14,7 @@ oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZ
 oafuncs/_script/data_interp.py,sha256=EiZbt6n5BEaRKcng88UgX7TFPhKE6TLVZniS01awXjg,5146
 oafuncs/_script/data_interp_geo.py,sha256=ZRFb3fKRiYQViZNHd19eW20C9i38BsiIU8w0fG5mbqM,7789
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
-oafuncs/_script/netcdf_merge.py,sha256=4mZLMcxBL4Rehi_eW2EX6vqbMJgZBOL4_ceaMzcuzio,5565
+oafuncs/_script/netcdf_merge.py,sha256=tM9ePqLiEsE7eIsNM5XjEYeXwxjYOdNz5ejnEuI7xKw,6066
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
 oafuncs/_script/netcdf_write.py,sha256=GvyUyUhzMonzSp3y4pT8ZAfbQrsh5J3dLnmINYJKhuE,21422
 oafuncs/_script/parallel.py,sha256=07-BJVHxXJNlrOrhrSGt7qCZiKWq6dBvNDBA1AANYnI,8861
@@ -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.21.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.21.dist-info/METADATA,sha256=Lk9y2XVdDKb9HB5PP_Pm-_aII0tnGmaladuGW1Y9otM,4273
-oafuncs-0.0.98.21.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
-oafuncs-0.0.98.21.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.21.dist-info/RECORD,,
+oafuncs-0.0.98.22.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.22.dist-info/METADATA,sha256=ctJ9aAoY3RztAP6gD2STCFB0ZZaCbXQV8SufCLMGkbM,4273
+oafuncs-0.0.98.22.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+oafuncs-0.0.98.22.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.22.dist-info/RECORD,,

{oafuncs-0.0.98.21.dist-info → oafuncs-0.0.98.22.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.1)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any