Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,23 @@
This repository contains those GP-/SP-compatible models that we consider well documented and general enough to be useful to multiple projects.

* **Simple models with in-depth explanations** (good for learning GPkit)
* [SimPleAC](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/SP/SimPleAC/simpleac.pdf): a basic aircraft model that captures the fundamental design tradeoffs
* [Economic Order Quantity](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/misc/Economic%20Order%20Quantity/eoq.pdf): tradeoff between setup and holding costs
* [Cylindrical Beam Moment of Inertia](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/misc/Moment%20of%20Inertia%20(cylindrical%20beam)/moi.pdf): GP approximation of cylindrical beam MOI
* [Net Present Value](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/misc/Net%20Present%20Value/npv.pdf): financial tradeoff between cash and equipment
* [Raymer Weights](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/misc/Raymer%20Weights): rule-of-thumb weight relations for aircraft design
* [SimPleAC](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/SP/SimPleAC/simpleac.pdf): a basic aircraft model that captures the fundamental design tradeoffs
* [Economic Order Quantity](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/misc/Economic%20Order%20Quantity/eoq.pdf): tradeoff between setup and holding costs
* [Cylindrical Beam Moment of Inertia](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/misc/Moment%20of%20Inertia%20(cylindrical%20beam)/moi.pdf): GP approximation of cylindrical beam MOI
* [Net Present Value](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/misc/Net%20Present%20Value/npv.pdf): financial tradeoff between cash and equipment
* [Raymer Weights](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/misc/Raymer%20Weights): rule-of-thumb weight relations for aircraft design
* **GP models**
* Aircraft
* [Wing Structural and Aero Models](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/aircraft/wing)
* [Empennage](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/aircraft/tail): TailBoom, HorizontalTail, and VerticalTail inherit from the Wing model
* [Mission](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/aircraft/mission): models that unify subsystems and flight profiles
* [Fuselage](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/aircraft/fuselage): elliptical and cylindrical fuselage models
* [IC Gas Engine Model](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/aircraft/engine)
* [Bending Beam](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/GP/beam): discretized beam for distributed loads
* [Wing Structural and Aero Models](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/aircraft/wing)
* [Empennage](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/aircraft/tail): TailBoom, HorizontalTail, and VerticalTail inherit from the Wing model
* [Mission](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/aircraft/mission): models that unify subsystems and flight profiles
* [Fuselage](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/aircraft/fuselage): elliptical and cylindrical fuselage models
* [IC Gas Engine Model](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/aircraft/engine)
* [Bending Beam](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/GP/beam): discretized beam for distributed loads
* **SP models**
* Aircraft
* [Tail Boom Flexibility](https://github.com/convexengineering/gplibrary/tree/master/gpkitmodels/SP/aircraft/tail/tail_boom_flex.py)
* [Wing Spanwise Effectiveness](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/SP/aircraft/wing/wing.py)
* [Tail Boom Flexibility](https://github.com/convexengineering/gplibrary/tree/master/gplibrary/SP/aircraft/tail/tail_boom_flex.py)
* [Wing Spanwise Effectiveness](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/SP/aircraft/wing/wing.py)
* Atmosphere
* [Tony Tao's fits as (efficient) signomial equalities](https://github.com/convexengineering/gplibrary/blob/master/gpkitmodels/SP/atmosphere/atmosphere.py). Valid until 10,000m of altitude.
* [Tony Tao's fits as (efficient) signomial equalities](https://github.com/convexengineering/gplibrary/blob/master/gplibrary/SP/atmosphere/atmosphere.py). Valid until 10,000m of altitude.

10 changes: 5 additions & 5 deletions TESTS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
gpkitmodels/GP/aircraft/wing/wing_test.py
gpkitmodels/GP/aircraft/tail/tail_tests.py
gpkitmodels/GP/aircraft/fuselage/test_fuselage.py
gpkitmodels/GP/aircraft/prop/prop_test.py
gpkitmodels/GP/aircraft/motor/motor_test.py
gplibrary/GP/aircraft/wing/wing_test.py
gplibrary/GP/aircraft/tail/tail_tests.py
gplibrary/GP/aircraft/fuselage/test_fuselage.py
gplibrary/GP/aircraft/prop/prop_test.py
gplibrary/GP/aircraft/motor/motor_test.py
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ft,kW,,RPM,P,BSFC,Q(nm)
0,2.25,,4000,0.2,0.62,0.477707006
3280.839895,1.97,,5000,0.38,0.51,0.72611465
6561.67979,1.69,,6000,0.64,0.405,1.01910828
9842.519685,1.44,,7000,1.02,0.34,1.392174704
13123.35958,1.2,,8000,1.5,0.32,1.791401274
16404.19948,0.99,,9000,2.13,0.32,2.261146497
19685.03937,0.79,,,,,
22965.87927,0.61,,,,,
ft,kW,,RPM,P,BSFC,Q(nm)
0,2.25,,4000,0.2,0.62,0.477707006
3280.839895,1.97,,5000,0.38,0.51,0.72611465
6561.67979,1.69,,6000,0.64,0.405,1.01910828
9842.519685,1.44,,7000,1.02,0.34,1.392174704
13123.35958,1.2,,8000,1.5,0.32,1.791401274
16404.19948,0.99,,9000,2.13,0.32,2.261146497
19685.03937,0.79,,,,,
22965.87927,0.61,,,,,
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from gpkit import Model, Variable, units
import os
import pandas as pd
# from gpkitmodels.tools.fit_constraintset import FitCS
# from gplibrary.tools.fit_constraintset import FitCS
from gpfit.fit_constraintset import FitCS


Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
" elliptical fuselage.py "
import numpy as np
from gpkit import Variable, Model, parse_variables
from gpkitmodels.GP.materials import cfrpfabric
from gpkitmodels import g
from gplibrary.GP.materials import cfrpfabric
from gplibrary import g

class FuselageAero(Model):
""" Fuselage Aerodyanmic Model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from gpkit import Model
from gpkitmodels.GP.aircraft.fuselage.elliptical_fuselage import Fuselage
from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
from gplibrary.GP.aircraft.fuselage.elliptical_fuselage import Fuselage
from gplibrary.GP.aircraft.wing.wing_test import FlightState

def test_ellp():
"elliptical fuselage test"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"Electric motor model "
from gpkit import Model, parse_variables
from gpkit.constraints.tight import Tight as TCS
from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gpkitmodels import g
from gplibrary.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gplibrary import g

class MotorPerf(Model):
""" Electric Motor Performance Model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from gpkit import Model, parse_variables, SignomialsEnabled, SignomialEquality, units
from motor import Propulsor, Motor, MotorPerf
from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gpkitmodels.SP.aircraft.prop.propeller import BladeElementProp
from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
from gplibrary.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gplibrary.SP.aircraft.prop.propeller import BladeElementProp
from gplibrary.GP.aircraft.wing.wing_test import FlightState

class Propulsor_Test(Model):
"""Propulsor Test Model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
" propeller tests "
from gpkitmodels.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gpkitmodels.SP.aircraft.prop.propeller import BladeElementProp
from gplibrary.GP.aircraft.prop.propeller import Propeller, ActuatorProp
from gplibrary.SP.aircraft.prop.propeller import BladeElementProp

from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
from gplibrary.GP.aircraft.wing.wing_test import FlightState
from gpkit import units, Model

def simpleprop_test():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
import numpy as np
from gpkit import parse_variables
from .tail_aero import TailAero
from gpkitmodels.GP.aircraft.wing.wing import Wing
from gpkitmodels.GP.aircraft.wing.wing_skin import WingSkin
from gpkitmodels.GP.aircraft.wing.wing_core import WingCore
from gplibrary.GP.aircraft.wing.wing import Wing
from gplibrary.GP.aircraft.wing.wing_skin import WingSkin
from gplibrary.GP.aircraft.wing.wing_core import WingCore

#pylint: disable=attribute-defined-outside-init, no-member
#pylint: disable=exec-used, undefined-variable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from numpy import pi
from gpkit import Model, parse_variables, Variable, VectorVariable, units
from .tube_spar import TubeSpar
from gpkitmodels.GP.beam.beam import Beam
from gpkitmodels import g
from gplibrary.GP.beam.beam import Beam
from gplibrary import g

#pylint: disable=exec-used, undefined-variable, invalid-name
#pylint: disable=attribute-defined-outside-init
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
" test tail models "
from gpkitmodels.GP.aircraft.tail.horizontal_tail import HorizontalTail
from gpkitmodels.GP.aircraft.tail.vertical_tail import VerticalTail
from gpkitmodels.GP.aircraft.tail.empennage import Empennage
from gpkitmodels.GP.aircraft.wing.wing_test import FlightState
from gpkitmodels.GP.aircraft.wing.boxspar import BoxSpar
from gpkitmodels.GP.aircraft.tail.tail_boom import TailBoom
from gplibrary.GP.aircraft.tail.horizontal_tail import HorizontalTail
from gplibrary.GP.aircraft.tail.vertical_tail import VerticalTail
from gplibrary.GP.aircraft.tail.empennage import Empennage
from gplibrary.GP.aircraft.wing.wing_test import FlightState
from gplibrary.GP.aircraft.wing.boxspar import BoxSpar
from gplibrary.GP.aircraft.tail.tail_boom import TailBoom
from gpkit import Model, Variable, units

#pylint: disable=no-member
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" tube spar "
from numpy import pi
from gpkitmodels.GP.materials import cfrpfabric
from gpkitmodels import g
from gplibrary.GP.materials import cfrpfabric
from gplibrary import g
from gpkit import Model, parse_variables

class TubeSpar(Model):
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
" vertical tail "
from gpkit import parse_variables
from .tail_aero import TailAero
from gpkitmodels.GP.aircraft.wing.wing import Wing
from gpkitmodels.GP.aircraft.wing.wing_core import WingCore
from gpkitmodels.GP.aircraft.wing.wing_skin import WingSkin
from gplibrary.GP.aircraft.wing.wing import Wing
from gplibrary.GP.aircraft.wing.wing_core import WingCore
from gplibrary.GP.aircraft.wing.wing_skin import WingSkin

#pylint: disable=attribute-defined-outside-init, no-member, exec-used

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from gpkit import Model, parse_variables, SignomialsEnabled
from .sparloading import SparLoading
from .gustloading import GustL
from gpkitmodels.GP.materials import cfrpud, cfrpfabric, foamhd
from gpkitmodels import g
from gplibrary.GP.materials import cfrpud, cfrpfabric, foamhd
from gplibrary import g

#pylint: disable=exec-used, undefined-variable, unused-argument, invalid-name

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from gpkit import Model, parse_variables
from .sparloading import SparLoading
from .gustloading import GustL
from gpkitmodels.GP.materials import cfrpud, cfrpfabric, foamhd
from gpkitmodels import g
from gplibrary.GP.materials import cfrpud, cfrpfabric, foamhd
from gplibrary import g

#pylint: disable=exec-used, undefined-variable, unused-argument, invalid-name

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" wing interior "
from gpkit import Model, parse_variables
from gpkitmodels.GP.materials import foamhd
from gpkitmodels import g
from gplibrary.GP.materials import foamhd
from gplibrary import g

#pylint: disable=exec-used, no-member, undefined-variable

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
" wing skin "
from gpkit import Model, parse_variables
from gpkitmodels.GP.materials import cfrpfabric
from gpkitmodels import g
from gplibrary.GP.materials import cfrpfabric
from gplibrary import g

class WingSkin(Model):
""" Wing Skin model
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
" wing test "
from gpkitmodels.GP.aircraft.wing.wing import Wing
from gpkitmodels.GP.aircraft.wing.wing_skin import WingSkin
from gpkitmodels.GP.aircraft.wing.wing_core import WingCore
from gpkitmodels.GP.aircraft.wing.boxspar import BoxSpar
from gplibrary.GP.aircraft.wing.wing import Wing
from gplibrary.GP.aircraft.wing.wing_skin import WingSkin
from gplibrary.GP.aircraft.wing.wing_core import WingCore
from gplibrary.GP.aircraft.wing.boxspar import BoxSpar
from gpkit import Model, parse_variables

#pylint: disable=no-member, exec-used
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import matplotlib.pyplot as plt
from gpfit.fit import fit
import sys
from gpkitmodels.GP.aircraft.wing.wing import Wing
from gpkitmodels.GP.aircraft.prop.propeller import ActuatorProp
from gplibrary.GP.aircraft.wing.wing import Wing
from gplibrary.GP.aircraft.prop.propeller import ActuatorProp
import inspect
import os

Expand Down Expand Up @@ -123,4 +123,4 @@ def plot_fits(re, cnstr, x, y):
path = sys.argv[1]
F.savefig(path + "dae51polarfit1.eps", bbox_inches="tight")
else:
F.savefig("dae51polarfit1.eps", bbox_inches="tight")
F.savefig("dae51polarfit1.eps", bbox_inches="tight")
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" box spar "
from gpkit import parse_variables, SignomialsEnabled
from gpkitmodels.GP.aircraft.wing.boxspar import BoxSpar as BoxSparGP
from gplibrary.GP.aircraft.wing.boxspar import BoxSpar as BoxSparGP

#pylint: disable=exec-used, undefined-variable, unused-argument, invalid-name

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
" wing.py "
import numpy as np
from gpkitmodels.GP.aircraft.wing.wing import Wing as WingGP
from gplibrary.GP.aircraft.wing.wing import Wing as WingGP
from gpkit import parse_variables, SignomialsEnabled

#pylint: disable=attribute-defined-outside-init, invalid-name
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
SOFTWARE."""

setup(
name="gpkitmodels",
name="gplibrary",
description="Library of geometric and signomial programming models "
"that can be manipulated and solved using GPkit.",
author="MIT Department of Aeronautics and Astronautics",
Expand All @@ -46,7 +46,7 @@
install_requires=["numpy>=1.12", "scipy", "pint"],
version="0.0.0.0",
packages=find_packages(),
package_data={"gpkitmodels": ["GP/aircraft/wing/*.csv",
package_data={"gplibrary": ["GP/aircraft/wing/*.csv",
("GP/aircraft/fuselage/"
"fuselage_profile_drag/*.csv"),
"GP/aircraft/engine/*.csv",
Expand Down