oafuncs 0.0.98.11__py3-none-any.whl → 0.0.98.12__py3-none-any.whl

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.dist-info → oafuncs-0.0.98.12.dist-info}/METADATA

@@ -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.dist-info → oafuncs-0.0.98.12.dist-info}/RECORD

@@ -12,7 +12,7 @@ oafuncs/_data/hycom.png,sha256=MadKs6Gyj5n9-TOu7L4atQfTXtF9dvN9w-tdU9IfygI,10945
 oafuncs/_data/oafuncs.png,sha256=o3VD7wm-kwDea5E98JqxXl04_78cBX7VcdUt7uQXGiU,3679898
 oafuncs/_script/cprogressbar.py,sha256=UIgGcLFs-6IgWlITuBLaQqrpt4OAK3Mst5RlCiNfZdQ,15772
 oafuncs/_script/email.py,sha256=lL4HGKrr524-g0xLlgs-4u7x4-u7DtgNoD9AL8XJKj4,3058
-oafuncs/_script/netcdf_merge.py,sha256=ktmTOgGfLHBNdS4HBc6xFDfO8B7E4DT7d1e6Dtare9Y,5596
+oafuncs/_script/netcdf_merge.py,sha256=ncNxstXJ77Ftyac5b1yRriVoBxbTVtaU111NU_7k_QA,5282
 oafuncs/_script/netcdf_modify.py,sha256=sGRUYNhfGgf9JV70rnBzw3bzuTRSXzBTL_RMDnDPeLQ,4552
 oafuncs/_script/netcdf_write.py,sha256=iO1Qv9bp6RLiw1D8Nrv7tX_8X-diUZaX3Nxhk6pJ5Nw,8556
 oafuncs/_script/parallel.py,sha256=T9Aie-e4LcbKlFTLZ0l4lhEN3SBVa84jRcrAsIm8s0I,8767
@@ -37,8 +37,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.11.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.98.11.dist-info/METADATA,sha256=vbHI4zd7XEcXnbCI7VuGmyDEcnfv5hsVjR8XczfObTU,4273
-oafuncs-0.0.98.11.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-oafuncs-0.0.98.11.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.98.11.dist-info/RECORD,,
+oafuncs-0.0.98.12.dist-info/licenses/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.98.12.dist-info/METADATA,sha256=TfDApyqtzs-wBr9sBG2sYBVHZFfJht6g1N3JtCQSHfU,4273
+oafuncs-0.0.98.12.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+oafuncs-0.0.98.12.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.98.12.dist-info/RECORD,,