From 1cf6a32826dd21485b87cb2220a01850d9d570a0 Mon Sep 17 00:00:00 2001 From: 1ozturkbe <1ozturkbe@gmail.com> Date: Tue, 5 Jun 2018 14:20:50 -0400 Subject: [PATCH 1/2] Blanket renaming of all mentions of gpkitmodels. --- {gpkitmodels => gplibrary}/GP/aircraft/engine/__init__.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/__init__.py (100%) diff --git a/gpkitmodels/GP/aircraft/engine/__init__.py b/gplibrary/GP/aircraft/engine/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/engine/__init__.py rename to gplibrary/GP/aircraft/engine/__init__.py From e0867d6fc8fd9d6ae80ce61afdfd05f08c458477 Mon Sep 17 00:00:00 2001 From: 1ozturkbe <1ozturkbe@gmail.com> Date: Tue, 5 Jun 2018 14:21:57 -0400 Subject: [PATCH 2/2] Let's try that again. --- README.md | 28 +++++++++--------- TESTS | 10 +++---- {gpkitmodels => gplibrary}/GP/__init__.py | 0 .../GP/aircraft/__init__.py | 0 .../GP/aircraft/engine/DF70/DF35_maxPvh.csv | 18 +++++------ .../engine/DF70/Dataset_BSFC_kgKwh.csv | 0 .../aircraft/engine/DF70/Dataset_Power_Kw.csv | 0 .../engine/DF70/Dataset_Torque_Nm.csv | 0 .../GP/aircraft/engine/DF70/fitDF70.py | 0 .../aircraft/engine/DF70/genericbsfcpower.csv | 0 .../GP/aircraft/engine/README.md | 0 .../GP/aircraft/engine/df70.py | 0 .../GP/aircraft/engine/gas_engine.py | 2 +- .../GP/aircraft/engine/powerBSFCfit.csv | 0 .../GP/aircraft/engine/power_lawfit.csv | 0 .../GP/aircraft/engine/powertobsfcfit.pdf | Bin .../GP/aircraft/engine/powertobsfcfit.png | Bin .../GP/aircraft/engine/powervsweightfit.pdf | Bin .../GP/aircraft/engine/powervsweightfit.png | Bin .../GP/aircraft/fuselage/README.md | 0 .../GP/aircraft/fuselage/__init__.py | 0 .../GP/aircraft/fuselage/cyl_fuse_drawing.ipe | 0 .../GP/aircraft/fuselage/cyl_fuse_drawing.pdf | Bin .../aircraft/fuselage/cylindrical_fuselage.py | 0 .../aircraft/fuselage/ellipsoid_fuselage.pdf | Bin .../aircraft/fuselage/elliptical_fuselage.py | 4 +-- .../GP/aircraft/fuselage/fuel_tank.py | 0 .../GP/aircraft/fuselage/fuselage.pdf | Bin .../fuselage_profile_drag/fusedrag.csv | 0 .../fuselage_profile_drag/fusedragfit.py | 0 .../GP/aircraft/fuselage/fuselage_skin.py | 0 .../GP/aircraft/fuselage/test_fuselage.py | 4 +-- .../GP/aircraft/mission/README.md | 0 .../GP/aircraft/mission/__init__.py | 0 .../GP/aircraft/mission/breguet_endurance.py | 0 .../GP/aircraft/mission/mission.pdf | Bin .../GP/aircraft/motor/__init__.py | 0 .../GP/aircraft/motor/motor.py | 4 +-- .../GP/aircraft/motor/motor_test.py | 6 ++-- .../GP/aircraft/prop/__init__.py | 0 .../GP/aircraft/prop/arccos_fit.py | 0 .../GP/aircraft/prop/prop_test.py | 6 ++-- .../GP/aircraft/prop/propeller.py | 0 .../GP/aircraft/tail/README.md | 0 .../GP/aircraft/tail/__init__.py | 0 .../GP/aircraft/tail/empennage.py | 0 .../GP/aircraft/tail/horizontal_tail.py | 6 ++-- .../GP/aircraft/tail/tail_aero.py | 0 .../GP/aircraft/tail/tail_boom.py | 4 +-- .../GP/aircraft/tail/tail_dragfit.csv | 0 .../GP/aircraft/tail/tail_tests.py | 12 ++++---- .../GP/aircraft/tail/taildragpolar.pdf | Bin .../aircraft/tail/tailpolars/naca_cl0fits.py | 0 .../GP/aircraft/tail/tube_spar.py | 4 +-- .../GP/aircraft/tail/vertical_tail.py | 6 ++-- .../GP/aircraft/wing/README.md | 0 .../GP/aircraft/wing/__init__.py | 0 .../GP/aircraft/wing/arctan_fit.csv | 0 .../GP/aircraft/wing/arctan_fit.py | 0 .../GP/aircraft/wing/boxspar.py | 4 +-- .../GP/aircraft/wing/capspar.py | 4 +-- .../GP/aircraft/wing/constant_taper_chord.py | 0 .../GP/aircraft/wing/gustloaddiagram.pdf | Bin .../GP/aircraft/wing/gustloading.py | 0 .../GP/aircraft/wing/jho1polarfit1.pdf | Bin .../GP/aircraft/wing/jho1polars/jho1.dat | 0 .../wing/jho1polars/jho1_polarfits.py | 0 .../GP/aircraft/wing/jho_fitdata.csv | 0 .../GP/aircraft/wing/sparloading.py | 0 .../GP/aircraft/wing/tube_spar.py | 0 .../GP/aircraft/wing/wing.py | 0 .../GP/aircraft/wing/wing_core.py | 4 +-- .../GP/aircraft/wing/wing_skin.py | 4 +-- .../GP/aircraft/wing/wing_test.py | 8 ++--- {gpkitmodels => gplibrary}/GP/beam/README.md | 0 .../GP/beam/__init__.py | 0 {gpkitmodels => gplibrary}/GP/beam/beam.pdf | Bin {gpkitmodels => gplibrary}/GP/beam/beam.py | 0 .../GP/materials/__init__.py | 0 .../GP/materials/composite.py | 0 .../GP/materials/foam.py | 0 .../SP/SimPleAC/README.md | 0 .../SP/SimPleAC/SimPleAC.py | 0 .../SP/SimPleAC/simpleac.pdf | Bin {gpkitmodels => gplibrary}/SP/__init__.py | 0 .../SP/aircraft/__init__.py | 0 .../SP/aircraft/prop/__init__.py | 0 .../SP/aircraft/prop/dae51_fitdata.csv | 0 .../SP/aircraft/prop/dae51polars/dae51.dat | 0 .../SP/aircraft/prop/dae51polars/dae51.txt | 0 .../prop/dae51polars/dae51_polarfits.py | 6 ++-- .../prop/dae51polars/dae51polarfit1.eps | 0 .../aircraft/prop/dae51polars/polarstest.pdf | Bin .../SP/aircraft/prop/propeller.py | 0 .../SP/aircraft/tail/__init__.py | 0 .../SP/aircraft/tail/tail_boom_flex.py | 0 .../SP/aircraft/wing/__init__.py | 0 .../SP/aircraft/wing/boxspar.py | 2 +- .../SP/aircraft/wing/wing.py | 2 +- .../SP/atmosphere/atmosphere.py | 0 {gpkitmodels => gplibrary}/__init__.py | 0 .../misc/Economic Order Quantity/README.md | 0 .../misc/Economic Order Quantity/__init__.py | 0 .../misc/Economic Order Quantity/eoq.pdf | Bin .../misc/Economic Order Quantity/qsweep.pdf | Bin .../MoICylinder.PNG | Bin .../README.md | 0 .../moi.pdf | Bin .../moi.py | 0 .../tightness.png | Bin .../misc/Net Present Value/README.md | 0 .../misc/Net Present Value/__init__.py | 0 .../misc/Net Present Value/npv.pdf | Bin .../misc/Net Present Value/npv.py | 0 {gpkitmodels => gplibrary}/misc/README.md | 0 .../Blended Wing-Body/MTOW_breakdown.eps | 0 .../Blended Wing-Body/OEW_breakdown.eps | 0 .../Blended Wing-Body/Raymer_Weights_Model.py | 0 .../Blended Wing-Body/XFOIL_BWB.ipynb | 0 .../misc/Raymer Weights/Raymer_Exact.py | 0 {gpkitmodels => gplibrary}/misc/default.latex | 0 {gpkitmodels => gplibrary}/misc/make_gpmd | 0 {gpkitmodels => gplibrary}/tools/__init__.py | 0 .../tools/fit_constraintset.py | 0 .../tools/ipynb2module.py | 0 .../tools/summing_constraintset.py | 0 .../tools/xfoilWrapper.py | 0 setup.py | 4 +-- 128 files changed, 76 insertions(+), 76 deletions(-) rename {gpkitmodels => gplibrary}/GP/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/DF35_maxPvh.csv (97%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/Dataset_BSFC_kgKwh.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/Dataset_Power_Kw.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/Dataset_Torque_Nm.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/fitDF70.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/DF70/genericbsfcpower.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/README.md (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/df70.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/gas_engine.py (97%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/powerBSFCfit.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/power_lawfit.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/powertobsfcfit.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/powertobsfcfit.png (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/powervsweightfit.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/engine/powervsweightfit.png (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/README.md (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/cyl_fuse_drawing.ipe (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/cyl_fuse_drawing.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/cylindrical_fuselage.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/ellipsoid_fuselage.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/elliptical_fuselage.py (96%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/fuel_tank.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/fuselage.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/fuselage_profile_drag/fusedrag.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/fuselage_profile_drag/fusedragfit.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/fuselage_skin.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/fuselage/test_fuselage.py (70%) rename {gpkitmodels => gplibrary}/GP/aircraft/mission/README.md (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/mission/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/mission/breguet_endurance.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/mission/mission.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/motor/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/motor/motor.py (96%) rename {gpkitmodels => gplibrary}/GP/aircraft/motor/motor_test.py (93%) rename {gpkitmodels => gplibrary}/GP/aircraft/prop/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/prop/arccos_fit.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/prop/prop_test.py (80%) rename {gpkitmodels => gplibrary}/GP/aircraft/prop/propeller.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/README.md (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/empennage.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/horizontal_tail.py (89%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tail_aero.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tail_boom.py (98%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tail_dragfit.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tail_tests.py (92%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/taildragpolar.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tailpolars/naca_cl0fits.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/tube_spar.py (95%) rename {gpkitmodels => gplibrary}/GP/aircraft/tail/vertical_tail.py (87%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/README.md (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/arctan_fit.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/arctan_fit.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/boxspar.py (97%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/capspar.py (96%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/constant_taper_chord.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/gustloaddiagram.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/gustloading.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/jho1polarfit1.pdf (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/jho1polars/jho1.dat (100%) mode change 100755 => 100644 rename {gpkitmodels => gplibrary}/GP/aircraft/wing/jho1polars/jho1_polarfits.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/jho_fitdata.csv (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/sparloading.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/tube_spar.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/wing.py (100%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/wing_core.py (92%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/wing_skin.py (96%) rename {gpkitmodels => gplibrary}/GP/aircraft/wing/wing_test.py (90%) rename {gpkitmodels => gplibrary}/GP/beam/README.md (100%) rename {gpkitmodels => gplibrary}/GP/beam/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/beam/beam.pdf (100%) rename {gpkitmodels => gplibrary}/GP/beam/beam.py (100%) rename {gpkitmodels => gplibrary}/GP/materials/__init__.py (100%) rename {gpkitmodels => gplibrary}/GP/materials/composite.py (100%) rename {gpkitmodels => gplibrary}/GP/materials/foam.py (100%) rename {gpkitmodels => gplibrary}/SP/SimPleAC/README.md (100%) rename {gpkitmodels => gplibrary}/SP/SimPleAC/SimPleAC.py (100%) rename {gpkitmodels => gplibrary}/SP/SimPleAC/simpleac.pdf (100%) rename {gpkitmodels => gplibrary}/SP/__init__.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/__init__.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/__init__.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51_fitdata.csv (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51polars/dae51.dat (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51polars/dae51.txt (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51polars/dae51_polarfits.py (95%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51polars/dae51polarfit1.eps (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/dae51polars/polarstest.pdf (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/prop/propeller.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/tail/__init__.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/tail/tail_boom_flex.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/wing/__init__.py (100%) rename {gpkitmodels => gplibrary}/SP/aircraft/wing/boxspar.py (91%) rename {gpkitmodels => gplibrary}/SP/aircraft/wing/wing.py (89%) rename {gpkitmodels => gplibrary}/SP/atmosphere/atmosphere.py (100%) rename {gpkitmodels => gplibrary}/__init__.py (100%) rename {gpkitmodels => gplibrary}/misc/Economic Order Quantity/README.md (100%) rename {gpkitmodels => gplibrary}/misc/Economic Order Quantity/__init__.py (100%) rename {gpkitmodels => gplibrary}/misc/Economic Order Quantity/eoq.pdf (100%) rename {gpkitmodels => gplibrary}/misc/Economic Order Quantity/qsweep.pdf (100%) rename {gpkitmodels => gplibrary}/misc/Moment of Inertia (cylindrical beam)/MoICylinder.PNG (100%) rename {gpkitmodels => gplibrary}/misc/Moment of Inertia (cylindrical beam)/README.md (100%) rename {gpkitmodels => gplibrary}/misc/Moment of Inertia (cylindrical beam)/moi.pdf (100%) rename {gpkitmodels => gplibrary}/misc/Moment of Inertia (cylindrical beam)/moi.py (100%) rename {gpkitmodels => gplibrary}/misc/Moment of Inertia (cylindrical beam)/tightness.png (100%) rename {gpkitmodels => gplibrary}/misc/Net Present Value/README.md (100%) rename {gpkitmodels => gplibrary}/misc/Net Present Value/__init__.py (100%) rename {gpkitmodels => gplibrary}/misc/Net Present Value/npv.pdf (100%) rename {gpkitmodels => gplibrary}/misc/Net Present Value/npv.py (100%) rename {gpkitmodels => gplibrary}/misc/README.md (100%) rename {gpkitmodels => gplibrary}/misc/Raymer Weights/Blended Wing-Body/MTOW_breakdown.eps (100%) rename {gpkitmodels => gplibrary}/misc/Raymer Weights/Blended Wing-Body/OEW_breakdown.eps (100%) rename {gpkitmodels => gplibrary}/misc/Raymer Weights/Blended Wing-Body/Raymer_Weights_Model.py (100%) rename {gpkitmodels => gplibrary}/misc/Raymer Weights/Blended Wing-Body/XFOIL_BWB.ipynb (100%) rename {gpkitmodels => gplibrary}/misc/Raymer Weights/Raymer_Exact.py (100%) rename {gpkitmodels => gplibrary}/misc/default.latex (100%) rename {gpkitmodels => gplibrary}/misc/make_gpmd (100%) mode change 100755 => 100644 rename {gpkitmodels => gplibrary}/tools/__init__.py (100%) rename {gpkitmodels => gplibrary}/tools/fit_constraintset.py (100%) rename {gpkitmodels => gplibrary}/tools/ipynb2module.py (100%) rename {gpkitmodels => gplibrary}/tools/summing_constraintset.py (100%) rename {gpkitmodels => gplibrary}/tools/xfoilWrapper.py (100%) diff --git a/README.md b/README.md index 7d55a0b7..c59d3f24 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/TESTS b/TESTS index fe6d8727..9c814275 100644 --- a/TESTS +++ b/TESTS @@ -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 diff --git a/gpkitmodels/GP/__init__.py b/gplibrary/GP/__init__.py similarity index 100% rename from gpkitmodels/GP/__init__.py rename to gplibrary/GP/__init__.py diff --git a/gpkitmodels/GP/aircraft/__init__.py b/gplibrary/GP/aircraft/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/__init__.py rename to gplibrary/GP/aircraft/__init__.py diff --git a/gpkitmodels/GP/aircraft/engine/DF70/DF35_maxPvh.csv b/gplibrary/GP/aircraft/engine/DF70/DF35_maxPvh.csv similarity index 97% rename from gpkitmodels/GP/aircraft/engine/DF70/DF35_maxPvh.csv rename to gplibrary/GP/aircraft/engine/DF70/DF35_maxPvh.csv index 2b74aa05..c63031cc 100644 --- a/gpkitmodels/GP/aircraft/engine/DF70/DF35_maxPvh.csv +++ b/gplibrary/GP/aircraft/engine/DF70/DF35_maxPvh.csv @@ -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,,,,, diff --git a/gpkitmodels/GP/aircraft/engine/DF70/Dataset_BSFC_kgKwh.csv b/gplibrary/GP/aircraft/engine/DF70/Dataset_BSFC_kgKwh.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/DF70/Dataset_BSFC_kgKwh.csv rename to gplibrary/GP/aircraft/engine/DF70/Dataset_BSFC_kgKwh.csv diff --git a/gpkitmodels/GP/aircraft/engine/DF70/Dataset_Power_Kw.csv b/gplibrary/GP/aircraft/engine/DF70/Dataset_Power_Kw.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/DF70/Dataset_Power_Kw.csv rename to gplibrary/GP/aircraft/engine/DF70/Dataset_Power_Kw.csv diff --git a/gpkitmodels/GP/aircraft/engine/DF70/Dataset_Torque_Nm.csv b/gplibrary/GP/aircraft/engine/DF70/Dataset_Torque_Nm.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/DF70/Dataset_Torque_Nm.csv rename to gplibrary/GP/aircraft/engine/DF70/Dataset_Torque_Nm.csv diff --git a/gpkitmodels/GP/aircraft/engine/DF70/fitDF70.py b/gplibrary/GP/aircraft/engine/DF70/fitDF70.py similarity index 100% rename from gpkitmodels/GP/aircraft/engine/DF70/fitDF70.py rename to gplibrary/GP/aircraft/engine/DF70/fitDF70.py diff --git a/gpkitmodels/GP/aircraft/engine/DF70/genericbsfcpower.csv b/gplibrary/GP/aircraft/engine/DF70/genericbsfcpower.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/DF70/genericbsfcpower.csv rename to gplibrary/GP/aircraft/engine/DF70/genericbsfcpower.csv diff --git a/gpkitmodels/GP/aircraft/engine/README.md b/gplibrary/GP/aircraft/engine/README.md similarity index 100% rename from gpkitmodels/GP/aircraft/engine/README.md rename to gplibrary/GP/aircraft/engine/README.md diff --git a/gpkitmodels/GP/aircraft/engine/df70.py b/gplibrary/GP/aircraft/engine/df70.py similarity index 100% rename from gpkitmodels/GP/aircraft/engine/df70.py rename to gplibrary/GP/aircraft/engine/df70.py diff --git a/gpkitmodels/GP/aircraft/engine/gas_engine.py b/gplibrary/GP/aircraft/engine/gas_engine.py similarity index 97% rename from gpkitmodels/GP/aircraft/engine/gas_engine.py rename to gplibrary/GP/aircraft/engine/gas_engine.py index ccdf9dc3..41dc0360 100644 --- a/gpkitmodels/GP/aircraft/engine/gas_engine.py +++ b/gplibrary/GP/aircraft/engine/gas_engine.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/engine/powerBSFCfit.csv b/gplibrary/GP/aircraft/engine/powerBSFCfit.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/powerBSFCfit.csv rename to gplibrary/GP/aircraft/engine/powerBSFCfit.csv diff --git a/gpkitmodels/GP/aircraft/engine/power_lawfit.csv b/gplibrary/GP/aircraft/engine/power_lawfit.csv similarity index 100% rename from gpkitmodels/GP/aircraft/engine/power_lawfit.csv rename to gplibrary/GP/aircraft/engine/power_lawfit.csv diff --git a/gpkitmodels/GP/aircraft/engine/powertobsfcfit.pdf b/gplibrary/GP/aircraft/engine/powertobsfcfit.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/engine/powertobsfcfit.pdf rename to gplibrary/GP/aircraft/engine/powertobsfcfit.pdf diff --git a/gpkitmodels/GP/aircraft/engine/powertobsfcfit.png b/gplibrary/GP/aircraft/engine/powertobsfcfit.png similarity index 100% rename from gpkitmodels/GP/aircraft/engine/powertobsfcfit.png rename to gplibrary/GP/aircraft/engine/powertobsfcfit.png diff --git a/gpkitmodels/GP/aircraft/engine/powervsweightfit.pdf b/gplibrary/GP/aircraft/engine/powervsweightfit.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/engine/powervsweightfit.pdf rename to gplibrary/GP/aircraft/engine/powervsweightfit.pdf diff --git a/gpkitmodels/GP/aircraft/engine/powervsweightfit.png b/gplibrary/GP/aircraft/engine/powervsweightfit.png similarity index 100% rename from gpkitmodels/GP/aircraft/engine/powervsweightfit.png rename to gplibrary/GP/aircraft/engine/powervsweightfit.png diff --git a/gpkitmodels/GP/aircraft/fuselage/README.md b/gplibrary/GP/aircraft/fuselage/README.md similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/README.md rename to gplibrary/GP/aircraft/fuselage/README.md diff --git a/gpkitmodels/GP/aircraft/fuselage/__init__.py b/gplibrary/GP/aircraft/fuselage/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/__init__.py rename to gplibrary/GP/aircraft/fuselage/__init__.py diff --git a/gpkitmodels/GP/aircraft/fuselage/cyl_fuse_drawing.ipe b/gplibrary/GP/aircraft/fuselage/cyl_fuse_drawing.ipe similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/cyl_fuse_drawing.ipe rename to gplibrary/GP/aircraft/fuselage/cyl_fuse_drawing.ipe diff --git a/gpkitmodels/GP/aircraft/fuselage/cyl_fuse_drawing.pdf b/gplibrary/GP/aircraft/fuselage/cyl_fuse_drawing.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/cyl_fuse_drawing.pdf rename to gplibrary/GP/aircraft/fuselage/cyl_fuse_drawing.pdf diff --git a/gpkitmodels/GP/aircraft/fuselage/cylindrical_fuselage.py b/gplibrary/GP/aircraft/fuselage/cylindrical_fuselage.py similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/cylindrical_fuselage.py rename to gplibrary/GP/aircraft/fuselage/cylindrical_fuselage.py diff --git a/gpkitmodels/GP/aircraft/fuselage/ellipsoid_fuselage.pdf b/gplibrary/GP/aircraft/fuselage/ellipsoid_fuselage.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/ellipsoid_fuselage.pdf rename to gplibrary/GP/aircraft/fuselage/ellipsoid_fuselage.pdf diff --git a/gpkitmodels/GP/aircraft/fuselage/elliptical_fuselage.py b/gplibrary/GP/aircraft/fuselage/elliptical_fuselage.py similarity index 96% rename from gpkitmodels/GP/aircraft/fuselage/elliptical_fuselage.py rename to gplibrary/GP/aircraft/fuselage/elliptical_fuselage.py index c74ece4d..d21e1179 100644 --- a/gpkitmodels/GP/aircraft/fuselage/elliptical_fuselage.py +++ b/gplibrary/GP/aircraft/fuselage/elliptical_fuselage.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/fuselage/fuel_tank.py b/gplibrary/GP/aircraft/fuselage/fuel_tank.py similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/fuel_tank.py rename to gplibrary/GP/aircraft/fuselage/fuel_tank.py diff --git a/gpkitmodels/GP/aircraft/fuselage/fuselage.pdf b/gplibrary/GP/aircraft/fuselage/fuselage.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/fuselage.pdf rename to gplibrary/GP/aircraft/fuselage/fuselage.pdf diff --git a/gpkitmodels/GP/aircraft/fuselage/fuselage_profile_drag/fusedrag.csv b/gplibrary/GP/aircraft/fuselage/fuselage_profile_drag/fusedrag.csv similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/fuselage_profile_drag/fusedrag.csv rename to gplibrary/GP/aircraft/fuselage/fuselage_profile_drag/fusedrag.csv diff --git a/gpkitmodels/GP/aircraft/fuselage/fuselage_profile_drag/fusedragfit.py b/gplibrary/GP/aircraft/fuselage/fuselage_profile_drag/fusedragfit.py similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/fuselage_profile_drag/fusedragfit.py rename to gplibrary/GP/aircraft/fuselage/fuselage_profile_drag/fusedragfit.py diff --git a/gpkitmodels/GP/aircraft/fuselage/fuselage_skin.py b/gplibrary/GP/aircraft/fuselage/fuselage_skin.py similarity index 100% rename from gpkitmodels/GP/aircraft/fuselage/fuselage_skin.py rename to gplibrary/GP/aircraft/fuselage/fuselage_skin.py diff --git a/gpkitmodels/GP/aircraft/fuselage/test_fuselage.py b/gplibrary/GP/aircraft/fuselage/test_fuselage.py similarity index 70% rename from gpkitmodels/GP/aircraft/fuselage/test_fuselage.py rename to gplibrary/GP/aircraft/fuselage/test_fuselage.py index 50e1587c..c25f2cac 100644 --- a/gpkitmodels/GP/aircraft/fuselage/test_fuselage.py +++ b/gplibrary/GP/aircraft/fuselage/test_fuselage.py @@ -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" diff --git a/gpkitmodels/GP/aircraft/mission/README.md b/gplibrary/GP/aircraft/mission/README.md similarity index 100% rename from gpkitmodels/GP/aircraft/mission/README.md rename to gplibrary/GP/aircraft/mission/README.md diff --git a/gpkitmodels/GP/aircraft/mission/__init__.py b/gplibrary/GP/aircraft/mission/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/mission/__init__.py rename to gplibrary/GP/aircraft/mission/__init__.py diff --git a/gpkitmodels/GP/aircraft/mission/breguet_endurance.py b/gplibrary/GP/aircraft/mission/breguet_endurance.py similarity index 100% rename from gpkitmodels/GP/aircraft/mission/breguet_endurance.py rename to gplibrary/GP/aircraft/mission/breguet_endurance.py diff --git a/gpkitmodels/GP/aircraft/mission/mission.pdf b/gplibrary/GP/aircraft/mission/mission.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/mission/mission.pdf rename to gplibrary/GP/aircraft/mission/mission.pdf diff --git a/gpkitmodels/GP/aircraft/motor/__init__.py b/gplibrary/GP/aircraft/motor/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/motor/__init__.py rename to gplibrary/GP/aircraft/motor/__init__.py diff --git a/gpkitmodels/GP/aircraft/motor/motor.py b/gplibrary/GP/aircraft/motor/motor.py similarity index 96% rename from gpkitmodels/GP/aircraft/motor/motor.py rename to gplibrary/GP/aircraft/motor/motor.py index 1e377769..6e4f5840 100644 --- a/gpkitmodels/GP/aircraft/motor/motor.py +++ b/gplibrary/GP/aircraft/motor/motor.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/motor/motor_test.py b/gplibrary/GP/aircraft/motor/motor_test.py similarity index 93% rename from gpkitmodels/GP/aircraft/motor/motor_test.py rename to gplibrary/GP/aircraft/motor/motor_test.py index c077ab2f..2ff31737 100644 --- a/gpkitmodels/GP/aircraft/motor/motor_test.py +++ b/gplibrary/GP/aircraft/motor/motor_test.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/prop/__init__.py b/gplibrary/GP/aircraft/prop/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/prop/__init__.py rename to gplibrary/GP/aircraft/prop/__init__.py diff --git a/gpkitmodels/GP/aircraft/prop/arccos_fit.py b/gplibrary/GP/aircraft/prop/arccos_fit.py similarity index 100% rename from gpkitmodels/GP/aircraft/prop/arccos_fit.py rename to gplibrary/GP/aircraft/prop/arccos_fit.py diff --git a/gpkitmodels/GP/aircraft/prop/prop_test.py b/gplibrary/GP/aircraft/prop/prop_test.py similarity index 80% rename from gpkitmodels/GP/aircraft/prop/prop_test.py rename to gplibrary/GP/aircraft/prop/prop_test.py index 7ee5a55e..d779159d 100644 --- a/gpkitmodels/GP/aircraft/prop/prop_test.py +++ b/gplibrary/GP/aircraft/prop/prop_test.py @@ -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(): diff --git a/gpkitmodels/GP/aircraft/prop/propeller.py b/gplibrary/GP/aircraft/prop/propeller.py similarity index 100% rename from gpkitmodels/GP/aircraft/prop/propeller.py rename to gplibrary/GP/aircraft/prop/propeller.py diff --git a/gpkitmodels/GP/aircraft/tail/README.md b/gplibrary/GP/aircraft/tail/README.md similarity index 100% rename from gpkitmodels/GP/aircraft/tail/README.md rename to gplibrary/GP/aircraft/tail/README.md diff --git a/gpkitmodels/GP/aircraft/tail/__init__.py b/gplibrary/GP/aircraft/tail/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/tail/__init__.py rename to gplibrary/GP/aircraft/tail/__init__.py diff --git a/gpkitmodels/GP/aircraft/tail/empennage.py b/gplibrary/GP/aircraft/tail/empennage.py similarity index 100% rename from gpkitmodels/GP/aircraft/tail/empennage.py rename to gplibrary/GP/aircraft/tail/empennage.py diff --git a/gpkitmodels/GP/aircraft/tail/horizontal_tail.py b/gplibrary/GP/aircraft/tail/horizontal_tail.py similarity index 89% rename from gpkitmodels/GP/aircraft/tail/horizontal_tail.py rename to gplibrary/GP/aircraft/tail/horizontal_tail.py index 8b3efd01..fe5be278 100644 --- a/gpkitmodels/GP/aircraft/tail/horizontal_tail.py +++ b/gplibrary/GP/aircraft/tail/horizontal_tail.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/tail/tail_aero.py b/gplibrary/GP/aircraft/tail/tail_aero.py similarity index 100% rename from gpkitmodels/GP/aircraft/tail/tail_aero.py rename to gplibrary/GP/aircraft/tail/tail_aero.py diff --git a/gpkitmodels/GP/aircraft/tail/tail_boom.py b/gplibrary/GP/aircraft/tail/tail_boom.py similarity index 98% rename from gpkitmodels/GP/aircraft/tail/tail_boom.py rename to gplibrary/GP/aircraft/tail/tail_boom.py index c6427a78..bc81cff3 100644 --- a/gpkitmodels/GP/aircraft/tail/tail_boom.py +++ b/gplibrary/GP/aircraft/tail/tail_boom.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/tail/tail_dragfit.csv b/gplibrary/GP/aircraft/tail/tail_dragfit.csv similarity index 100% rename from gpkitmodels/GP/aircraft/tail/tail_dragfit.csv rename to gplibrary/GP/aircraft/tail/tail_dragfit.csv diff --git a/gpkitmodels/GP/aircraft/tail/tail_tests.py b/gplibrary/GP/aircraft/tail/tail_tests.py similarity index 92% rename from gpkitmodels/GP/aircraft/tail/tail_tests.py rename to gplibrary/GP/aircraft/tail/tail_tests.py index 595582ad..eeaf0f44 100644 --- a/gpkitmodels/GP/aircraft/tail/tail_tests.py +++ b/gplibrary/GP/aircraft/tail/tail_tests.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/tail/taildragpolar.pdf b/gplibrary/GP/aircraft/tail/taildragpolar.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/tail/taildragpolar.pdf rename to gplibrary/GP/aircraft/tail/taildragpolar.pdf diff --git a/gpkitmodels/GP/aircraft/tail/tailpolars/naca_cl0fits.py b/gplibrary/GP/aircraft/tail/tailpolars/naca_cl0fits.py similarity index 100% rename from gpkitmodels/GP/aircraft/tail/tailpolars/naca_cl0fits.py rename to gplibrary/GP/aircraft/tail/tailpolars/naca_cl0fits.py diff --git a/gpkitmodels/GP/aircraft/tail/tube_spar.py b/gplibrary/GP/aircraft/tail/tube_spar.py similarity index 95% rename from gpkitmodels/GP/aircraft/tail/tube_spar.py rename to gplibrary/GP/aircraft/tail/tube_spar.py index aeb6f88e..e29e68e6 100644 --- a/gpkitmodels/GP/aircraft/tail/tube_spar.py +++ b/gplibrary/GP/aircraft/tail/tube_spar.py @@ -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): diff --git a/gpkitmodels/GP/aircraft/tail/vertical_tail.py b/gplibrary/GP/aircraft/tail/vertical_tail.py similarity index 87% rename from gpkitmodels/GP/aircraft/tail/vertical_tail.py rename to gplibrary/GP/aircraft/tail/vertical_tail.py index fac25327..e0ecbc65 100644 --- a/gpkitmodels/GP/aircraft/tail/vertical_tail.py +++ b/gplibrary/GP/aircraft/tail/vertical_tail.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/wing/README.md b/gplibrary/GP/aircraft/wing/README.md similarity index 100% rename from gpkitmodels/GP/aircraft/wing/README.md rename to gplibrary/GP/aircraft/wing/README.md diff --git a/gpkitmodels/GP/aircraft/wing/__init__.py b/gplibrary/GP/aircraft/wing/__init__.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/__init__.py rename to gplibrary/GP/aircraft/wing/__init__.py diff --git a/gpkitmodels/GP/aircraft/wing/arctan_fit.csv b/gplibrary/GP/aircraft/wing/arctan_fit.csv similarity index 100% rename from gpkitmodels/GP/aircraft/wing/arctan_fit.csv rename to gplibrary/GP/aircraft/wing/arctan_fit.csv diff --git a/gpkitmodels/GP/aircraft/wing/arctan_fit.py b/gplibrary/GP/aircraft/wing/arctan_fit.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/arctan_fit.py rename to gplibrary/GP/aircraft/wing/arctan_fit.py diff --git a/gpkitmodels/GP/aircraft/wing/boxspar.py b/gplibrary/GP/aircraft/wing/boxspar.py similarity index 97% rename from gpkitmodels/GP/aircraft/wing/boxspar.py rename to gplibrary/GP/aircraft/wing/boxspar.py index dfcce651..82a1039a 100644 --- a/gpkitmodels/GP/aircraft/wing/boxspar.py +++ b/gplibrary/GP/aircraft/wing/boxspar.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/wing/capspar.py b/gplibrary/GP/aircraft/wing/capspar.py similarity index 96% rename from gpkitmodels/GP/aircraft/wing/capspar.py rename to gplibrary/GP/aircraft/wing/capspar.py index c58bd3bc..3b1d0754 100644 --- a/gpkitmodels/GP/aircraft/wing/capspar.py +++ b/gplibrary/GP/aircraft/wing/capspar.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/wing/constant_taper_chord.py b/gplibrary/GP/aircraft/wing/constant_taper_chord.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/constant_taper_chord.py rename to gplibrary/GP/aircraft/wing/constant_taper_chord.py diff --git a/gpkitmodels/GP/aircraft/wing/gustloaddiagram.pdf b/gplibrary/GP/aircraft/wing/gustloaddiagram.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/wing/gustloaddiagram.pdf rename to gplibrary/GP/aircraft/wing/gustloaddiagram.pdf diff --git a/gpkitmodels/GP/aircraft/wing/gustloading.py b/gplibrary/GP/aircraft/wing/gustloading.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/gustloading.py rename to gplibrary/GP/aircraft/wing/gustloading.py diff --git a/gpkitmodels/GP/aircraft/wing/jho1polarfit1.pdf b/gplibrary/GP/aircraft/wing/jho1polarfit1.pdf similarity index 100% rename from gpkitmodels/GP/aircraft/wing/jho1polarfit1.pdf rename to gplibrary/GP/aircraft/wing/jho1polarfit1.pdf diff --git a/gpkitmodels/GP/aircraft/wing/jho1polars/jho1.dat b/gplibrary/GP/aircraft/wing/jho1polars/jho1.dat old mode 100755 new mode 100644 similarity index 100% rename from gpkitmodels/GP/aircraft/wing/jho1polars/jho1.dat rename to gplibrary/GP/aircraft/wing/jho1polars/jho1.dat diff --git a/gpkitmodels/GP/aircraft/wing/jho1polars/jho1_polarfits.py b/gplibrary/GP/aircraft/wing/jho1polars/jho1_polarfits.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/jho1polars/jho1_polarfits.py rename to gplibrary/GP/aircraft/wing/jho1polars/jho1_polarfits.py diff --git a/gpkitmodels/GP/aircraft/wing/jho_fitdata.csv b/gplibrary/GP/aircraft/wing/jho_fitdata.csv similarity index 100% rename from gpkitmodels/GP/aircraft/wing/jho_fitdata.csv rename to gplibrary/GP/aircraft/wing/jho_fitdata.csv diff --git a/gpkitmodels/GP/aircraft/wing/sparloading.py b/gplibrary/GP/aircraft/wing/sparloading.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/sparloading.py rename to gplibrary/GP/aircraft/wing/sparloading.py diff --git a/gpkitmodels/GP/aircraft/wing/tube_spar.py b/gplibrary/GP/aircraft/wing/tube_spar.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/tube_spar.py rename to gplibrary/GP/aircraft/wing/tube_spar.py diff --git a/gpkitmodels/GP/aircraft/wing/wing.py b/gplibrary/GP/aircraft/wing/wing.py similarity index 100% rename from gpkitmodels/GP/aircraft/wing/wing.py rename to gplibrary/GP/aircraft/wing/wing.py diff --git a/gpkitmodels/GP/aircraft/wing/wing_core.py b/gplibrary/GP/aircraft/wing/wing_core.py similarity index 92% rename from gpkitmodels/GP/aircraft/wing/wing_core.py rename to gplibrary/GP/aircraft/wing/wing_core.py index 2e9e0fdf..14f11991 100644 --- a/gpkitmodels/GP/aircraft/wing/wing_core.py +++ b/gplibrary/GP/aircraft/wing/wing_core.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/wing/wing_skin.py b/gplibrary/GP/aircraft/wing/wing_skin.py similarity index 96% rename from gpkitmodels/GP/aircraft/wing/wing_skin.py rename to gplibrary/GP/aircraft/wing/wing_skin.py index 2849342f..40da8c2f 100644 --- a/gpkitmodels/GP/aircraft/wing/wing_skin.py +++ b/gplibrary/GP/aircraft/wing/wing_skin.py @@ -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 diff --git a/gpkitmodels/GP/aircraft/wing/wing_test.py b/gplibrary/GP/aircraft/wing/wing_test.py similarity index 90% rename from gpkitmodels/GP/aircraft/wing/wing_test.py rename to gplibrary/GP/aircraft/wing/wing_test.py index 0fc87766..2102b356 100644 --- a/gpkitmodels/GP/aircraft/wing/wing_test.py +++ b/gplibrary/GP/aircraft/wing/wing_test.py @@ -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 diff --git a/gpkitmodels/GP/beam/README.md b/gplibrary/GP/beam/README.md similarity index 100% rename from gpkitmodels/GP/beam/README.md rename to gplibrary/GP/beam/README.md diff --git a/gpkitmodels/GP/beam/__init__.py b/gplibrary/GP/beam/__init__.py similarity index 100% rename from gpkitmodels/GP/beam/__init__.py rename to gplibrary/GP/beam/__init__.py diff --git a/gpkitmodels/GP/beam/beam.pdf b/gplibrary/GP/beam/beam.pdf similarity index 100% rename from gpkitmodels/GP/beam/beam.pdf rename to gplibrary/GP/beam/beam.pdf diff --git a/gpkitmodels/GP/beam/beam.py b/gplibrary/GP/beam/beam.py similarity index 100% rename from gpkitmodels/GP/beam/beam.py rename to gplibrary/GP/beam/beam.py diff --git a/gpkitmodels/GP/materials/__init__.py b/gplibrary/GP/materials/__init__.py similarity index 100% rename from gpkitmodels/GP/materials/__init__.py rename to gplibrary/GP/materials/__init__.py diff --git a/gpkitmodels/GP/materials/composite.py b/gplibrary/GP/materials/composite.py similarity index 100% rename from gpkitmodels/GP/materials/composite.py rename to gplibrary/GP/materials/composite.py diff --git a/gpkitmodels/GP/materials/foam.py b/gplibrary/GP/materials/foam.py similarity index 100% rename from gpkitmodels/GP/materials/foam.py rename to gplibrary/GP/materials/foam.py diff --git a/gpkitmodels/SP/SimPleAC/README.md b/gplibrary/SP/SimPleAC/README.md similarity index 100% rename from gpkitmodels/SP/SimPleAC/README.md rename to gplibrary/SP/SimPleAC/README.md diff --git a/gpkitmodels/SP/SimPleAC/SimPleAC.py b/gplibrary/SP/SimPleAC/SimPleAC.py similarity index 100% rename from gpkitmodels/SP/SimPleAC/SimPleAC.py rename to gplibrary/SP/SimPleAC/SimPleAC.py diff --git a/gpkitmodels/SP/SimPleAC/simpleac.pdf b/gplibrary/SP/SimPleAC/simpleac.pdf similarity index 100% rename from gpkitmodels/SP/SimPleAC/simpleac.pdf rename to gplibrary/SP/SimPleAC/simpleac.pdf diff --git a/gpkitmodels/SP/__init__.py b/gplibrary/SP/__init__.py similarity index 100% rename from gpkitmodels/SP/__init__.py rename to gplibrary/SP/__init__.py diff --git a/gpkitmodels/SP/aircraft/__init__.py b/gplibrary/SP/aircraft/__init__.py similarity index 100% rename from gpkitmodels/SP/aircraft/__init__.py rename to gplibrary/SP/aircraft/__init__.py diff --git a/gpkitmodels/SP/aircraft/prop/__init__.py b/gplibrary/SP/aircraft/prop/__init__.py similarity index 100% rename from gpkitmodels/SP/aircraft/prop/__init__.py rename to gplibrary/SP/aircraft/prop/__init__.py diff --git a/gpkitmodels/SP/aircraft/prop/dae51_fitdata.csv b/gplibrary/SP/aircraft/prop/dae51_fitdata.csv similarity index 100% rename from gpkitmodels/SP/aircraft/prop/dae51_fitdata.csv rename to gplibrary/SP/aircraft/prop/dae51_fitdata.csv diff --git a/gpkitmodels/SP/aircraft/prop/dae51polars/dae51.dat b/gplibrary/SP/aircraft/prop/dae51polars/dae51.dat similarity index 100% rename from gpkitmodels/SP/aircraft/prop/dae51polars/dae51.dat rename to gplibrary/SP/aircraft/prop/dae51polars/dae51.dat diff --git a/gpkitmodels/SP/aircraft/prop/dae51polars/dae51.txt b/gplibrary/SP/aircraft/prop/dae51polars/dae51.txt similarity index 100% rename from gpkitmodels/SP/aircraft/prop/dae51polars/dae51.txt rename to gplibrary/SP/aircraft/prop/dae51polars/dae51.txt diff --git a/gpkitmodels/SP/aircraft/prop/dae51polars/dae51_polarfits.py b/gplibrary/SP/aircraft/prop/dae51polars/dae51_polarfits.py similarity index 95% rename from gpkitmodels/SP/aircraft/prop/dae51polars/dae51_polarfits.py rename to gplibrary/SP/aircraft/prop/dae51polars/dae51_polarfits.py index e97f2a4a..8ba07b58 100644 --- a/gpkitmodels/SP/aircraft/prop/dae51polars/dae51_polarfits.py +++ b/gplibrary/SP/aircraft/prop/dae51polars/dae51_polarfits.py @@ -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 @@ -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") \ No newline at end of file + F.savefig("dae51polarfit1.eps", bbox_inches="tight") diff --git a/gpkitmodels/SP/aircraft/prop/dae51polars/dae51polarfit1.eps b/gplibrary/SP/aircraft/prop/dae51polars/dae51polarfit1.eps similarity index 100% rename from gpkitmodels/SP/aircraft/prop/dae51polars/dae51polarfit1.eps rename to gplibrary/SP/aircraft/prop/dae51polars/dae51polarfit1.eps diff --git a/gpkitmodels/SP/aircraft/prop/dae51polars/polarstest.pdf b/gplibrary/SP/aircraft/prop/dae51polars/polarstest.pdf similarity index 100% rename from gpkitmodels/SP/aircraft/prop/dae51polars/polarstest.pdf rename to gplibrary/SP/aircraft/prop/dae51polars/polarstest.pdf diff --git a/gpkitmodels/SP/aircraft/prop/propeller.py b/gplibrary/SP/aircraft/prop/propeller.py similarity index 100% rename from gpkitmodels/SP/aircraft/prop/propeller.py rename to gplibrary/SP/aircraft/prop/propeller.py diff --git a/gpkitmodels/SP/aircraft/tail/__init__.py b/gplibrary/SP/aircraft/tail/__init__.py similarity index 100% rename from gpkitmodels/SP/aircraft/tail/__init__.py rename to gplibrary/SP/aircraft/tail/__init__.py diff --git a/gpkitmodels/SP/aircraft/tail/tail_boom_flex.py b/gplibrary/SP/aircraft/tail/tail_boom_flex.py similarity index 100% rename from gpkitmodels/SP/aircraft/tail/tail_boom_flex.py rename to gplibrary/SP/aircraft/tail/tail_boom_flex.py diff --git a/gpkitmodels/SP/aircraft/wing/__init__.py b/gplibrary/SP/aircraft/wing/__init__.py similarity index 100% rename from gpkitmodels/SP/aircraft/wing/__init__.py rename to gplibrary/SP/aircraft/wing/__init__.py diff --git a/gpkitmodels/SP/aircraft/wing/boxspar.py b/gplibrary/SP/aircraft/wing/boxspar.py similarity index 91% rename from gpkitmodels/SP/aircraft/wing/boxspar.py rename to gplibrary/SP/aircraft/wing/boxspar.py index 60d00c48..9dec420a 100644 --- a/gpkitmodels/SP/aircraft/wing/boxspar.py +++ b/gplibrary/SP/aircraft/wing/boxspar.py @@ -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 diff --git a/gpkitmodels/SP/aircraft/wing/wing.py b/gplibrary/SP/aircraft/wing/wing.py similarity index 89% rename from gpkitmodels/SP/aircraft/wing/wing.py rename to gplibrary/SP/aircraft/wing/wing.py index 288f114c..d78ca01c 100644 --- a/gpkitmodels/SP/aircraft/wing/wing.py +++ b/gplibrary/SP/aircraft/wing/wing.py @@ -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 diff --git a/gpkitmodels/SP/atmosphere/atmosphere.py b/gplibrary/SP/atmosphere/atmosphere.py similarity index 100% rename from gpkitmodels/SP/atmosphere/atmosphere.py rename to gplibrary/SP/atmosphere/atmosphere.py diff --git a/gpkitmodels/__init__.py b/gplibrary/__init__.py similarity index 100% rename from gpkitmodels/__init__.py rename to gplibrary/__init__.py diff --git a/gpkitmodels/misc/Economic Order Quantity/README.md b/gplibrary/misc/Economic Order Quantity/README.md similarity index 100% rename from gpkitmodels/misc/Economic Order Quantity/README.md rename to gplibrary/misc/Economic Order Quantity/README.md diff --git a/gpkitmodels/misc/Economic Order Quantity/__init__.py b/gplibrary/misc/Economic Order Quantity/__init__.py similarity index 100% rename from gpkitmodels/misc/Economic Order Quantity/__init__.py rename to gplibrary/misc/Economic Order Quantity/__init__.py diff --git a/gpkitmodels/misc/Economic Order Quantity/eoq.pdf b/gplibrary/misc/Economic Order Quantity/eoq.pdf similarity index 100% rename from gpkitmodels/misc/Economic Order Quantity/eoq.pdf rename to gplibrary/misc/Economic Order Quantity/eoq.pdf diff --git a/gpkitmodels/misc/Economic Order Quantity/qsweep.pdf b/gplibrary/misc/Economic Order Quantity/qsweep.pdf similarity index 100% rename from gpkitmodels/misc/Economic Order Quantity/qsweep.pdf rename to gplibrary/misc/Economic Order Quantity/qsweep.pdf diff --git a/gpkitmodels/misc/Moment of Inertia (cylindrical beam)/MoICylinder.PNG b/gplibrary/misc/Moment of Inertia (cylindrical beam)/MoICylinder.PNG similarity index 100% rename from gpkitmodels/misc/Moment of Inertia (cylindrical beam)/MoICylinder.PNG rename to gplibrary/misc/Moment of Inertia (cylindrical beam)/MoICylinder.PNG diff --git a/gpkitmodels/misc/Moment of Inertia (cylindrical beam)/README.md b/gplibrary/misc/Moment of Inertia (cylindrical beam)/README.md similarity index 100% rename from gpkitmodels/misc/Moment of Inertia (cylindrical beam)/README.md rename to gplibrary/misc/Moment of Inertia (cylindrical beam)/README.md diff --git a/gpkitmodels/misc/Moment of Inertia (cylindrical beam)/moi.pdf b/gplibrary/misc/Moment of Inertia (cylindrical beam)/moi.pdf similarity index 100% rename from gpkitmodels/misc/Moment of Inertia (cylindrical beam)/moi.pdf rename to gplibrary/misc/Moment of Inertia (cylindrical beam)/moi.pdf diff --git a/gpkitmodels/misc/Moment of Inertia (cylindrical beam)/moi.py b/gplibrary/misc/Moment of Inertia (cylindrical beam)/moi.py similarity index 100% rename from gpkitmodels/misc/Moment of Inertia (cylindrical beam)/moi.py rename to gplibrary/misc/Moment of Inertia (cylindrical beam)/moi.py diff --git a/gpkitmodels/misc/Moment of Inertia (cylindrical beam)/tightness.png b/gplibrary/misc/Moment of Inertia (cylindrical beam)/tightness.png similarity index 100% rename from gpkitmodels/misc/Moment of Inertia (cylindrical beam)/tightness.png rename to gplibrary/misc/Moment of Inertia (cylindrical beam)/tightness.png diff --git a/gpkitmodels/misc/Net Present Value/README.md b/gplibrary/misc/Net Present Value/README.md similarity index 100% rename from gpkitmodels/misc/Net Present Value/README.md rename to gplibrary/misc/Net Present Value/README.md diff --git a/gpkitmodels/misc/Net Present Value/__init__.py b/gplibrary/misc/Net Present Value/__init__.py similarity index 100% rename from gpkitmodels/misc/Net Present Value/__init__.py rename to gplibrary/misc/Net Present Value/__init__.py diff --git a/gpkitmodels/misc/Net Present Value/npv.pdf b/gplibrary/misc/Net Present Value/npv.pdf similarity index 100% rename from gpkitmodels/misc/Net Present Value/npv.pdf rename to gplibrary/misc/Net Present Value/npv.pdf diff --git a/gpkitmodels/misc/Net Present Value/npv.py b/gplibrary/misc/Net Present Value/npv.py similarity index 100% rename from gpkitmodels/misc/Net Present Value/npv.py rename to gplibrary/misc/Net Present Value/npv.py diff --git a/gpkitmodels/misc/README.md b/gplibrary/misc/README.md similarity index 100% rename from gpkitmodels/misc/README.md rename to gplibrary/misc/README.md diff --git a/gpkitmodels/misc/Raymer Weights/Blended Wing-Body/MTOW_breakdown.eps b/gplibrary/misc/Raymer Weights/Blended Wing-Body/MTOW_breakdown.eps similarity index 100% rename from gpkitmodels/misc/Raymer Weights/Blended Wing-Body/MTOW_breakdown.eps rename to gplibrary/misc/Raymer Weights/Blended Wing-Body/MTOW_breakdown.eps diff --git a/gpkitmodels/misc/Raymer Weights/Blended Wing-Body/OEW_breakdown.eps b/gplibrary/misc/Raymer Weights/Blended Wing-Body/OEW_breakdown.eps similarity index 100% rename from gpkitmodels/misc/Raymer Weights/Blended Wing-Body/OEW_breakdown.eps rename to gplibrary/misc/Raymer Weights/Blended Wing-Body/OEW_breakdown.eps diff --git a/gpkitmodels/misc/Raymer Weights/Blended Wing-Body/Raymer_Weights_Model.py b/gplibrary/misc/Raymer Weights/Blended Wing-Body/Raymer_Weights_Model.py similarity index 100% rename from gpkitmodels/misc/Raymer Weights/Blended Wing-Body/Raymer_Weights_Model.py rename to gplibrary/misc/Raymer Weights/Blended Wing-Body/Raymer_Weights_Model.py diff --git a/gpkitmodels/misc/Raymer Weights/Blended Wing-Body/XFOIL_BWB.ipynb b/gplibrary/misc/Raymer Weights/Blended Wing-Body/XFOIL_BWB.ipynb similarity index 100% rename from gpkitmodels/misc/Raymer Weights/Blended Wing-Body/XFOIL_BWB.ipynb rename to gplibrary/misc/Raymer Weights/Blended Wing-Body/XFOIL_BWB.ipynb diff --git a/gpkitmodels/misc/Raymer Weights/Raymer_Exact.py b/gplibrary/misc/Raymer Weights/Raymer_Exact.py similarity index 100% rename from gpkitmodels/misc/Raymer Weights/Raymer_Exact.py rename to gplibrary/misc/Raymer Weights/Raymer_Exact.py diff --git a/gpkitmodels/misc/default.latex b/gplibrary/misc/default.latex similarity index 100% rename from gpkitmodels/misc/default.latex rename to gplibrary/misc/default.latex diff --git a/gpkitmodels/misc/make_gpmd b/gplibrary/misc/make_gpmd old mode 100755 new mode 100644 similarity index 100% rename from gpkitmodels/misc/make_gpmd rename to gplibrary/misc/make_gpmd diff --git a/gpkitmodels/tools/__init__.py b/gplibrary/tools/__init__.py similarity index 100% rename from gpkitmodels/tools/__init__.py rename to gplibrary/tools/__init__.py diff --git a/gpkitmodels/tools/fit_constraintset.py b/gplibrary/tools/fit_constraintset.py similarity index 100% rename from gpkitmodels/tools/fit_constraintset.py rename to gplibrary/tools/fit_constraintset.py diff --git a/gpkitmodels/tools/ipynb2module.py b/gplibrary/tools/ipynb2module.py similarity index 100% rename from gpkitmodels/tools/ipynb2module.py rename to gplibrary/tools/ipynb2module.py diff --git a/gpkitmodels/tools/summing_constraintset.py b/gplibrary/tools/summing_constraintset.py similarity index 100% rename from gpkitmodels/tools/summing_constraintset.py rename to gplibrary/tools/summing_constraintset.py diff --git a/gpkitmodels/tools/xfoilWrapper.py b/gplibrary/tools/xfoilWrapper.py similarity index 100% rename from gpkitmodels/tools/xfoilWrapper.py rename to gplibrary/tools/xfoilWrapper.py diff --git a/setup.py b/setup.py index 11feae0e..3d33d447 100644 --- a/setup.py +++ b/setup.py @@ -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", @@ -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",