From 65d80b00ee255663a154926cb80278f701bc6b70 Mon Sep 17 00:00:00 2001 From: Marcel Frommelt Date: Sat, 19 Jun 2021 15:08:08 +0900 Subject: [PATCH] bug fixes --- input/user_input.py | 6 +++--- main.py | 2 +- main_LOW_RAM.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/input/user_input.py b/input/user_input.py index 7f0bace..dcb0c71 100644 --- a/input/user_input.py +++ b/input/user_input.py @@ -22,9 +22,9 @@ drag_model = 'Palumbo' # 'PalumboLow' # 'PalumboHigh' # 'Sphere_Re' #ERA5_float = ['ERA5/float1.nc', 'ERA5/float2.nc'] # list of all ERA5 atmospheric data for FLOAT #ERA5_single = ['ERA5/radiation1.nc', 'ERA5/radiation2.nc'] # list of all ERA5 RADIATION data -ERA5_ascent = 'ERA5/ASCENT_McMurdo_2019_12.nc' # list of all ERA5 atmospheric data for ASCENT -ERA5_float = 'ERA5/FLOAT_McMurdo_2019_12to2020_1.nc' # list of all ERA5 atmospheric data for FLOAT -ERA5_single = 'ERA5/SINGLE_McMurdo_2019_12to2020_1.nc' # list of all ERA5 RADIATION data +ERA5_ascent = ['ERA5/ASCENT_McMurdo_2019_12.nc'] # list of all ERA5 atmospheric data for ASCENT +ERA5_float = ['ERA5/FLOAT_McMurdo_2019_12to2020_1.nc'] # list of all ERA5 atmospheric data for FLOAT +ERA5_single = ['ERA5/SINGLE_McMurdo_2019_12to2020_1.nc'] # list of all ERA5 RADIATION data # BALLOON DATA STUDIO diff --git a/main.py b/main.py index c66ed43..e9f1e0c 100644 --- a/main.py +++ b/main.py @@ -210,7 +210,7 @@ def ERA5Data(lon, lat, h, t, deltaT_ERA, flag_arr): interp4d_vw_z_post = np.ma.dot(w1, vw_z_float[t_post_ind, :, lat_ind1, lon_ind1]) / np.sum(w1) interp4d_vw_z = (interp4d_vw_z_post - interp4d_vw_z_pre) * (t_epoch - t_pre) + interp4d_vw_z_pre - pressure_hPa = np.array([1, 2, 3, 5, 7, 10, 20, 30]) # !!! + pressure_hPa = np.array([1, 2, 3, 5, 7, 10, 20]) # !!! pressure = 100 * pressure_hPa diff --git a/main_LOW_RAM.py b/main_LOW_RAM.py index 51e323b..3add8a5 100644 --- a/main_LOW_RAM.py +++ b/main_LOW_RAM.py @@ -63,7 +63,7 @@ print("Launch time: " + str(start_utc) + " (UTC)") print("") print("Reading ERA5-datasets, please wait.") -float_data = Dataset(ERA5_float, "r", format="NETCDF4") +float_data = Dataset(ERA5_float[0], "r", format="NETCDF4") # ERA5 MULTI-LEVEL FLOAT (WIND + ATMOSPHERIC DATA DURING FLOAT) @@ -77,7 +77,7 @@ vw_x_float = da.from_array(float_data.variables['u']) # v_x in [m/s] vw_y_float = da.from_array(float_data.variables['v']) # v_y in [m/s] vw_z_float = da.from_array(float_data.variables['w']) # v_z in [m/s] -single_data = Dataset(ERA5_single, "r", format="NETCDF4") +single_data = Dataset(ERA5_single[0], "r", format="NETCDF4") # ERA5 SINGLE-LEVEL (RADIATIVE ENVIRONMENT) @@ -102,7 +102,7 @@ ERAsp = single_data.variables['sp'][:] # surface pressure in [Pa] single_data.close() -ascent_data = Dataset(ERA5_ascent, "r", format="NETCDF4") +ascent_data = Dataset(ERA5_ascent[0], "r", format="NETCDF4") # ERA5 MULTI-LEVEL ASCENT (WIND + ATMOSPHERIC DATA DURING ASCENT)