oafuncs 0.0.69__py2.py3-none-any.whl → 0.0.71__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-30 20:24:34
+LastEditTime: 2024-12-01 11:21:49
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -268,7 +268,7 @@ def transform_time(time_str):
     return time_new
 
 
-def get_query_dict(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh, mode='single_depth', depth=None, level_num=None):
+def get_query_dict(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh, time_str_end=None, mode='single_depth', depth=None, level_num=None):
     query_dict = {
         'var': variable_info[var]['var_name'],
         'north': lat_max,
@@ -276,13 +276,23 @@ def get_query_dict(var, lon_min, lon_max, lat_min, lat_max, time_str_ymdh, mode=
         'east': lon_max,
         'south': lat_min,
         'horizStride': 1,
-        'time': transform_time(time_str_ymdh),
+        'time': None,
+        'time_start': None,
+        'time_end': None,
+        'timeStride': None,
         'vertCoord': None,
         'vertStride': None,
         'addLatLon': 'true',
         'accept': 'netcdf4',
     }
 
+    if time_str_end is not None:
+        query_dict['time_start'] = transform_time(time_str_ymdh)
+        query_dict['time_end'] = transform_time(time_str_end)
+        query_dict['timeStride'] = 1
+    else:
+        query_dict['time'] = transform_time(time_str_ymdh)
+
     def get_nearest_level_index(depth):
         level_depth = [0.0, 2.0, 4.0, 6.0, 8.0, 10.0, 12.0, 15.0, 20.0, 25.0, 30.0, 35.0, 40.0, 45.0, 50.0, 60.0, 70.0, 80.0, 90.0, 100.0, 125.0, 150.0, 200.0, 250.0, 300.0, 350.0, 400.0, 500.0, 600.0, 700.0, 800.0, 900.0, 1000.0, 1250.0, 1500.0, 2000.0, 2500.0, 3000.0, 4000.0, 5000]
         return min(range(len(level_depth)), key=lambda i: abs(level_depth[i]-depth))
@@ -419,6 +429,8 @@ def direct_choose_dataset_and_version(time_input, time_end=None):
     # 处理开始和结束时间，确保它们是完整的 ymdh 格式
     time_start, time_end = int(str(time_input)[:10]), int(str(time_end)[:10])
 
+    dataset_name_out, version_name_out = None, None
+
     for dataset_name in data_info['hourly']['dataset'].keys():
         for version_name in data_info['hourly']['dataset'][dataset_name]['version'].keys():
             [time_s, time_e] = list(data_info['hourly']['dataset'][dataset_name]['version'][version_name]['time_range'].values())
@@ -431,11 +443,15 @@ def direct_choose_dataset_and_version(time_input, time_end=None):
 
             # 检查时间是否在数据集版本的时间范围内
             if time_start >= time_s and time_end <= time_e:
-                print(f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
-                return dataset_name, version_name
+                # print(f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
+                # return dataset_name, version_name
+                dataset_name_out, version_name_out = dataset_name, version_name
 
-    # 如果没有找到匹配的数据集和版本，返回 None
-    return None, None
+    if dataset_name_out is not None and version_name_out is not None:
+        print(f'[bold purple]dataset: {dataset_name_out}, version: {version_name_out} is chosen')
+
+    # 如果没有找到匹配的数据集和版本，会返回 None
+    return dataset_name_out, version_name_out
 
 
 def get_base_url(dataset_name, version_name, var, year_str):
@@ -592,6 +608,7 @@ def dlownload_file(target_url, store_path, file_name, check=False):
     clear_existing_file(filename)
     # print(f'Download_start_time: {datetime.datetime.now()}')
     download_time_s = datetime.datetime.now()
+    order_list = ['1st', '2nd', '3rd', '4th', '5th', '6th', '7th', '8th', '9th', '10th']
     while not download_success:
         if request_times >= 10:
             # print(f'下载失败，已重试 {request_times} 次\n可先跳过，后续再试')
@@ -599,11 +616,11 @@ def dlownload_file(target_url, store_path, file_name, check=False):
             break
         if request_times > 0:
             # print(f'\r正在重试第 {request_times} 次', end="")
-            print(f'[bold #ffe5c0]Retrying the {request_times} time...')
+            print(f'[bold #ffe5c0]Retrying the {order_list[request_times-1]} time...')
         # 尝试下载文件
         try:
             headers = {'User-Agent': get_ua()}
-            response = s.get(target_url, headers=headers, timeout=5)
+            response = s.get(target_url, headers=headers, timeout=random.randint(5, 15))
             response.raise_for_status()  # 如果请求返回的不是200，将抛出HTTPError异常
 
             # 保存文件
@@ -673,7 +690,7 @@ def check_dataset_version(dataset_name, version_name, download_time, download_ti
     return None, None
 
 
-def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time):
+def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time, download_time_end=None):
     year_str = str(download_time)[:4]
     if depth is not None and level_num is not None:
         print('Please ensure the depth or level_num is None')
@@ -688,87 +705,33 @@ def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max
     else:
         print('Full depth or full level data will be downloaded...')
         which_mode = 'full'
-    query_dict = get_query_dict(var, lon_min, lon_max, lat_min, lat_max, download_time, which_mode, depth, level_num)
+    query_dict = get_query_dict(var, lon_min, lon_max, lat_min, lat_max, download_time, download_time_end, which_mode, depth, level_num)
     submit_url = get_submit_url(
         dataset_name, version_name, var, year_str, query_dict)
     return submit_url
 
 
-def direct_download_single_hour(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time='2024083100', depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
+def prepare_url_to_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time='2024083100', download_time_end=None, depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
     print('[bold #ecdbfe]-'*150)
     download_time = str(download_time)
-    dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time)
-    if dataset_name is None and version_name is None:
-        return
-
-    if store_path is None:
-        store_path = str(Path.cwd())
+    if download_time_end is not None:
+        download_time_end = str(download_time_end)
+        dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time, download_time_end)
     else:
