oafuncs 0.0.64__py2.py3-none-any.whl → 0.0.65__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-29 19:00:47
+LastEditTime: 2024-11-29 20:40:26
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -515,7 +515,7 @@ def clear_existing_file(file_full_path):
 
 def check_existing_file(file_full_path):
     if os.path.exists(file_full_path):
-        print(f'{file_full_path} exists')
+        print(f'[bold #FFA54F]{file_full_path} exists')
         return True
     else:
         print(f'{file_full_path} does not exist')
@@ -620,6 +620,7 @@ def dlownload_file(target_url, store_path, file_name, check=False):
     download_success = False
     request_times = 0
     filename = Path(store_path) / file_name
+
     if check:
         if check_existing_file(filename):
             return
@@ -639,9 +640,10 @@ def dlownload_file(target_url, store_path, file_name, check=False):
             with open(filename, 'wb') as f:
                 f.write(response.content)
             # print(f'\r文件 {filename} 下载成功', end="")
-            print(f'[bold green]文件 {filename} 下载成功')
             # query_ncfile_time(filename) # 这个函数在linux上目前会出问题
-            download_success = True
+            if os.path.exists(filename):
+                download_success = True
+                print(f'[bold green]文件 {filename} 下载成功')
 
         except requests.exceptions.HTTPError as errh:
             print(f"Http Error: {errh}")
@@ -1145,67 +1147,67 @@ def how_to_use():
 
 
 if __name__ == '__main__':
-    time_s, time_e = '2018010512', '2018010800'
-    merge_name = '201801'
-    root_path = r'I:\hycom_data_2018'
-    location_dict = {'west': 115, 'east': 130, 'south': 33, 'north': 45}
+    # help(hycom3h.download)
+    time_s, time_e = '2018010100', '2024103121'
+    merge_name = '2018_010300-020100'
+    root_path = r'G:\Data\HYCOM\3hourly'
+    location_dict = {'west': 105, 'east': 130, 'south': 15, 'north': 45}
     download_dict = {
         'water_u': {'simple_name': 'u', 'download': 1},
         'water_v': {'simple_name': 'v', 'download': 1},
         'surf_el': {'simple_name': 'ssh', 'download': 1},
         'water_temp': {'simple_name': 'temp', 'download': 1},
         'salinity': {'simple_name': 'salt', 'download': 1},
+        'water_u_bottom': {'simple_name': 'u_b', 'download': 0},
+        'water_v_bottom': {'simple_name': 'v_b', 'download': 0},
+        'water_temp_bottom': {'simple_name': 'temp_b', 'download': 0},
+        'salinity_bottom': {'simple_name': 'salt_b', 'download': 0},
     }
 
     var_list = []
     for var_name in download_dict.keys():
         if download_dict[var_name]['download'] == 1:
-            var_list.append(download_dict[var_name]['simple_name'])
+            var_list.append(var_name)
 
     # set depth or level, only one can be True
     # if you wanna download all depth or level, set both False
-    set_depth, depth = False, 0  # 0-4000 meters
-    set_level, level = False, 1  # 1-40 levels
-    num_workers = 1
+    depth = None  # or 0-4000 meters
+    level = None  # or 1-40 levels
+    num_workers = 2
+
     check = True
 
