update makefile and sens process; increase available wlim

convexengineering · Apr 30, 2018 · 453bb5c · 453bb5c
1 parent 7eef17a
commit 453bb5c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/solar/Makefile b/solar/Makefile
@@ -1,3 +1,5 @@
 all:
-	python season.py ../docs/figs/
-	python sens_chart.py ../docs/figs/
+	ipython season.py ./figs/ GEN
+	ipython sens_chart.py ./figs/ GEN
+	ipython npod_trade.py ./figs/ GEN
+	ipython solarlat.py ./figs/ GEN
diff --git a/solar/npod_trade.py b/solar/npod_trade.py
@@ -83,10 +83,10 @@ def test():
 if __name__ == "__main__":
     if len(sys.argv) > 1:
         path = sys.argv[1]
+        GENERATE = True if sys.argv[2] == "GEN" else False
     else:
         path = ""
-
-    GENERATE = True
+        GENERATE = True
 
     if GENERATE:
         DF = pods()

diff --git a/solar/season.py b/solar/season.py
@@ -65,10 +65,10 @@ def test():
 
     if len(sys.argv) > 1:
         path = sys.argv[1]
+        GENERATE = True if sys.argv[2] == "GEN" else False
     else:
         path = ""
-
-    GENERATE = False
+        GENERATE = True
 
     if GENERATE:
         DF = season(range(20, 30, 2))

diff --git a/solar/solar.py b/solar/solar.py
@@ -262,6 +262,7 @@ def setup(self, Npod=0, sp=False):
         self.emp.substitutions[self.emp.vtail.skin.rhoA] = 0.4
         self.emp.substitutions[self.emp.tailboom.wlim] = 1.0
         self.wing.substitutions[self.wing.mfac] = 1.0
+        self.wing.substitutions[self.wing.spar.wlim] = 0.25
         if not sp:
             self.emp.substitutions[Vh] = 0.45
             self.emp.substitutions[self.emp.htail.mh] = 0.1