-        os.makedirs(str(store_path), exist_ok=True)
-
-    if isinstance(var, str):
-        var = [var]
-
-    if isinstance(var, list):
-        if len(var) == 1:
-            var = var[0]
-            submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time)
-            file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
-            dlownload_file(submit_url, store_path, file_name, check)
-        else:
-            varlist = [_ for _ in var]
-            for key, value in var_group.items():
-                current_group = []
-                for v in varlist:
-                    if v in value:
-                        current_group.append(v)
-                if len(current_group) == 0:
-                    continue
-
-                var = current_group[0]
-                submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time)
-                file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
-                old_str = f'var={variable_info[var]["var_name"]}'
-                new_str = f'var={variable_info[var]["var_name"]}'
-                if len(current_group) > 1:
-                    for v in current_group[1:]:
-                        new_str = f'{new_str}&var={variable_info[v]["var_name"]}'
-                    submit_url = submit_url.replace(old_str, new_str)
-                    # file_name = f'HYCOM_{'-'.join([variable_info[v]["var_name"] for v in current_group])}_{download_time}.nc'
-                    file_name = f'HYCOM_{key}_{download_time}.nc'
-                dlownload_file(submit_url, store_path, file_name, check)
-
-
-def direct_download_whole_day(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, download_time='20240831', depth=None, level_num=None, store_path=None, dataset_name=None, version_name=None, check=False):
-    print('[bold #ecdbfe]-'*150)
-    download_time = str(download_time)[:8]+'00'
-    dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time, str(download_time)[:8]+'21')
+        dataset_name, version_name = check_dataset_version(dataset_name, version_name, download_time)
     if dataset_name is None and version_name is None:
         return
 
-    if store_path is None:
-        store_path = str(Path.cwd())
-    else:
-        os.makedirs(str(store_path), exist_ok=True)
-
     if isinstance(var, str):
         var = [var]
 
     if isinstance(var, list):
         if len(var) == 1:
             var = var[0]