-    download_switch = True
-    combine_switch = False
-    
-    single_var = True
-
-    def download_var(var):
-        if set_depth:
-            download(var=var, time_s=time_s, time_e=time_e, store_path=Path(root_path)/var, lon_min=location_dict[
-                'west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], depth=depth, num_workers=num_workers, check=check)
-        elif set_level:
-            download(var=var, time_s=time_s, time_e=time_e, store_path=Path(root_path)/var, lon_min=location_dict[
-                'west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], level=level, num_workers=num_workers, check=check)
-        else:
-            download(var=var, time_s=time_s, time_e=time_e, store_path=Path(root_path)/var, lon_min=location_dict[
-                'west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], num_workers=num_workers, check=check)
+    download_switch, single_var = True, False
+    combine_switch = True
+    copy_switch, copy_dir = True, r'G:\Data\HYCOM\3hourly'
 
     if download_switch:
         if single_var:
-            # single var
             for var_name in var_list:
-                download_var(var_name)
+                download(var=var_name, time_s=time_s, time_e=time_e, store_path=Path(root_path), lon_min=location_dict['west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], num_workers=num_workers, check=check, depth=depth, level=level)
         else:
-            # multiple var
-            download_var(var_list)
-
-    # draw_time_range(r'I:\Delete')
-
-    """ if combine_switch:
-        time_list = get_time_list(time_s, time_e, 3)
-        for var_name in download_dict.keys():
-            var = download_dict[var_name]['simple_name']
-            if_download = download_dict[var_name]['download']
-            if if_download == 0:
-                continue
+            download(var=var_list, time_s=time_s, time_e=time_e, store_path=Path(root_path), lon_min=location_dict['west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], num_workers=num_workers, check=check, depth=depth, level=level)
+
+    """ if combine_switch or copy_switch:
+        time_list = get_hour_list(time_s, time_e, 3)
+        for var_name in var_list:
             file_list = []
-            for time_str in time_list:
-                file_list.append(
-                    Path(root_path)/var/f'HYCOM_{var_name}_{time_str}.nc')
-            merge5nc(file_list, var_name, 'time',
-                     Path(root_path)/var/f'HYCOM_{var_name}_{merge_name}.nc') """
+            if single_var:
+                for time_str in time_list:
+                    file_list.append(Path(root_path)/f'HYCOM_{var_name}_{time_str}.nc')
+                merge_path_name = Path(root_path)/f'HYCOM_{var_name}_{merge_name}.nc'
+            else:
+                # 如果混合，需要看情况获取文件列表
+                fname = ''
+                if var_name in ['water_u', 'water_v', 'water_u_bottom', 'water_v_bottom'] or var_name in ['u', 'v', 'u_b', 'v_b']:
+                    fname = 'uv3z'
+                elif var_name in ['water_temp', 'salinity', 'water_temp_bottom', 'salinity_bottom'] or var_name in ['temp', 'salt', 'temp_b', 'salt_b']:
+                    fname = 'ts3z'
+                elif var_name in ['surf_el'] or var_name in ['ssh']:
+                    fname = 'surf_el'
+                for time_str in time_list:
+                    file_list.append(Path(root_path)/f'HYCOM_{fname}_{time_str}.nc')
+            if combine_switch:
+                merge5nc(file_list, var_name, 'time', merge_path_name)
+            if copy_switch:
+                copy_file(merge_path_name, copy_dir) """

{oafuncs-0.0.64.dist-info → oafuncs-0.0.65.dist-info}/METADATA

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

{oafuncs-0.0.64.dist-info → oafuncs-0.0.65.dist-info}/RECORD

@@ -7,7 +7,7 @@ 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=zfecVo9DQ0oT_V1DuRpddOyU_1JEj3b_rXBCeDwsWPw,65097
+oafuncs/oa_down/hycom_3hourly.py,sha256=MU1QEVrINKXdFLlZf1RDjPO97HMKym8JvxYnyDphslA,65626
 oafuncs/oa_down/hycom_3hourly_wholeday.py,sha256=bEl-hdSPJqN_9IaJIF-la0jEPw-sbCaKnciPirsWgP8,62598
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
 oafuncs/oa_down/refs_pdf.py,sha256=wr1sIYO2FUBJTn-K79NylbRUvCAFaee6_fQljxSI_Q8,17979
@@ -17,8 +17,8 @@ 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.64.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.64.dist-info/METADATA,sha256=P9tmhxGoarpgYD3NAGg5AmDcOmlxmH3MUuHMOuJmTv8,22378
-oafuncs-0.0.64.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.64.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.64.dist-info/RECORD,,
+oafuncs-0.0.65.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.65.dist-info/METADATA,sha256=H-VYmc1lwVJwwY1Z3RYL-48Ei0jOLZSJLTVxU_1J_N4,22378
+oafuncs-0.0.65.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.65.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.65.dist-info/RECORD,,