oafuncs 0.0.62__py2.py3-none-any.whl → 0.0.63__py2.py3-none-any.whl

oafuncs/oa_down/hycom_3hourly.py

@@ -4,7 +4,7 @@
 Author: Liu Kun && 16031215@qq.com
 Date: 2024-11-01 10:31:09
 LastEditors: Liu Kun && 16031215@qq.com
-LastEditTime: 2024-11-21 13:24:49
+LastEditTime: 2024-11-28 16:04:50
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -69,12 +69,12 @@ variable_info = {
     'u': {'var_name': 'water_u', 'standard_name': 'eastward_sea_water_velocity'},
     'v': {'var_name': 'water_v', 'standard_name': 'northward_sea_water_velocity'},
     'temp': {'var_name': 'water_temp', 'standard_name': 'sea_water_potential_temperature'},
-    'salinity': {'var_name': 'salinity', 'standard_name': 'sea_water_salinity'},
+    'salt': {'var_name': 'salinity', 'standard_name': 'sea_water_salinity'},
     'ssh': {'var_name': 'surf_el', 'standard_name': 'sea_surface_elevation'},
     'u_b': {'var_name': 'water_u_bottom', 'standard_name': 'eastward_sea_water_velocity_at_sea_floor'},
     'v_b': {'var_name': 'water_v_bottom', 'standard_name': 'northward_sea_water_velocity_at_sea_floor'},
     'temp_b': {'var_name': 'water_temp_bottom', 'standard_name': 'sea_water_potential_temperature_at_sea_floor'},
-    'salinity_b': {'var_name': 'salinity_bottom', 'standard_name': 'sea_water_salinity_at_sea_floor'},
+    'salt_b': {'var_name': 'salinity_bottom', 'standard_name': 'sea_water_salinity_at_sea_floor'},
 }
 
 # classification method
