From c87e08af99247375a3d127266592976da16ebb84 Mon Sep 17 00:00:00 2001 From: Marcel Frommelt Date: Mon, 15 Feb 2021 21:47:42 +0900 Subject: [PATCH] updated model-files and user-input-file --- input/natural_constants.py | 2 +- input/user_input.py | 20 ++++++++++---------- models/drag.py | 4 ++-- models/sun.py | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/input/natural_constants.py b/input/natural_constants.py index 0015cc7..ed6fad3 100644 --- a/input/natural_constants.py +++ b/input/natural_constants.py @@ -1,4 +1,4 @@ -g = 9.81 # local gravitational acceleration in [m/s^2] +g = 9.80665 #9.81 # local gravitational acceleration in [m/s^2] c_v = 3115.89 # [J/(kg * K)] R_air = 287.1 # Specific Gas Constant Dry Air in [J/(kg * K)] R_gas = 2077.1 # Specific Gas Constant Helium in [J/(kg * K)] diff --git a/input/user_input.py b/input/user_input.py index 27f5534..6364dde 100644 --- a/input/user_input.py +++ b/input/user_input.py @@ -1,8 +1,8 @@ # BALLOON -m_pl = 417.57 # payload mass in [kg] -m_film = 7.74 # mass balloon film in [kg] -m_gas = 5 * 74.98539754298822 # 1.60391061452 # lifting gas mass in [kg] -V_design = 334705 # maximum fillable balloon volume in [m^3] +m_pl = 600.0 # payload mass in [kg] +m_film = 400.0 # mass balloon film in [kg] +m_gas = 161.0 # lifting gas mass in [kg] +V_design = 88000 # maximum fillable balloon volume in [m^3] L_goreDesign = 1.914 * V_design ** (1/3) # THERMO-OPTICAL @@ -27,9 +27,9 @@ c_virt = 0.37 # SIMULATION t_end = 10000 #5000 # maximum simulation time in [s] -dt = 0.01 #0.01 # simulation time step in [s] -start_height = 0.0 # start altitude in [m] -start_lat = 39.9161 # start latitude in [deg] -start_lon = 9.6889 # start longitude in [deg] -start_utc = '2006-01-16 08:00:00.000' # start date and time in UTC -p_0 = 101325 # sea-level pressure +dt = 0.1 #0.01 #0.01 # simulation time step in [s] +start_height = 365.10 # start altitude in [m] +start_lat = 67.889235 # start latitude in [deg] +start_lon = 21.082948 # start longitude in [deg] +start_utc = '2016-07-11 17:09:50.000' # start date and time in UTC +p_0 = 101325 # sea-level pressure in [Pa] diff --git a/models/drag.py b/models/drag.py index cac6e10..53a4e04 100644 --- a/models/drag.py +++ b/models/drag.py @@ -2,5 +2,5 @@ import numpy as np c_d = 0.47 # drag coefficient balloon (spherical) [-] -def drag(c_d, rho_air, d_b, v_z): - return 0.125 * np.pi * c_d * rho_air * (d_b * v_z) ** 2 \ No newline at end of file +def drag(c_d, rho_air, d_b, v): + return 0.125 * np.pi * c_d * rho_air * (d_b * v) ** 2 \ No newline at end of file diff --git a/models/sun.py b/models/sun.py index 85f3418..dc5ece3 100644 --- a/models/sun.py +++ b/models/sun.py @@ -1,10 +1,10 @@ -import astropy.units as u +import astropy.units as unit import numpy as np from astropy.coordinates import EarthLocation, AltAz from astropy.coordinates import get_sun def sun_angles_astropy(lat, lon, h, utc): - loc = EarthLocation(lat=lat*u.deg, lon=lon*u.deg, height=h*u.m) + loc = EarthLocation(lat=lat*unit.deg, lon=lon*unit.deg, height=h*unit.m) ref = AltAz(obstime=utc, location=loc) sun_pos = get_sun(utc).transform_to(ref)