oafuncs 0.0.98.8__tar.gz → 0.0.98.9__tar.gz

{oafuncs-0.0.98.8/oafuncs.egg-info → oafuncs-0.0.98.9}/PKG-INFO

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

{oafuncs-0.0.98.8 → oafuncs-0.0.98.9}/oafuncs/_script/netcdf_merge.py

@@ -1,9 +1,12 @@
 import os
 from typing import List, Optional, Union
-from dask.diagnostics import ProgressBar
+
+import numpy as np
 import xarray as xr
+from dask.diagnostics import ProgressBar
 from oafuncs import pbar
 
+
 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:
     """
     Description:
@@ -22,7 +25,7 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
         merge(file_list, var_name=['u', 'v'], dim_name='time', target_filename='merged.nc')
         merge(file_list, var_name=None, dim_name='time', target_filename='merged.nc')
     """
-    
+
     if target_filename is None:
         target_filename = "merged.nc"
 
@@ -55,11 +58,19 @@ def merge_nc(file_list: Union[str, List[str]], var_name: Optional[Union[str, Lis
                 if dim_name in data_var.dims:
                     merged_data.setdefault(var, []).append(data_var)
                 elif var not in merged_data:
-                    merged_data[var] = data_var.fillna(0)  # 用0填充NaN值
+                    # 判断类型，时间类型用NaT填充
+                    if np.issubdtype(data_var.dtype, np.datetime64):
+                        merged_data[var] = data_var.fillna(np.datetime64("NaT"))
+                    else:
+                        merged_data[var] = data_var.fillna(0)
 
     for var in pbar(merged_data, description="Merging variables", color="#9b45d1"):
         if isinstance(merged_data[var], list):
-            merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(0)
+            # 判断类型，时间类型用NaT填充
+            if np.issubdtype(merged_data[var][0].dtype, np.datetime64):
+                merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(np.datetime64("NaT"))
+            else:
+                merged_data[var] = xr.concat(merged_data[var], dim=dim_name).fillna(0)
         # print(f"Variable '{var}' merged: min={merged_data[var].min().values:.3f}, max={merged_data[var].max().values:.3f}, mean={merged_data[var].mean().values:.3f}")
 
     # 修改写入数据部分，支持压缩并设置基数和比例因子

{oafuncs-0.0.98.8 → oafuncs-0.0.98.9}/oafuncs/oa_data.py

@@ -190,8 +190,9 @@ def interp_2d(
     for t_index in range(t):
         for z_index in range(z):
             paras.append((new_src_data[t_index, z_index], origin_points, target_points, interpolation_method, target_shape))
-    excutor = PEx()
-    result = excutor.run(_interp_single_worker, paras)
+    
+    with PEx() as excutor:
+        result = excutor.run(_interp_single_worker, paras)
 
     return np.squeeze(np.array(result))
 

{oafuncs-0.0.98.8 → oafuncs-0.0.98.9}/oafuncs/oa_date.py

@@ -64,7 +64,6 @@ def hour_range(start_time: str, end_time: str, hour_interval: int = 6) -> List[s
         date_s += datetime.timedelta(hours=hour_interval)
     return date_list
 
-
 def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", output_format: Optional[str] = None) -> str:
     """
     Adjust a given base time by adding a specified time delta.
@@ -89,7 +88,12 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
     """
     # Normalize the input time to "yyyymmddHHMMSS" format
     time_format = "%Y%m%d%H%M%S"
+    if len(base_time) == 4:
+        base_time += "0101"
+    elif len(base_time) == 6:
+        base_time += "01"
     base_time = base_time.ljust(14, "0")
+
     time_obj = datetime.datetime.strptime(base_time, time_format)
 
     # Add the specified amount of time
@@ -101,8 +105,19 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
         time_obj += datetime.timedelta(hours=time_delta)
     elif delta_unit == "days":
         time_obj += datetime.timedelta(days=time_delta)
+    elif delta_unit == "months":
+        # Handle month addition separately
+        month = time_obj.month - 1 + time_delta
+        year = time_obj.year + month // 12
+        month = month % 12 + 1
+        day = min(time_obj.day, month_days(year, month))
+        time_obj = time_obj.replace(year=year, month=month, day=day)
+    elif delta_unit == "years":
+        # Handle year addition separately
+        year = time_obj.year + time_delta
+        time_obj = time_obj.replace(year=year)
     else:
-        raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', or 'days'.")
+        raise ValueError("Invalid time unit. Use 'seconds', 'minutes', 'hours', 'days', 'months', or 'years'.")
 
     # Determine the output format
     if output_format:
@@ -116,6 +131,10 @@ def adjust_time(base_time: str, time_delta: int, delta_unit: str = "hours", outp
             default_format = "%Y%m%d%H"
         elif delta_unit == "days":
             default_format = "%Y%m%d"
+        elif delta_unit == "months":
+            default_format = "%Y%m"
+        elif delta_unit == "years":
+            default_format = "%Y"
         return time_obj.strftime(default_format)
 
 

{oafuncs-0.0.98.8 → oafuncs-0.0.98.9/oafuncs.egg-info}/PKG-INFO

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

{oafuncs-0.0.98.8 → oafuncs-0.0.98.9}/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.8"
+VERSION = "0.0.98.9"
 
 # What packages are required for this module to be executed?
 REQUIRED = [