oafuncs 0.0.62__py2.py3-none-any.whl → 0.0.64__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-29 19:00:47
 FilePath: \\Python\\My_Funcs\\OAFuncs\\oafuncs\\oa_down\\hycom_3hourly.py
 Description:
 EditPlatform: vscode
@@ -29,7 +29,7 @@ from rich.progress import Progress
 
 warnings.filterwarnings("ignore", category=RuntimeWarning, message="Engine '.*' loading failed:.*")
 
-__all__ = ['draw_time_range', 'download', 'how_to_use', 'get_time_list']
+__all__ = ['draw_time_range', 'download', 'how_to_use', 'get_time_list', 'get_hour_list', 'get_day_list']
 
 # time resolution
 data_info = {'yearly': {}, 'monthly': {}, 'daily': {}, 'hourly': {}}
@@ -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
@@ -152,6 +152,12 @@ url_930_y = {
 }
 data_info['hourly']['dataset']['GLBy0.08']['version']['93.0']['url'] = url_930_y
 
+var_group = {
+    'uv3z': ['u', 'v', 'u_b', 'v_b'],
+    'ts3z': ['temp', 'salt', 'temp_b', 'salt_b'],
+    'ssh': ['ssh'],
+}
+
 
 def draw_time_range(pic_save_folder=None):
     if pic_save_folder is not None:
@@ -248,6 +254,44 @@ def get_time_list(time_s, time_e, delta_hour):
     return dt_list
 
 
+def get_hour_list(time_s, time_e, delta_hour):
+    '''
+    Description: get a list of time strings from time_s to time_e with delta_hour
+    Args:
+        time_s: start time string, e.g. '2023080203'
+        time_e: end time string, e.g. '2023080303'
+        delta_hour: interval of hours
+    Returns:
+        dt_list: a list of time strings
+    '''
+    dt = datetime.datetime.strptime(time_s, '%Y%m%d%H')
+    dt_list = []
+    while dt.strftime('%Y%m%d%H') <= time_e:
+        dt_list.append(dt.strftime('%Y%m%d%H'))
+        dt = dt + datetime.timedelta(hours=delta_hour)
+    return dt_list
+
+
+def get_day_list(time_s, time_e, delta_day):
+    '''
+    Description: get a list of time strings from time_s to time_e with delta_hour
+    Args:
+        time_s: start time string, e.g. '20230802'
+        time_e: end time string, e.g. '20230803'
+        delta_hour: interval of hours
+    Returns:
+        dt_list: a list of time strings
+    '''
+    time_s = time_s[:8]
+    time_e = time_e[:8]
+    dt = datetime.datetime.strptime(time_s, '%Y%m%d')
+    dt_list = []
+    while dt.strftime('%Y%m%d') <= time_e:
+        dt_list.append(dt.strftime('%Y%m%d'))
+        dt = dt + datetime.timedelta(days=delta_day)
+    return dt_list
+
+
 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))
@@ -305,7 +349,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 +361,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
@@ -345,7 +389,7 @@ def get_query_dict_full_depth(var, lon_min, lon_max, lat_min, lat_max, time_str_
     return query_dict
 
 
-def ymd_in_which_dataset_and_version(time_ymdh):
+def ymdh_in_which_dataset_and_version(time_ymdh):
     time_ymdh = int(time_ymdh)
     d_list = []
     v_list = []
@@ -372,6 +416,33 @@ def ymd_in_which_dataset_and_version(time_ymdh):
         raise ValueError(f'[bold red]{time_ymdh} is not in any dataset and version')
 
 
+def ymd_in_which_dataset_and_version(time_ymd):
+    time_ymd = int(str(time_ymd)[:8])
+    d_list = []
+    v_list = []
+    trange_list = []
+    have_data = False
+    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())
+            time_s, time_e = str(time_s), str(time_e)
+            if len(time_s) == 8:
+                time_s = time_s + '00'
+            if len(time_e) == 8:
+                time_e = time_e + '21'
+            if time_ymd*100 >= int(time_s) and time_ymd*100+21 <= int(time_e):
+                d_list.append(dataset_name)
+                v_list.append(version_name)
+                trange_list.append(f'{time_s}-{time_e}')
+                have_data = True
+    print(f'[bold red]{time_ymd} is in the following dataset and version:')
+    if have_data:
+        for d, v, trange in zip(d_list, v_list, trange_list):
+            print(f'[bold blue]{d} {v} {trange}')
+    else:
+        raise ValueError(f'[bold red]{time_ymd} is not in any dataset and version')
+
+
 def direct_choose_dataset_and_version(time_ymdh):
     time_ymdh = int(time_ymdh)
     for dataset_name in data_info['hourly']['dataset'].keys():
