oafuncs 0.0.95__tar.gz → 0.0.97__tar.gz

{oafuncs-0.0.95/oafuncs.egg-info → oafuncs-0.0.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oafuncs
-Version: 0.0.95
+Version: 0.0.97
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -33,6 +33,7 @@ Requires-Dist: geopandas
 Requires-Dist: Cartopy
 Requires-Dist: rasterio
 Requires-Dist: salem
+Requires-Dist: calendar
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs/__init__.py

@@ -4,8 +4,8 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-09-17 16:09:20
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-12-13 12:31:06
-FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_s\\__init__.py
+LastEditTime: 2025-03-09 16:28:01
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\__init__.py
 Description:
 EditPlatform: vscode
 ComputerInfo: XPS 15 9510
@@ -14,6 +14,7 @@ Python Version: 3.12
 """
 
 
+
 # 会导致OAFuncs直接导入所有函数，不符合模块化设计
 # from oafuncs.oa_s.oa_cmap import *
 # from oafuncs.oa_s.oa_data import *
@@ -27,18 +28,24 @@ Python Version: 3.12
 # path: My_Funcs/OAFuncs/oafuncs/
 from .oa_cmap import *
 from .oa_data import *
+
+# ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/oa_down/
+from .oa_down import *
 from .oa_draw import *
 from .oa_file import *
 from .oa_help import *
 from .oa_nc import *
 from .oa_python import *
-# ------------------- 2024-12-13 12:31:06 -------------------
-# path: My_Funcs/OAFuncs/oafuncs/oa_down/
-from .oa_down import *
+
 # ------------------- 2024-12-13 12:31:06 -------------------
 # path: My_Funcs/OAFuncs/oafuncs/oa_sign/
 from .oa_sign import *
+
 # ------------------- 2024-12-13 12:31:06 -------------------
 # path: My_Funcs/OAFuncs/oafuncs/oa_tool/
 from .oa_tool import *
 # ------------------- 2024-12-13 12:31:06 -------------------
+# path: My_Funcs/OAFuncs/oafuncs/oa_model/
+from .oa_model import *
+# ------------------- 2025-03-09 16:28:01 -------------------

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs/oa_down/hycom_3hourly.py

@@ -536,8 +536,10 @@ def _get_base_url(dataset_name, version_name, var, ymdh_str):
             mdh_str = ymdh_str[4:]
             # GLBy0.08 93.0
             # data time range in each year: year-01-01 12:00 to year+1-01-01 09:00
-            if mdh_str <= "010109":
+            if "010100" <= mdh_str <= "010109":
                 year_str = int(ymdh_str[:4]) - 1
+            else:
+                year_str = int(ymdh_str[:4])
         base_url = None
         for key, value in var_group.items():
             if var in value:
@@ -547,6 +549,13 @@ def _get_base_url(dataset_name, version_name, var, ymdh_str):
             print("Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]")
     elif classification_method == "single_var_year_different":
         base_url = None
+        if dataset_name == "ESPC_D" and version_name == "V02":
+            mdh_str = ymdh_str[4:]
+            # ESPC-D-V02
+            if "010100" <= mdh_str <= "010109":
+                year_str = int(ymdh_str[:4]) - 1
+            else:
+                year_str = int(ymdh_str[:4])
         for key, value in single_var_group.items():
             if var in value:
                 base_url = url_dict[key][str(year_str)]
@@ -1276,9 +1285,9 @@ if __name__ == "__main__":
 
     options = {
         "var": var_list,
-        "time_s": "2018010100",
-        "time_e": "2020123121",
-        "store_path": r"F:\Data\HYCOM\3hourly",
+        "time_s": "2025010300",
+        "time_e": "2025010321",
+        "store_path": r"I:\Data\HYCOM\3hourly",
         "lon_min": 105,
         "lon_max": 130,
         "lat_min": 15,
@@ -1289,7 +1298,7 @@ if __name__ == "__main__":
         "level": None,  # or 1-40 levels
         "ftimes": 1,
         # "idm_engine": r"D:\Programs\Internet Download Manager\IDMan.exe",  # 查漏补缺不建议开启
-        "fill_time": False,
+        "fill_time": None,
     }
 
     if single_var:

oafuncs-0.0.97/oafuncs/oa_model/__init__.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 16:28:42
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 16:28:42
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_model\\__init__.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+
+# 会导致OAFuncs直接导入所有函数，不符合模块化设计
+from .roms import *
+from .wrf import *

oafuncs-0.0.97/oafuncs/oa_model/roms/__init__.py

@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 16:30:02
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 18:23:30
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_model\\roms\\__init__.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+
+
+
+# 会导致OAFuncs直接导入所有函数，不符合模块化设计
+from .test import *

oafuncs-0.0.97/oafuncs/oa_model/roms/test.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 16:30:54
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 16:30:54
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_model\\roms\\depth.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+__all__ = ['test']
+
+def test():
+    print('test')

oafuncs-0.0.97/oafuncs/oa_model/wrf/__init__.py

@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 16:29:59
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 16:29:59
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_model\\wrf\\__init__.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+
+# 会导致OAFuncs直接导入所有函数，不符合模块化设计
+from .little_r import *

oafuncs-0.0.97/oafuncs/oa_model/wrf/little_r.py

@@ -0,0 +1,186 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 16:31:45
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 16:31:45
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_model\\wrf\\little_r.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+__all__ = ["header_record", "data_record", "ending_record", "tail_record"]
+
+import sys
+
+
+def header_record(Latitude, Longitude, ID, Platform, Elevation, Bogus, Date, SLP, name):
+    """
+    Latitude  : F20.5 纬度，浮点数，总共20位，小数点后保留5位
+    Lontitude : F20.5 经度，浮点数，总共20位，小数点后保留5位
+    Platform  : A40 FM 编码的浮标编号，总共40位
+    Elevation : F20.5  浮标高度，单位为米，浮点数，总共20位，小数点后保留5位
+    Bogus     : logical 标志数据是否有效，True为无效，False为有效
+    Date      : A20 日期，总共20位
+    """
+    # 存放header record的字典
+    dict_header = {}
+    dict_header["Latitude"] = str_F20p5(Latitude)
+    dict_header["Longitude"] = str_F20p5(Longitude)
+    dict_header["ID"] = str_A40_Front_Space(ID)
+    dict_header["Name"] = str_A40_Front_Space(name)
+    dict_header["Platform"] = str_A40_Front_Space(Platform)
+    dict_header["Source"] = "                                     N/A"  # A40
+    dict_header["Elevation"] = str_F20p5(Elevation)
+    dict_header["ValidFields"] = "         1"  # I10
+    dict_header["NumErrors"] = "   -888888"  # I10
+    dict_header["NumWarnings"] = "   -888888"  # I10
+    dict_header["SequenceNumber"] = "       890"  # I10
+    dict_header["NumDuplicates"] = "   -888888"  # I10
+    dict_header["IsSounding"] = "         F"  # logical 10
+    dict_header["IsBogus"] = str_L10(Bogus)
+    dict_header["Discard"] = "         F"  # logical 10
+    dict_header["UnixTime"] = "   -888888"  # I10
+    dict_header["JulianDay"] = "   -888888"  # I10
+    dict_header["Date"] = str_A20_Behind_Space(Date)
+    dict_header["SLP-QC"] = str_F13p5(SLP) + "      0"  # F13.5 I7
+    dict_header["RefPressure-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["GroundTemp-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["SST-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["SFCPressure-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["Precip-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["DailyMaxT-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["DailyMinT-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["NightMinT-TC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["3hrPresChange-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["24hrChange-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["CloudCover-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["Ceiling-QC"] = "-888888.00000      0"  # F13.5 I7
+    dict_header["PrecipitableWater-QC"] = "-888888.00000      0"  # F13.5 I7
+
+    # 生成文件头的字符串，固定长度为620
+    header_str = ""
+    for iKey in dict_header.keys():
+        header_str = header_str + dict_header[iKey]
+    if len(header_str) != 620:
+        print("Error: The header record len =", len(header_str), ",The correct length should be 620!")
+        sys.exit(1)
+    return header_str
+
+
+def data_record(Pressure, Height, Temperature, DewPoint, WindSpeed, WindDirection, WindU, WindV, RelativeHumidity, Thickness):
+    """
+    Pressure         : F13.5, Pa
+    Height           : F13.5, m
+    Temperature      : F13.5, K
+    DewPoint         : F13.5, K
+    WindSpeed        : F13.5, m/s
+    WindDirection    : F13.5, deg
+    WindU            : F13.5, m/s
+    WindV            : F13.5, m/s
+    RelativeHumidity : F13.5, %
+    Thickness        : F13.5, m
+    """
+    dict_data = {}
+    dict_data["Pressure"] = str_F13p5(Pressure)  # F13.5
+    dict_data["QC1"] = "      0"  # I7
+    dict_data["Height"] = str_F13p5(Height)  # F13.5
+    dict_data["QC2"] = "      0"  # I7
+    dict_data["Temperature"] = str_F13p5(Temperature)  # F13.5
+    dict_data["QC3"] = "      0"  # I7
+    dict_data["DewPoint"] = str_F13p5(DewPoint)  # F13.5
+    dict_data["QC4"] = "      0"  # I7
+    dict_data["WindSpeed"] = str_F13p5(WindSpeed)  # F13.5
+    dict_data["QC5"] = "      0"  # I7
+    dict_data["WindDirection"] = str_F13p5(WindDirection)  # F13.5
+    dict_data["QC6"] = "      0"  # I7
+    dict_data["WindU"] = str_F13p5(WindU)  # F13.5
+    dict_data["QC7"] = "      0"  # I7
+    dict_data["WindV"] = str_F13p5(WindV)  # F13.5
+    dict_data["QC8"] = "      0"  # I7
+    dict_data["RelativeHumidity"] = str_F13p5(RelativeHumidity)  # F13.5
+    dict_data["QC9"] = "      0"  # I7
+    dict_data["Thickness"] = str_F13p5(Thickness)  # F13.5
+    dict_data["QC10"] = "      0"  # I7
+
+    # 生成数据记录，固定长度为200
+    data_str = ""
+    for iKey in dict_data.keys():
+        data_str = data_str + dict_data[iKey]
+    if len(data_str) != 200:
+        print("Error: The data record len =", len(data_str), ",The correct length should be 200!")
+        sys.exit(1)
+    return data_str
+
+
+def ending_record():
+    ending_str = "-777777.00000      0-777777.00000      0-888888.00000      0-888888.00000      0-888888.00000      0-888888.00000      0-888888.00000      0-888888.00000      0-888888.00000      0-888888.00000      0"
+    return ending_str
+
+
+def tail_record(ValidFields):
+    """
+    ValidFields : integer
+    """
+    NumErrors = "      0"
+    NumWarnings = "      0"
+    tail_str = str_I7(ValidFields) + NumErrors + NumWarnings
+    if len(tail_str) != 21:
+        print("Error: The tail record len =", len(tail_str), ",The correct length should be 21!")
+        sys.exit(1)
+    return tail_str
+
+
+# 将浮点数格式化为长度为13位，小数点后保留5位的字符串，并在前面添加合适的空格
+def str_F13p5(float):
+    a = "%.5f" % float
+    space = " " * (13 - len(a))
+    return space + str(a)
+
+
+# 将浮点数格式化为长度为20位，小数点后保留5位的字符串，并在前面添加合适的空格
+def str_F20p5(float):
+    a = "%.5f" % float
+    space = " " * (20 - len(a))
+    return space + str(a)
+
+
+# 将字符串格式化为长度为40位的字符串，并在前面添加合适的空格。如果原始字符串超过了40位，会将其截断为前40位。
+def str_A40_Front_Space(string):
+    # valid string in Front of space
+    string0 = str(string).strip()
+    space = " " * (40 - len(string0))
+    return string0 + space
+
+
+# 将字符串格式化为长度为20位的字符串，并在后面添加合适的空格。如果原始字符串超过了20位，会将其截断为前20位。
+def str_A20_Behind_Space(string):
+    # valid string Behind space
+    string0 = str(string).strip()
+    space = " " * (20 - len(string0))
+    return space + string0
+
+
+# 将整数格式化为长度为10位的字符串，并在前面添加合适的空格
+def str_I10(int0):
+    space = " " * (10 - len(int0))
+    return space + str(int0)
+
+
+# 将整数格式化为长度为7位的字符串，并在前面添加合适的空格
+def str_I7(int0):
+    space = " " * (7 - len(str(int0)))
+    return space + str(int0)
+
+
+# 将布尔值格式化为长度为10位的字符串，如果为True则返回字符串'         T'，如果为False则返回字符串'         F'
+def str_L10(logical):
+    if logical:
+        string = "         T"
+    else:
+        string = "         F"
+    return string

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs/oa_nc.py

@@ -254,13 +254,13 @@ def merge(file_list, var_name=None, dim_name=None, target_filename=None):
 
     merged_data = xr.Dataset(merged_data)
 
-    print("Writing data to file ...")
+    print("\nWriting data to file ...")
     if os.path.exists(target_filename):
         print("Warning: The target file already exists.")
         print("Removing existing file ...")
         os.remove(target_filename)
     merged_data.to_netcdf(target_filename)
-    print(f'File "{target_filename}" has been created.')
+    print(f'\nFile "{target_filename}" has been created.')
 
 
 def _modify_var(nc_file_path, variable_name, new_value):

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs/oa_tool/__init__.py

@@ -16,3 +16,4 @@ Python Version: 3.12
 # 会导致OAFuncs直接导入所有函数，不符合模块化设计
 from .email import *
 from .parallel import *
+from .time import *

oafuncs-0.0.97/oafuncs/oa_tool/time.py

@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# coding=utf-8
+"""
+Author: Liu Kun && 16031215@qq.com
+Date: 2025-03-09 13:55:46
+LastEditors: Liu Kun && 16031215@qq.com
+LastEditTime: 2025-03-09 13:55:46
+FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_tool\\time.py
+Description:
+EditPlatform: vscode
+ComputerInfo: XPS 15 9510
+SystemInfo: Windows 11
+Python Version: 3.12
+"""
+
+
+import calendar
+
+__all__ = ["get_days"]
+
+def get_days(year, month):
+    return calendar.monthrange(year, month)[1]

{oafuncs-0.0.95 → oafuncs-0.0.97/oafuncs.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: oafuncs
-Version: 0.0.95
+Version: 0.0.97
 Summary: Oceanic and Atmospheric Functions
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu
@@ -33,6 +33,7 @@ Requires-Dist: geopandas
 Requires-Dist: Cartopy
 Requires-Dist: rasterio
 Requires-Dist: salem
+Requires-Dist: calendar
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs.egg-info/SOURCES.txt

@@ -24,10 +24,16 @@ oafuncs/oa_down/idm.py
 oafuncs/oa_down/literature.py
 oafuncs/oa_down/test_ua.py
 oafuncs/oa_down/user_agent.py
+oafuncs/oa_model/__init__.py
+oafuncs/oa_model/roms/__init__.py
+oafuncs/oa_model/roms/test.py
+oafuncs/oa_model/wrf/__init__.py
+oafuncs/oa_model/wrf/little_r.py
 oafuncs/oa_sign/__init__.py
 oafuncs/oa_sign/meteorological.py
 oafuncs/oa_sign/ocean.py
 oafuncs/oa_sign/scientific.py
 oafuncs/oa_tool/__init__.py
 oafuncs/oa_tool/email.py
-oafuncs/oa_tool/parallel.py
+oafuncs/oa_tool/parallel.py
+oafuncs/oa_tool/time.py

{oafuncs-0.0.95 → oafuncs-0.0.97}/oafuncs.egg-info/requires.txt

@@ -13,3 +13,4 @@ geopandas
 Cartopy
 rasterio
 salem
+calendar

{oafuncs-0.0.95 → oafuncs-0.0.97}/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/01/05
-VERSION = '0.0.95'
+VERSION = '0.0.97'
 
 # What packages are required for this module to be executed?
 REQUIRED = [
@@ -43,8 +43,10 @@ REQUIRED = [
     "geopandas",
     "Cartopy",
     # ------- Data ------
-    "rasterio", # 裁剪数据
-    "salem", 
+    "rasterio",  # 裁剪数据
+    "salem",
+    # ------ Time ------
+    "calendar",
     # ------ Other ------
 ]