change solar for loading changes in library

gassolar/gas/gas.py

@@ -66,16 +66,6 @@ def setup(self, sp=False):
     def flight_model(self, state):
         return AircraftPerf(self, state)
 
-class AircraftLoadingSP(Model):
-    "aircraft loading model"
-    def setup(self, aircraft, Wcent, Wwing, V, CL):
-
-        # loading = [aircraft.wing.loading(aircraft.wing, Wcent, Wwing, V, CL)]
-        loading = []
-
-
-        return loading
-
 class AircraftPerf(Model):
     "performance model for aircraft"
     def setup(self, static, state):

gassolar/solar/solar.py

@@ -41,12 +41,6 @@ def setup(self, sp=False):
 
         self.components = [self.solarcells, self.wing, self.battery,
                            self.emp, self.motor]
-        loading = []
-        if sp:
-            loading = TailBoomFlexibility(self.emp.htail,
-                                          self.emp.hbend,
-                                          self.wing)
-
         Wpay = Variable("W_{pay}", 0, "lbf", "payload weight")
         Wavn = Variable("W_{avn}", 8, "lbf", "avionics weight")
         Wtotal = Variable("W_{total}", "lbf", "aircraft weight")
@@ -84,7 +78,7 @@ def setup(self, sp=False):
                 self.wing.planform.tau*self.wing.planform.croot)
             ]
 
-        return constraints, self.components, loading
+        return constraints, self.components
 
     def flight_model(self, state):
         " what happens during flight "
@@ -236,12 +230,17 @@ def setup(self, latitude=45, day=355):
         rhoref = Variable("\\rho_{ref}", 1.0, "kg/m**3",
                           "reference air density")
         mfac = Variable("m_{fac}", 1.0, "-", "wind speed margin factor")
+        qne = self.qne = Variable("qne", "kg/s^2/m",
+                                  "never exceed dynamic pressure")
+        Vne = Variable("Vne", 40, "m/s", "never exceed velocity")
+        rhosl = Variable("rhosl", 1.225, "kg/m^3", "air density at sea level")
 
         constraints = [
             V/mfac >= Vwind,
             FCS(df, Vwind/Vwindref, [rho/rhoref, pct]),
             FCS(dfd, ESday/ESvar, [PSmin/PSvar]),
             FCS(dft, ESc/ESvar, [PSmin/PSvar]),
+            qne == 0.5*Vne**2*rhosl
             ]
 
         return constraints
@@ -269,9 +268,18 @@ def setup(self, aircraft, latitude=35, day=355):
         self.slf = SteadyLevelFlight(self.fs, self.aircraft,
                                      self.aircraftPerf)
 
+        hbend = self.aircraft.emp.tailboom.tailLoad(
+            self.aircraft.emp.tailboom, self.aircraft.emp.htail, self.fs)
+        vbend = self.aircraft.emp.tailboom.tailLoad(
+            self.aircraft.emp.tailboom, self.aircraft.emp.vtail, self.fs)
         self.loading = [
-            self.aircraft.wing.spar.loading(self.aircraft.wing),
-            self.aircraft.wing.spar.gustloading(self.aircraft.wing)]
+            self.aircraft.wing.spar.loading(self.aircraft.wing, self.fs),
+            self.aircraft.wing.spar.gustloading(self.aircraft.wing, self.fs),
+            hbend, vbend]
+
+        if self.aircraft.sp:
+            self.loading.append(TailBoomFlexibility(
+                self.aircraft.emp.htail, hbend, self.aircraft.wing))
 
         self.loading[0].substitutions[self.loading[0].Nmax] = 5
         self.loading[1].substitutions[self.loading[1].Nmax] = 2
@@ -323,35 +331,35 @@ def setup(self, latitude=35, day=355, sp=False):
 
         return self.solar, self.mission
 
-    def process_result(self, result):
-        super(Mission, self).process_result(result)
-        result["latitude"] = []
-        result["day"] = []
-        sens = result["sensitivities"]["constants"]
-        for f in self.mission:
-            const = False
-            for sub in f.substitutions:
-                if sub not in f.varkeys:
-                    continue
-                if sub in self.solar.varkeys:
-                    continue
-                if any(s > 1e-5 for s in np.hstack([abs(sens[sub])])):
-                    const = True
-                    break
-            if const:
-                print "%d is a constraining latitude" % f.latitude
-                result["latitude"].append(f.latitude)
-                result["day"].append(f.day)
-                continue
-            for vk in f.varkeys:
-                if vk in self.solar.varkeys:
-                    continue
-                del result["variables"][vk]
-                if vk in result["freevariables"]:
-                    del result["freevariables"][vk]
-                else:
-                    del result["constants"][vk]
-                    del result["sensitivities"]["constants"][vk]
+    # def process_result(self, result):
+    #     super(Mission, self).process_result(result)
+    #     result["latitude"] = []
+    #     result["day"] = []
+    #     sens = result["sensitivities"]["constants"]
+    #     for f in self.mission:
+    #         const = False
+    #         for sub in f.substitutions:
+    #             if sub not in f.varkeys:
+    #                 continue
+    #             if sub in self.solar.varkeys:
+    #                 continue
+    #             if any(s > 1e-5 for s in np.hstack([abs(sens[sub])])):
+    #                 const = True
+    #                 break
+    #         if const:
+    #             print "%d is a constraining latitude" % f.latitude
+    #             result["latitude"].append(f.latitude)
+    #             result["day"].append(f.day)
+    #             continue
+    #         for vk in f.varkeys:
+    #             if vk in self.solar.varkeys:
+    #                 continue
+    #             del result["variables"][vk]
+    #             if vk in result["freevariables"]:
+    #                 del result["freevariables"][vk]
+    #             else:
+    #                 del result["constants"][vk]
+    #                 del result["sensitivities"]["constants"][vk]
 
 def test():
     " test model for continuous integration "