Skip to content

Commit

Permalink
Small comments in models, and removing gassolar from requirements.
Browse files Browse the repository at this point in the history
  • Loading branch information
1ozturkbe committed Jun 25, 2019
1 parent 7b392b6 commit 0861a48
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions robust/simple_wing/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
9 changes: 7 additions & 2 deletions robust/solar_model/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])

0 comments on commit 0861a48

Please sign in to comment.