oafuncs 0.0.98.42__tar.gz → 0.0.98.43__tar.gz

{oafuncs-0.0.98.42/oafuncs.egg-info → oafuncs-0.0.98.43}/PKG-INFO

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

{oafuncs-0.0.98.42 → oafuncs-0.0.98.43}/oafuncs/_script/netcdf_write.py

@@ -81,13 +81,9 @@ def _calculate_scale_and_offset(data, dtype="int32"):
     if dtype == "int32":
         n = 32
         fill_value = np.iinfo(np.int32).min  # -2147483648
-        max_packed_value = np.iinfo(np.int32).max  # 2147483647
-        min_packed_value = np.iinfo(np.int32).min + 1  # -2147483647 (保留最小值作为填充值)
     elif dtype == "int16":
         n = 16
         fill_value = np.iinfo(np.int16).min  # -32768
-        max_packed_value = np.iinfo(np.int16).max  # 32767
-        min_packed_value = np.iinfo(np.int16).min + 1  # -32767 (保留最小值作为填充值)
     else:
         raise ValueError("Unsupported dtype. Supported types are 'int16' and 'int32'.")
 
@@ -97,15 +93,8 @@ def _calculate_scale_and_offset(data, dtype="int32"):
         valid_mask &= ~data.mask
 
     if np.any(valid_mask):
-        data_min = np.min(data[valid_mask])
-        data_max = np.max(data[valid_mask])
-        
-        # 添加一个小的缓冲以确保所有值都在范围内，但不要过大
-        data_range = data_max - data_min
-        if data_range > 0:
-            buffer = data_range * 1e-6  # 使用相对缓冲而不是绝对值1
-            data_min -= buffer
-            data_max += buffer
+        data_min = np.min(data[valid_mask])-1
+        data_max = np.max(data[valid_mask])+1
     else:
         data_min, data_max = 0, 1
 
@@ -114,9 +103,7 @@ def _calculate_scale_and_offset(data, dtype="int32"):
         scale_factor = 1.0
         add_offset = data_min
     else:
-        # 使用可用的打包值范围计算scale_factor
-        packed_range = max_packed_value - min_packed_value
-        scale_factor = (data_max - data_min) / packed_range
+        scale_factor = (data_max - data_min) / (2**n - 2)
         add_offset = (data_max + data_min) / 2.0
     return scale_factor, add_offset
 
@@ -154,18 +141,14 @@ def _data_to_scale_offset(data, scale, offset, dtype='int32'):
         # 只有掩码标记的区域视为无效
         valid_mask &= ~data.mask
 
-    # 初始化结果数组为填充值
-    result = np.full_like(data, fill_value, dtype=np_dtype)
-    
+    result = data.copy()
     if np.any(valid_mask):
-        # 标准的scale/offset转换公式：packed_value = (unpacked_value - add_offset) / scale_factor
+        # 反向映射时能还原原始值
         scaled = (data[valid_mask] - offset) / scale
-        # 四舍五入到最近的整数
         scaled = np.round(scaled).astype(np_dtype)
-        # clip到整数范围，保留最大范围供转换
-        scaled = np.clip(scaled, clip_min, clip_max)  # 不使用最小值，保留做 _FillValue
+        # clip到int32范围，保留最大范围供转换
+        scaled = np.clip(scaled, clip_min, clip_max)  # 不使用 -2147483648，保留做 _FillValue
         result[valid_mask] = scaled
-    
     return result
 
 