@@ -387,6 +458,21 @@ def direct_choose_dataset_and_version(time_ymdh):
                 return dataset_name, version_name
 
 
+def direct_choose_dataset_and_version_whole_day(time_ymd):
+    time_ymd = int(str(time_ymd)[:8])
+    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())
+            time_s, time_e = str(time_s), str(time_e)
+            if len(time_s) == 8:
+                time_s = time_s + '00'
+            if len(time_e) == 8:
+                time_e = time_e + '21'
+            if time_ymd*100 >= int(time_s) and time_ymd*100+21 <= int(time_e):
+                print(f'[bold purple]dataset: {dataset_name}, version: {version_name} is chosen')
+                return dataset_name, version_name
+
+
 def get_base_url(dataset_name, version_name, var, year_str):
     url_dict = data_info['hourly']['dataset'][dataset_name]['version'][version_name]['url']
     classification_method = data_info['hourly']['dataset'][dataset_name]['version'][version_name]['classification']
@@ -395,29 +481,28 @@ def get_base_url(dataset_name, version_name, var, year_str):
     elif classification_method == 'same_path':
         base_url = url_dict
     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']:
-            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]')
+        base_url = None
+        for key, value in var_group.items():
+            if var in value:
+                base_url = url_dict[key]
+                break
+        if base_url is None:
+            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']:
-            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]')
+        base_url = None
+        for key, value in var_group.items():
+            if var in value:
+                base_url = url_dict[key][str(year_str)]
+                break
+        if base_url is None:
+            print('Please ensure the var is in [u,v,temp,salt,ssh,u_b,v_b,temp_b,salt_b]')
     return base_url
 
 
 def get_submit_url(dataset_name, version_name, var, year_str, query_dict):
     base_url = get_base_url(dataset_name, version_name, var, year_str)
-    query_dict['var'] = [query_dict['var']]
+    if isinstance(query_dict['var'], str):
+        query_dict['var'] = [query_dict['var']]
     target_url = base_url + '&'.join(f"var={var}" for var in query_dict['var']) + '&' + '&'.join(f"{key}={value}" for key, value in query_dict.items() if key != 'var')
     return target_url
 
@@ -581,7 +666,7 @@ def check_hour_is_valid(ymdh_str):
         return False
 
 