-            submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time)
-
-            # https://ncss.hycom.org/thredds/ncss/GLBu0.08/expt_93.0/ts3z?var=salinity&disableLLSubset=on&disableProjSubset=on&horizStride=1&time=2018-12-09T09%3A00%3A00Z&vertCoord=&accept=netcdf4
-            # https://ncss.hycom.org/thredds/ncss/GLBu0.08/expt_93.0/ts3z?var=salinity&disableLLSubset=on&disableProjSubset=on&horizStride=1&time_start=2018-09-19T12%3A00%3A00Z&time_end=2018-12-09T09%3A00%3A00Z&timeStride=1&vertCoord=&accept=netcdf4
-            # 将time=2018-12-09T09%3A00%3A00Z替换为time_start=2018-09-19T12%3A00%3A00Z&time_end=2018-12-09T09%3A00%3A00Z&timeStride=1
-            daytime_s = transform_time(str(download_time)[:8]+'00')
-            daytime_e = transform_time(str(download_time)[:8]+'21')
-            submit_url = submit_url.replace(
-                f'time={daytime_s}', f'time_start={daytime_s}&time_end={daytime_e}&timeStride=1')
-
+            submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time, download_time_end)
             file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
-
+            if download_time_end is not None:
+                file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}_{download_time_end}.nc"
             dlownload_file(submit_url, store_path, file_name, check)
         else:
             varlist = [_ for _ in var]
@@ -781,11 +744,7 @@ def direct_download_whole_day(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_m
                     continue
 
                 var = current_group[0]
-                submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time)
-                daytime_s = transform_time(str(download_time)[:8]+'00')
-                daytime_e = transform_time(str(download_time)[:8]+'21')
-                submit_url = submit_url.replace(
-                    f'time={daytime_s}', f'time_start={daytime_s}&time_end={daytime_e}&timeStride=1')
+                submit_url = get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time, download_time_end)
                 file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
                 old_str = f'var={variable_info[var]["var_name"]}'
                 new_str = f'var={variable_info[var]["var_name"]}'