@@ -391,6 +374,7 @@ def save_to_nc(file, data, varname=None, coords=None, mode="w", convert_dtype='i
         raise RuntimeError(f"netCDF4 保存失败: {str(e)}") from e
 
 
+
 # 测试用例
 if __name__ == "__main__":
     # 示例文件路径，需根据实际情况修改

{oafuncs-0.0.98.42 → oafuncs-0.0.98.43}/oafuncs/_script/plot_dataset.py

@@ -197,12 +197,12 @@ def select_colormap_and_levels(data_range: Tuple[float, float], plot_type: str)
         num_levels = 128
 
     if data_range[0] * data_range[1] < 0:
-        cmap = oafuncs.oa_cmap.get("diverging_1")
+        cmap = oafuncs.oa_cmap.get(diverging_cmap)
         bdy = max(abs(data_range[0]), abs(data_range[1]))
         norm = mpl.colors.TwoSlopeNorm(vmin=-bdy, vcenter=0, vmax=bdy)
         levels = np.linspace(-bdy, bdy, num_levels)
     else:
-        cmap = oafuncs.oa_cmap.get("cool_1") if data_range[0] < 0 else oafuncs.oa_cmap.get("warm_1")
+        cmap = oafuncs.oa_cmap.get(negative_cmap) if data_range[0] < 0 else oafuncs.oa_cmap.get(positive_cmap)
         norm = mpl.colors.Normalize(vmin=data_range[0], vmax=data_range[1])
         levels = np.linspace(data_range[0], data_range[1], num_levels)
 
@@ -320,9 +320,14 @@ def get_xyzt_names(ds_in, xyzt_dims):
     return x_dim, y_dim, z_dim, t_dim
 
 
-def func_plot_dataset(ds_in: Union[xr.Dataset, xr.DataArray], output_dir: str, xyzt_dims: Tuple[str, str, str, str] = None, plot_type: str = "contourf", fixed_colorscale: bool = False) -> None:
+def func_plot_dataset(ds_in: Union[xr.Dataset, xr.DataArray], output_dir: str, cmap='diverging_3', pcmap='warm_3', ncmap='cool_3', xyzt_dims: Tuple[str, str, str, str] = None, plot_type: str = "contourf", fixed_colorscale: bool = False) -> None:
     """Plot variables from a NetCDF file and save the plots to the specified directory."""
     os.makedirs(output_dir, exist_ok=True)
+    
+    global diverging_cmap, positive_cmap, negative_cmap
+    diverging_cmap = cmap
+    positive_cmap = pcmap
+    negative_cmap = ncmap
 
     # Main processing function
     try:

{oafuncs-0.0.98.42 → oafuncs-0.0.98.43}/oafuncs/oa_nc.py

@@ -270,6 +270,9 @@ def draw(
     output_directory: Optional[str] = None,
     dataset: Optional[xr.Dataset] = None,
     file_path: Optional[str] = None,
+    cmap='diverging_3',
+    pcmap='warm_3',
+    ncmap='cool_3',
     dims_xyzt: Union[List[str], Tuple[str, str, str, str]] = None,
     plot_style: str = "contourf",
     use_fixed_colorscale: bool = False,
@@ -296,18 +299,18 @@ def draw(
         raise ValueError("dimensions must be a list or tuple")
 
     if dataset is not None:
-        func_plot_dataset(dataset, output_directory, dims_xyzt, plot_style, use_fixed_colorscale)
+        func_plot_dataset(dataset, output_directory, cmap, pcmap, ncmap, dims_xyzt, plot_style, use_fixed_colorscale)
     elif file_path is not None:
         if check(file_path):
             ds = xr.open_dataset(file_path)
-            func_plot_dataset(ds, output_directory, dims_xyzt, plot_style, use_fixed_colorscale)
+            func_plot_dataset(ds, output_directory, cmap, pcmap, ncmap, dims_xyzt, plot_style, use_fixed_colorscale)
         else:
             print(f"[red]Invalid file: {file_path}[/red]")
     else:
         print("[red]No dataset or file provided.[/red]")
 
 
-def compress(src_path, dst_path=None,convert_dtype='int16'):
+def compress(src_path, dst_path=None,convert_dtype='int32'):
     """
     压缩 NetCDF 文件，使用 scale_factor/add_offset 压缩数据。
     若 dst_path 省略，则自动生成新文件名，写出后删除原文件并将新文件改回原名。

{oafuncs-0.0.98.42 → oafuncs-0.0.98.43/oafuncs.egg-info}/PKG-INFO

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

{oafuncs-0.0.98.42 → oafuncs-0.0.98.43}/setup.py

@@ -18,7 +18,7 @@ URL = "https://github.com/Industry-Pays/OAFuncs"
 EMAIL = "liukun0312@stu.ouc.edu.cn"
 AUTHOR = "Kun Liu"
 REQUIRES_PYTHON = ">=3.10.0"  # 2025/03/13
-VERSION = "0.0.98.42"
+VERSION = "0.0.98.43"
 
 # What packages are required for this module to be executed?
 REQUIRED = [