-def direct_download(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 check_dataset_version_single_time(dataset_name, version_name, download_time):
     download_time = str(download_time)
     if not check_hour_is_valid(download_time):
         print('Please ensure the hour is 00, 03, 06, 09, 12, 15, 18, 21')
@@ -589,21 +674,25 @@ def direct_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, dow
     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.')
-        ymd_in_which_dataset_and_version(download_time)
+        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(download_time)
     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.')
-        ymd_in_which_dataset_and_version(download_time)
+        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(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.')
-        ymd_in_which_dataset_and_version(download_time)
+        ymdh_in_which_dataset_and_version(download_time)
         dataset_name, version_name = direct_choose_dataset_and_version(download_time)
     else:
         print('The dataset_name and version_name are both set by yourself.')
 
+    return dataset_name, version_name
+
+
+def get_submit_url_var(var, depth, level_num, lon_min, lon_max, lat_min, lat_max, dataset_name, version_name, download_time):
     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')
@@ -618,19 +707,135 @@ def direct_download(var, lon_min=0, lon_max=359.92, lat_min=-80, lat_max=90, dow
         query_dict = get_query_dict_full_level(var, lon_min, lon_max, lat_min, lat_max, download_time)
     submit_url = get_submit_url(
         dataset_name, version_name, var, year_str, query_dict)
-    file_name = f"HYCOM_{variable_info[var]['var_name']}_{download_time}.nc"
+    return submit_url
+
+
+def direct_download_single_time(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):
+    download_time = str(download_time)
+    dataset_name, version_name = check_dataset_version_single_time(dataset_name, version_name, download_time)
+
     if store_path is None:
         store_path = str(Path.cwd())
     else:
         os.makedirs(str(store_path), exist_ok=True)
-    dlownload_file(submit_url, store_path, file_name, check)
+
+    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 check_dataset_version_whold_day(dataset_name, version_name, download_time):
+    download_time = str(download_time)
+    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.')
+        ymd_in_which_dataset_and_version(download_time)
+        dataset_name, version_name = direct_choose_dataset_and_version_whole_day(download_time)
+    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.')
+        ymd_in_which_dataset_and_version(download_time)
+        dataset_name, version_name = direct_choose_dataset_and_version_whole_day(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.')
+        ymd_in_which_dataset_and_version(download_time)
+        dataset_name, version_name = direct_choose_dataset_and_version_whole_day(download_time)
+    else:
+        print('The dataset_name and version_name are both set by yourself.')
+
+    return dataset_name, version_name
+
+
+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):
+    download_time = str(download_time)[:8]+'00'
+    dataset_name, version_name = check_dataset_version_whold_day(dataset_name, version_name, download_time[:8])
+
+    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')
+
+            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)
+                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')
+                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 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
@@ -646,16 +851,19 @@ def download_task(var, time_str, lon_min, lon_max, lat_min, lat_max, depth, leve
     这样，每个任务都是独立的，有自己的参数和数据，不会与其他任务共享或修改任何数据。
     因此，即使多个任务同时执行，也不会出现数据交互错乱的问题。
     '''
-    direct_download(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
+    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_time(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
 
 
-def download(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):
+def download_single_hour(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):
     '''
     Description:
     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
@@ -672,6 +880,146 @@ def download(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
     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'
+    ymdh_time_e = str(time_e)
+    if len(ymdh_time_e) == 8:
+        ymdh_time_e += '21'
+    if ymdh_time_s == ymdh_time_e:
+        direct_download_single_time(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, 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_hour_list(ymdh_time_s, ymdh_time_e, 3)
+        with Progress() as progress:
+            task = progress.add_task("[cyan]Downloading...", total=len(time_list))
+            if num_workers is None or num_workers <= 1:
+                # 串行方式
+                for time_str in time_list:
+                    direct_download_single_time(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)
+            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 future in futures:
+                        future.add_done_callback(lambda _: progress.update(task, advance=1))
+    else:
+        print('Please ensure the time_s is less than the time_e')
+
+
+def download_whole_day(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):
+    '''
+    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
+    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
+
+    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')
+    time_s, time_e = str(time_s)[:8], 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_day_list(time_s, time_e, 1)
+        with Progress() as progress:
+            task = progress.add_task("[cyan]Downloading...", total=len(time_list))
+            if num_workers is None or num_workers <= 1:
+                # 串行方式
+                for time_str in 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)
+            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 future in futures:
+                        future.add_done_callback(lambda _: progress.update(task, advance=1))
+    else:
+        print('Please ensure the time_s is less than the time_e')
+
+
+def download_his1(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):
+    '''
+    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 '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
+
+    Returns:
+    None
+    '''
+    if isinstance(var, list):
+        var = var[0]
     var = convert_full_name_to_short_name(var)
     if var is False:
         raise ValueError('The var is invalid')
@@ -687,16 +1035,16 @@ def download(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
     if len(ymdh_time_e) == 8:
         ymdh_time_e += '21'
     if ymdh_time_s == ymdh_time_e:
-        direct_download(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, depth, level, store_path, dataset_name, version_name)
+        direct_download_single_time(var, lon_min, lon_max, lat_min, lat_max, ymdh_time_s, 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)
+        time_list = get_hour_list(ymdh_time_s, ymdh_time_e, 3)
         with Progress() as progress:
             task = progress.add_task("[cyan]Downloading...", total=len(time_list))
             if num_workers is None or num_workers <= 1:
                 # 串行方式
                 for time_str in time_list:
-                    direct_download(var, lon_min, lon_max, lat_min, lat_max, time_str, depth, level, store_path, dataset_name, version_name, check)
+                    direct_download_single_time(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)
             else:
                 # 并行方式
@@ -713,6 +1061,40 @@ def download(var, time_s, time_e, lon_min=0, lon_max=359.92, lat_min=-80, lat_ma
         print('Please ensure the ymdh_time_s is less than the ymdh_time_e')
 
 
+def download(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, resolution='hour'):
+    '''
+    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 '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
+
+    Returns:
+    None
+    '''
+    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)
+
+
 def how_to_use():
     print('''
     # 1. Choose the dataset and version according to the time:
@@ -725,11 +1107,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
@@ -763,33 +1145,36 @@ def how_to_use():
 
 
 if __name__ == '__main__':
-    time_s, time_e = '2018010112', '2018010300'
+    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}
     download_dict = {
         'water_u': {'simple_name': 'u', 'download': 1},
-        '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},
+        '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},
     }
 
+    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'])
+
     # 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 = 5
+    num_workers = 1
     check = True
 
     download_switch = True
     combine_switch = False
+    
+    single_var = True
 
-    def download_var(var_name):
-        var = download_dict[var_name]['simple_name']
-        if_download = download_dict[var_name]['download']
-        if if_download == 0:
-            return
+    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)
@@ -801,8 +1186,13 @@ if __name__ == '__main__':
                 'west'], lon_max=location_dict['east'], lat_min=location_dict['south'], lat_max=location_dict['north'], num_workers=num_workers, check=check)
 
     if download_switch:
-        for var_name in download_dict.keys():
-            download_var(var_name)
+        if single_var:
+            # single var
+            for var_name in var_list:
+                download_var(var_name)
+        else:
+            # multiple var
+            download_var(var_list)
 
     # draw_time_range(r'I:\Delete')