@@ -795,6 +754,8 @@ def direct_download_whole_day(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_m
                     submit_url = submit_url.replace(old_str, new_str)
                     # file_name = f'HYCOM_{'-'.join([variable_info[v]["var_name"] for v in current_group])}_{download_time}.nc'
                     file_name = f'HYCOM_{key}_{download_time}.nc'
+                    if download_time_end is not None:
+                        file_name = f'HYCOM_{key}_{download_time}_{download_time_end}.nc'
                 dlownload_file(submit_url, store_path, file_name, check)
 
 
@@ -808,7 +769,7 @@ def convert_full_name_to_short_name(full_name):
     return False
 
 
-def download_task(var, time_str, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check):
+def download_task(var, time_str, time_str_end, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check):
     '''
     # 并行下载任务
     # 这个函数是为了并行下载而设置的，是必须的，直接调用direct_download并行下载会出问题
@@ -818,13 +779,11 @@ def download_task(var, time_str, lon_min, lon_max, lat_min, lat_max, depth, leve
     这样，每个任务都是独立的，有自己的参数和数据，不会与其他任务共享或修改任何数据。
     因此，即使多个任务同时执行，也不会出现数据交互错乱的问题。
     '''
-    if len(time_str) == 8:
-        direct_download_whole_day(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
-    else:
-        direct_download_single_hour(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
 
+    prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, time_str_end, depth, level, store_path, dataset_name, version_name, check)
 
-def download_single_hour(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90,  depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False):
+
+def download_hourly_func(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90,  depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1):
     '''
     Description:
     Download the data of single time or a series of time
@@ -847,80 +806,85 @@ def download_single_hour(var, time_s, time_e=None, lon_min=0, lon_max=359.92, la
     Returns:
     None
     '''
-    if isinstance(var, list):
-        if len(var) == 1:
-            var = convert_full_name_to_short_name(var[0])
-        else:
-            var = [convert_full_name_to_short_name(v) for v in var]
-    elif isinstance(var, str):
-        var = convert_full_name_to_short_name(var)
-    else:
-        raise ValueError('The var is invalid')
-    if var is False:
-        raise ValueError('The var is invalid')
-    if lon_min < 0 or lon_min > 359.92 or lon_max < 0 or lon_max > 359.92 or lat_min < -80 or lat_min > 90 or lat_max < -80 or lat_max > 90:
-        print('Please ensure the lon_min, lon_max, lat_min, lat_max are in the range')
-        print('The range of lon_min, lon_max is 0~359.92')
-        print('The range of lat_min, lat_max is -80~90')
-        raise ValueError('The lon or lat is invalid')
-    ymdh_time_s = str(time_s)
-    if len(ymdh_time_s) == 8:
-        ymdh_time_s += '00'
-    if time_e is None:
-        ymdh_time_e = ymdh_time_s[:]
-    else:
-        ymdh_time_e = str(time_e)
-        if len(ymdh_time_e) == 8:
-            ymdh_time_e += '21'
+    ymdh_time_s, ymdh_time_e = str(time_s), str(time_e)
     if ymdh_time_s == ymdh_time_e:
-        direct_download_single_hour(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, depth, level, store_path, dataset_name, version_name)
+        prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, None, depth, level, store_path, dataset_name, version_name)
     elif int(ymdh_time_s) < int(ymdh_time_e):
         print('Downloading a series of files...')
         time_list = get_time_list(ymdh_time_s, ymdh_time_e, 3, 'hour')
         with Progress() as progress:
             task = progress.add_task("[cyan]Downloading...", total=len(time_list))
-            if num_workers is None or num_workers <= 1:
-                # 串行方式
-                for i, time_str in enumerate(time_list):
-                    direct_download_single_hour(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
-                    progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}')
+            if ftimes == 1:
+                if num_workers is None or num_workers <= 1:
+                    # 串行方式
+                    for i, time_str in enumerate(time_list):
+                        prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, None, depth, level, store_path, dataset_name, version_name, check)
+                        progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}')
+                else:
+                    # 并行方式
+                    with ThreadPoolExecutor(max_workers=num_workers) as executor:
+                        futures = [executor.submit(download_task, var, time_str, None, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
+                        for i, future in enumerate(futures):
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}'))
             else:
-                # 并行方式
-                if num_workers > 10:
-                    print('The number of workers is too large!')
-                    print('In order to avoid the server being blocked, the number of workers is set to 10')
-                    num_workers = 10
-                with ThreadPoolExecutor(max_workers=num_workers) as executor:
-                    futures = [executor.submit(download_task, var, time_str, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
-                    for i, future in enumerate(futures):
-                        future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}'))
+                new_time_list = get_time_list(ymdh_time_s, ymdh_time_e, 3*ftimes, 'hour')
+                total_num = len(new_time_list)
+                if num_workers is None or num_workers <= 1:
+                    # 串行方式
+                    for i, time_str in enumerate(new_time_list):
+                        time_str_end_index = int(min(len(time_list), int(i*ftimes+ftimes-1)))
+                        time_str_end = time_list[time_str_end_index]
+                        prepare_url_to_download(var, lon_min, lon_max, lat_min, lat_max, time_str, time_str_end, depth, level, store_path, dataset_name, version_name, check)
+                        progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{total_num}')
+                else:
+                    # 并行方式
+                    with ThreadPoolExecutor(max_workers=num_workers) as executor:
+                        futures = [executor.submit(download_task, var, new_time_list[i], time_list[int(min(len(time_list), int(i*ftimes+ftimes-1)))], lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for i in range(total_num)]
+                        for i, future in enumerate(futures):
+                            future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{total_num}'))
     else:
-        print('Please ensure the time_s is less than the time_e')
+        print('Please ensure the time_s is no more than time_e')
 
 
-def download_whole_day(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90,  depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False):
+def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90,  depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, ftimes=1):
     '''
     Description:
     Download the data of single time or a series of time
 
     Parameters:
-    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 '20241101', without hour
-    time_e: str, the end time, such as '20241102', without hour
+    var: str or list, 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; default is None, if not set, the data of single time will be downloaded; or same as time_s, the data of single time will be downloaded
     lon_min: float, the minimum longitude, default is 0
     lon_max: float, the maximum longitude, default is 359.92
     lat_min: float, the minimum latitude, default is -80
     lat_max: float, the maximum latitude, default is 90
-    depth: float, the depth, default is None
-    level: int, the level number, default is None
-    store_path: str, the path to store the data, default is None
-    dataset_name: str, the dataset name, default is None, example: 'GLBv0.08', 'GLBu0.08', 'GLBy0.08'
-    version_name: str, the version name, default is None, example: '53.X', '56.3'
-    num_workers: int, the number of workers, default is None
+    depth: float, the depth, default is None, if you wanna get the data of single depth, you can set the depth, suggest to set the depth in [0, 5000]
+    level: int, the level number, default is None, if you wanna get the data of single level, you can set the level, suggest to set the level in [1, 40]
+    store_path: str, the path to store the data, default is None, if not set, the data will be stored in the current working directory
+    dataset_name: str, the dataset name, default is None, example: 'GLBv0.08', 'GLBu0.08', 'GLBy0.08', if not set, the dataset will be chosen according to the download_time
+    version_name: str, the version name, default is None, example: '53.X', '56.3', if not set, the version will be chosen according to the download_time
+    num_workers: int, the number of workers, default is None, if not set, the number of workers will be 1; suggest not to set the number of workers too large
+    check: bool, whether to check the existing file, default is False, if set to True, the existing file will be checked and not downloaded again; else, the existing file will be covered
+    ftimes: int, the number of time in one file, default is 1, if set to 1, the data of single time will be downloaded; the maximum is 8, if set to 8, the data of 8 times will be downloaded in one file
 
     Returns:
     None
     '''
+    # 打印信息并处理数据集和版本名称
+    if dataset_name is None and version_name is None:
+        print('The dataset_name and version_name are None, so the dataset and version will be chosen according to the download_time.\nIf there is more than one dataset and version in the time range, the first one will be chosen.')
+        print('If you wanna choose the dataset and version by yourself, please set the dataset_name and version_name together.')
+    elif dataset_name is None and version_name is not None:
+        print('Please ensure the dataset_name is not None')
+        print('If you do not add the dataset_name, both the dataset and version will be chosen according to the download_time.')
+    elif dataset_name is not None and version_name is None:
+        print('Please ensure the version_name is not None')
+        print('If you do not add the version_name, both the dataset and version will be chosen according to the download_time.')
+    else:
+        print('The dataset_name and version_name are both set by yourself.')
+        print('Please ensure the dataset_name and version_name are correct.')
+
     if isinstance(var, list):
         if len(var) == 1:
             var = convert_full_name_to_short_name(var[0])
@@ -937,84 +901,30 @@ def download_whole_day(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_
         print('The range of lon_min, lon_max is 0~359.92')
         print('The range of lat_min, lat_max is -80~90')
         raise ValueError('The lon or lat is invalid')
-    time_s = str(time_s)[:8]
-    if time_e is None:
-        time_e = time_s[:]
-    else:
-        time_e = str(time_e)[:8]
-
-    if time_s == time_e:
-        direct_download_whole_day(var, lon_min, lon_max, lat_min, lat_max, time_s, depth, level, store_path, dataset_name, version_name)
-    elif int(time_s) < int(time_e):
-        print('Downloading a series of files...')
-        time_list = get_time_list(time_s, time_e, 1, 'day')
-        with Progress() as progress:
-            task = progress.add_task("[cyan]Downloading...", total=len(time_list))
-            if num_workers is None or num_workers <= 1:
-                # 串行方式
-                for i, time_str in enumerate(time_list):
-                    direct_download_whole_day(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
-                    progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}')
-            else:
-                # 并行方式
-                if num_workers > 10:
-                    print('The number of workers is too large!')
-                    print('In order to avoid the server being blocked, the number of workers is set to 10')
-                    num_workers = 10
-                with ThreadPoolExecutor(max_workers=num_workers) as executor:
-                    futures = [executor.submit(download_task, var, time_str, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, check) for time_str in time_list]
-                    for i, future in enumerate(futures):
-                        future.add_done_callback(lambda _: progress.update(task, advance=1, description=f'[cyan]Downloading... {i+1}/{len(time_list)}'))
-    else:
-        print('Please ensure the time_s is less than the time_e')
 
+    if ftimes != 1:
+        print('Please ensure the ftimes is in [1, 8]')
+        ftimes = max(min(ftimes, 8), 1)
 
-def download(var, time_s, time_e=None, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90,  depth=None, level=None, store_path=None, dataset_name=None, version_name=None, num_workers=None, check=False, resolution='hour'):
-    '''
-    Description:
-    Download the data of single time or a series of time
+    if store_path is None:
+        store_path = str(Path.cwd())
+    else:
+        os.makedirs(str(store_path), exist_ok=True)
 
-    Parameters:
-    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
-    lon_max: float, the maximum longitude, default is 359.92
-    lat_min: float, the minimum latitude, default is -80
-    lat_max: float, the maximum latitude, default is 90
-    depth: float, the depth, default is None
-    level: int, the level number, default is None
-    store_path: str, the path to store the data, default is None
-    dataset_name: str, the dataset name, default is None, example: 'GLBv0.08', 'GLBu0.08', 'GLBy0.08'
-    version_name: str, the version name, default is None, example: '53.X', '56.3'
-    num_workers: int, the number of workers, default is None
+    if num_workers is not None:
+        num_workers = max(min(num_workers, 10), 1)
 
-    Returns:
-    None
-    '''
-    # 打印信息并处理数据集和版本名称
-    if dataset_name is None and version_name is None:
-        print('The dataset_name and version_name are None, so the dataset and version will be chosen according to the download_time.\nIf there is more than one dataset and version in the time range, the first one will be chosen.')
-        print('If you wanna choose the dataset and version by yourself, please set the dataset_name and version_name together.')
-    elif dataset_name is None and version_name is not None:
-        print('Please ensure the dataset_name is not None')
-        print('If you do not add the dataset_name, both the dataset and version will be chosen according to the download_time.')
-    elif dataset_name is not None and version_name is None:
-        print('Please ensure the version_name is not None')
-        print('If you do not add the version_name, both the dataset and version will be chosen according to the download_time.')
+    time_s = str(time_s)
+    if len(time_s) == 8:
+        time_s += '00'
+    if time_e is None:
+        time_e = time_s[:]
     else:
-        print('The dataset_name and version_name are both set by yourself.')
-        print('Please ensure the dataset_name and version_name are correct.')
+        time_e = str(time_e)
+        if len(time_e) == 8:
+            time_e += '21'
 
-    if resolution == 'hour':
-        download_single_hour(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check)
-    elif resolution == 'day':
-        print('Currently can not download the data of whole day...')
-        # download_whole_day(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check)
-        download_single_hour(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check)
-    else:
-        print('Please ensure the resolution is in [hour, day]\n This will be set to hour')
-        download_single_hour(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check)
+    download_hourly_func(var, time_s, time_e, lon_min, lon_max, lat_min, lat_max, depth, level, store_path, dataset_name, version_name, num_workers, check, ftimes)
 
 
 def how_to_use():
@@ -1091,11 +1001,12 @@ if __name__ == '__main__':
 
     # set depth or level, only one can be True
     # if you wanna download all depth or level, set both False
-    depth = None  # or 0-4000 meters
+    depth = None  # or 0-5000 meters
     level = None  # or 1-40 levels
     num_workers = 1
 
     check = True
+    ftimes = 4
 
     download_switch, single_var = True, False
     combine_switch = True
@@ -1104,9 +1015,9 @@ if __name__ == '__main__':
     if download_switch:
         if single_var:
             for var_name in var_list:
-                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)
+                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, ftimes=ftimes)
         else:
-            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)
+            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, ftimes=ftimes)
 
     """ if combine_switch or copy_switch:
         time_list = get_time_list(time_s, time_e, 3, 'hour')
@@ -1119,16 +1030,17 @@ if __name__ == '__main__':
             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']:
+                if var_name in ['water_u', 'water_v', 'water_u_bottom', 'water_v_bottom']:
                     fname = 'uv3z'
-                elif var_name in ['water_temp', 'salinity', 'water_temp_bottom', 'salinity_bottom'] or var_name in ['temp', 'salt', 'temp_b', 'salt_b']:
+                elif var_name in ['water_temp', 'salinity', 'water_temp_bottom', 'salinity_bottom']:
                     fname = 'ts3z'
-                elif var_name in ['surf_el'] or var_name in ['ssh']:
+                elif var_name in ['surf_el']:
                     fname = 'surf_el'
                 for time_str in time_list:
                     file_list.append(Path(root_path)/f'HYCOM_{fname}_{time_str}.nc')
                 merge_path_name = Path(root_path)/f'HYCOM_{fname}_{merge_name}.nc'
             if combine_switch:
+                # 这里的var_name必须是官方变量名，不能再是简写了
                 merge5nc(file_list, var_name, 'time', merge_path_name)
             if copy_switch:
                 copy_file(merge_path_name, copy_dir) """

