From 0861a4811943ba6743fc53c69e55f23b83974ff9 Mon Sep 17 00:00:00 2001 From: 1ozturkbe <1ozturkbe@gmail.com> Date: Tue, 25 Jun 2019 12:41:40 -0400 Subject: [PATCH] Small comments in models, and removing gassolar from requirements. --- robust/simple_wing/models.py | 4 ++-- robust/solar_model/models.py | 9 +++++++-- setup.py | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/robust/simple_wing/models.py b/robust/simple_wing/models.py index 7c84e12..bc671ab 100644 --- a/robust/simple_wing/models.py +++ b/robust/simple_wing/models.py @@ -6,8 +6,8 @@ def simple_wing(): - # Substitutions Variables - k = Variable("k", 1.17, "-", "form factor", pr=31.111111, sigma=0.035) + # Uncertain parameters + k = Variable("k", 1.17, "-", "form factor", pr=31.111111) e = Variable("e", 0.92, "-", "Oswald efficiency factor", pr=7.6086956) mu = Variable("\\mu", 1.775e-5, "kg/m/s", "viscosity of air", pr=4.225352) rho = Variable("\\rho", 1.23, "kg/m^3", "density of air", pr=10) diff --git a/robust/solar_model/models.py b/robust/solar_model/models.py index 900f558..d77da77 100644 --- a/robust/solar_model/models.py +++ b/robust/solar_model/models.py @@ -3,13 +3,18 @@ from robust.simulations import simulate, read_simulation_data - def mike_solar_model(lat): + """ + This model comes from convexengineering/gassolar. + Please clone from and see https://github.com/convexengineering/gassolar + for details. + :param lat: + :return: + """ model = solar_mike(latitude=lat) model.cost = model["W_{total}"] return model - if __name__ == '__main__': model = mike_solar_model(20) number_of_time_average_solves = 30 diff --git a/setup.py b/setup.py index a851b2a..b4793a5 100644 --- a/setup.py +++ b/setup.py @@ -37,4 +37,4 @@ "robust.simulations"], package_data={"robust.data":['*.txt'], "robust.solar_model":['*.txt'], "robust.signomial_simple_wing":['*.txt'], "robust.simple_wing":['*.txt']}, - install_requires=['gpkit', 'gassolar', 'numpy', 'matplotlib', 'scipy']) + install_requires=['gpkit', 'numpy', 'matplotlib', 'scipy'])