@@ -305,7 +305,7 @@ def get_query_dict_single_depth(var, lon_min, lon_max, lat_min, lat_max, depth,
         query_dict = set_query_dict_no_vertical(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
     else:
         query_dict = set_query_dict_depth_or_level(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
-    if var in ['u', 'v', 'temp', 'salinity']:
+    if var in ['u', 'v', 'temp', 'salt']:
         print('Please ensure the depth is in the range of 0-5000 m')
         query_dict['vertCoord'] = get_nearest_level_index(depth)+1
     return query_dict
@@ -317,7 +317,7 @@ def get_query_dict_single_level(var, lon_min, lon_max, lat_min, lat_max, level_n
     else:
         # level_num: 1-40
         query_dict = set_query_dict_depth_or_level(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh)
-    if var in ['u', 'v', 'temp', 'salinity']:
+    if var in ['u', 'v', 'temp', 'salt']:
         print('Please ensure the level_num is in the range of 1-40')
         if level_num == 0:
             level_num = 1
@@ -397,21 +397,21 @@ def get_base_url(dataset_name, version_name, var, year_str):
     elif classification_method == 'var_different':
         if var in ['u', 'v', 'u_b', 'v_b']:
             base_url = url_dict['uv3z']
-        elif var in ['temp', 'salinity', 'temp_b', 'salinity_b']:
+        elif var in ['temp', 'salt', 'temp_b', 'salt_b']:
             base_url = url_dict['ts3z']
         elif var in ['ssh']:
             base_url = url_dict['ssh']
         else:
-            print('Please ensure the var is in [u,v,temp,salinity,ssh,u_b,v_b,temp_b,salinity_b]')
+            print('Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]')
     elif classification_method == 'var_year_different':
         if var in ['u', 'v', 'u_b', 'v_b']:
             base_url = url_dict['uv3z'][str(year_str)]
-        elif var in ['temp', 'salinity', 'temp_b', 'salinity_b']:
+        elif var in ['temp', 'salt', 'temp_b', 'salt_b']:
             base_url = url_dict['ts3z'][str(year_str)]
         elif var in ['ssh']:
             base_url = url_dict['ssh'][str(year_str)]
         else:
-            print('Please ensure the var is in [u,v,temp,salinity,ssh,u_b,v_b,temp_b,salinity_b]')
+            print('Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]')
     return base_url
 
 
@@ -630,7 +630,7 @@ def convert_full_name_to_short_name(full_name):
     for var, info in variable_info.items():
         if full_name == info['var_name'] or full_name == info['standard_name'] or full_name == var:
             return var
-    print('[bold #FFE4E1]Please ensure the var is in:\n[bold blue]u,v,temp,salinity,ssh,u_b,v_b,temp_b,salinity_b')
+    print('[bold #FFE4E1]Please ensure the var is in:\n[bold blue]u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b')
     print('or')
     print('[bold blue]water_u, water_v, water_temp, salinity, surf_el, water_u_bottom, water_v_bottom, water_temp_bottom, salinity_bottom')
     return False
@@ -655,7 +655,7 @@ def download(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
     Download the data of single time or a series of time
 
     Parameters:
-    var: str, the variable name, such as 'u', 'v', 'temp', 'salinity', 'ssh', 'u_b', 'v_b', 'temp_b', 'salinity_b' or 'water_u', 'water_v', 'water_temp', 'salinity', 'surf_el', 'water_u_bottom', 'water_v_bottom', 'water_temp_bottom', 'salinity_bottom'
+    var: str, the variable name, such as 'u', 'v', 'temp', 'salt', 'ssh', 'u_b', 'v_b', 'temp_b', 'salt_b' or 'water_u', 'water_v', 'water_temp', 'salinity', 'surf_el', 'water_u_bottom', 'water_v_bottom', 'water_temp_bottom', 'salinity_bottom'
     time_s: str, the start time, such as '2024110100' or '20241101', if add hour, the hour should be 00, 03, 06, 09, 12, 15, 18, 21
     time_e: str, the end time, such as '2024110221' or '20241102', if add hour, the hour should be 00, 03, 06, 09, 12, 15, 18, 21
     lon_min: float, the minimum longitude, default is 0
@@ -725,11 +725,11 @@ def how_to_use():
 
     # 2. Get the base url according to the dataset, version, var and year:
     # 2.1 Dataset and version were found in step 1
-    # 2.2 Var: u, v, temp, salinity, ssh, u_b, v_b, temp_b, salinity_b
+    # 2.2 Var: u, v, temp, salt, ssh, u_b, v_b, temp_b, salt_b
     # 2.3 Year: 1994-2024(current year)
 
     # 3. Get the query_dict according to the var, lon_min, lon_max, lat_min, lat_max, depth, level_num, time_str_ymdh:
-    # 3.1 Var: u, v, temp, salinity, ssh, u_b, v_b, temp_b, salinity_b
+    # 3.1 Var: u, v, temp, salt, ssh, u_b, v_b, temp_b, salt_b
     # 3.2 Lon_min, lon_max, lat_min, lat_max: float
     # 3.3 Depth: 0-5000m, if you wanna get single depth data, you can set the depth
     # 3.4 Level_num: 1-40, if you wanna get single level data, you can set the level_num
@@ -772,7 +772,7 @@ if __name__ == '__main__':
         'water_v': {'simple_name': 'v', 'download': 0},
         'surf_el': {'simple_name': 'ssh', 'download': 0},
         'water_temp': {'simple_name': 'temp', 'download': 0},
-        'salinity': {'simple_name': 'salinity', 'download': 1},
+        'salinity': {'simple_name': 'salt', 'download': 1},
     }
 
     # set depth or level, only one can be True

oafuncs/oa_down/refs_pdf.py

@@ -305,7 +305,7 @@ def download5doi(store_path=None, doi_list=None, txt_file=None, excel_file=None,
         download5doi(store_path=r'I:\Delete\ref_pdf', excel_file=r'I:\Delete\ref_pdf\wrong_record.xlsx')
         download5doi(store_path=r'I:\Delete\ref_pdf', excel_file=r'I:\Delete\ref_pdf\wrong_record.xlsx', col_name='DOI')
     '''
-    print('[bold #EE33fA]Note:\n 函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
+    print('[bold #EE33fA]Note:\n 升级0.0.62版本后，函数路径将改为oafuncs.oa_down.literature.download5doi，此路径将被弃用。')
 
     if not store_path:
         store_path = Path.cwd()

{oafuncs-0.0.62.dist-info → oafuncs-0.0.63.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oafuncs
-Version: 0.0.62
+Version: 0.0.63
 Summary: My short description for my project.
 Home-page: https://github.com/Industry-Pays/OAFuncs
 Author: Kun Liu

{oafuncs-0.0.62.dist-info → oafuncs-0.0.63.dist-info}/RECORD

@@ -7,17 +7,17 @@ oafuncs/oa_help.py,sha256=ppNktmtNzs15R20MD1bM7yImlTQ_ngMwvoIglePOKXA,1000
 oafuncs/oa_nc.py,sha256=ALAYfqDy5lbUNJsTU29j6ZWkM4wgqQU3p2Fxn5pkvsQ,12102
 oafuncs/oa_python.py,sha256=XPTP3o7zTFzfJR_YhsKfQksa3bSYwXsne9YxlJplCEA,3994
 oafuncs/oa_down/__init__.py,sha256=a6rgxHQi8spvlI-TaVEqnrDNhYsKm5_IQf7ckAZ8U4w,603
-oafuncs/oa_down/hycom_3hourly.py,sha256=nagKxShJOaDL0H7BcBSFkZ-OZeMAlirpiGgKXjyPTAA,43996
+oafuncs/oa_down/hycom_3hourly.py,sha256=5ssqWxIpmCF77ojguxUem2zGULTPmPKZjqPTgne29fg,43912
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
-oafuncs/oa_down/refs_pdf.py,sha256=GR4VGJOtUn-pCVGOzBjY82NEiOu14EI1ghBEqTqIE88,17955
+oafuncs/oa_down/refs_pdf.py,sha256=wr1sIYO2FUBJTn-K79NylbRUvCAFaee6_fQljxSI_Q8,17979
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
 oafuncs/oa_sign/meteorological.py,sha256=mLbupsZSq427HTfVbZMvIlFzDHwSzQAbK3X19o8anFY,6525
 oafuncs/oa_sign/ocean.py,sha256=xrW-rWD7xBWsB5PuCyEwQ1Q_RDKq2KCLz-LOONHgldU,5932
 oafuncs/oa_sign/scientific.py,sha256=a4JxOBgm9vzNZKpJ_GQIQf7cokkraV5nh23HGbmTYKw,5064
 oafuncs/oa_tool/__init__.py,sha256=IKOlqpWlb4cMDCtq2VKR_RTxQHDNqR_vfqqsOsp_lKQ,466
 oafuncs/oa_tool/email.py,sha256=7EX3VkD8TxYAKPLOuC_yS104p9zbKilZlGfkVa2C6BQ,2947
-oafuncs-0.0.62.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.62.dist-info/METADATA,sha256=YJdoMJ0_h_vZzUgfqwV6J4h_4DjTmI-oi0ZIff4D5bs,22378
-oafuncs-0.0.62.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.62.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.62.dist-info/RECORD,,
+oafuncs-0.0.63.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.63.dist-info/METADATA,sha256=c0kTonzu73DG0FabuV9DU_7sRnKBws4NPDq4IQhUPAY,22378
+oafuncs-0.0.63.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.63.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.63.dist-info/RECORD,,