{oafuncs-0.0.69.dist-info → oafuncs-0.0.71.dist-info}/METADATA

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

{oafuncs-0.0.69.dist-info → oafuncs-0.0.71.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=AcSIxnM8_Gop3Jc2JWxiPGPB_i51yAdRLu38CyPy_1g,60994
+oafuncs/oa_down/hycom_3hourly.py,sha256=fSTAdHhWWTm7X_yx2RFg61FBvvJ6eROC9IANdcR20Wc,56524
 oafuncs/oa_down/literature.py,sha256=dT3-7-beEzQ9mTP8LNV9Gf3q5Z1Pqqjc6FOS010HZeQ,17833
 oafuncs/oa_down/refs_pdf.py,sha256=lgGKO2gQ0hRjuaBYOLeBgksJB_KXYpFcXMDwMQeYVkI,18719
 oafuncs/oa_sign/__init__.py,sha256=QKqTFrJDFK40C5uvk48GlRRbGFzO40rgkYwu6dYxatM,563
@@ -16,8 +16,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=4lJxV_KUzhxgLYfVwYTqp0qxRugD7fvsZkXDe5WkUKo,3052
-oafuncs-0.0.69.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
-oafuncs-0.0.69.dist-info/METADATA,sha256=V2O9xc2_-G0H07DxFipqLP2AYO7llEY_QElndbs-ddQ,22531
-oafuncs-0.0.69.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
-oafuncs-0.0.69.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
-oafuncs-0.0.69.dist-info/RECORD,,
+oafuncs-0.0.71.dist-info/LICENSE.txt,sha256=rMtLpVg8sKiSlwClfR9w_Dd_5WubTQgoOzE2PDFxzs4,1074
+oafuncs-0.0.71.dist-info/METADATA,sha256=jIn5cFJMOTb0iQTdegUEdOIuFAqj5b8DhYh65RUYH7E,22531
+oafuncs-0.0.71.dist-info/WHEEL,sha256=pxeNX5JdtCe58PUSYP9upmc7jdRPgvT0Gm9kb1SHlVw,109
+oafuncs-0.0.71.dist-info/top_level.txt,sha256=bgC35QkXbN4EmPHEveg_xGIZ5i9NNPYWqtJqaKqTPsQ,8
+oafuncs-0.0.71.dist-info/RECORD,,