oafuncs 0.0.98.11__tar.gz → 0.0.98.12__tar.gz

{oafuncs-0.0.98.11/oafuncs.egg-info → oafuncs-0.0.98.12}/PKG-INFO

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

{oafuncs-0.0.98.11 → oafuncs-0.0.98.12}/oafuncs/_script/netcdf_merge.py

@@ -4,7 +4,9 @@ from typing import List, Optional, Union
 import numpy as np
 import xarray as xr
 from dask.diagnostics import ProgressBar
+
 from oafuncs import pbar
+from oafuncs._script.netcdf_write import _calculate_scale_and_offset  # 新增导入
 
 
 def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, List[str]]] = None, dim_name: Optional[str] = None, target_filename: Optional[str] = None) -> None:
@@ -83,24 +85,19 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
         encoding = {}
         for var in merged_dataset.data_vars:
             data = merged_dataset[var].values
-            # print(f"Variable '{var}' ready for writing: min={data.min():.3f}, max={data.max():.3f}, mean={data.mean():.3f}")
             if data.dtype.kind in {"i", "u", "f"}:  # 仅对数值型数据进行压缩
-                data_range = data.max() - data.min()
-                if data_range > 0:  # 避免范围过小导致的精度问题
-                    scale_factor = data_range / (2**16 - 1)
-                    add_offset = data.min()
-                    encoding[var] = {
-                        "zlib": True,
-                        "complevel": 4,
-                        "dtype": "int16",
-                        "scale_factor": scale_factor,
-                        "add_offset": add_offset,
-                        "_FillValue": -32767,
-                    }
-                else:
-                    encoding[var] = {"zlib": True, "complevel": 4}  # 范围过小时禁用缩放
+                # 统一调用 netcdf_write 中的 scale/offset 计算
+                scale_factor, add_offset = _calculate_scale_and_offset(data, n=16)
+                encoding[var] = {
+                    "zlib": True,
+                    "complevel": 4,
+                    "dtype": "int16",
+                    "scale_factor": scale_factor,
+                    "add_offset": add_offset,
+                    "_FillValue": -32767,
+                }
             else:
-                encoding[var] = {"zlib": True, "complevel": 4}  # 非数值型数据不使用缩放
+                encoding[var] = {"zlib": True, "complevel": 4}
 
         # 确保写入时不会因编码问题导致数据丢失
         # merged_dataset.to_netcdf(target_filename, encoding=encoding)

{oafuncs-0.0.98.11 → oafuncs-0.0.98.12/oafuncs.egg-info}/PKG-INFO

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

{oafuncs-0.0.98.11 → oafuncs-0.0.98.12}/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.9.0"  # 2025/03/13
-VERSION = "0.0.98.11"
+VERSION = "0.0.98.12"
 
 # What packages are required for this module to be executed?
 REQUIRED = [