remove debug stuff

akafliegdarmstadt · Oct 21, 2019 · cac4ef2 · cac4ef2
1 parent 5d465aa
commit cac4ef2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/wingstructure/aero/liftingline.py b/wingstructure/aero/liftingline.py
@@ -16,7 +16,8 @@
 
 class LiftAnalysis:
     @classmethod
-    def generate(cls, wing, airfoil_db=defaultdict(AirfoilData), method='multhop', grid='default', M=None):
+    def generate(cls, wing, airfoil_db=defaultdict(AirfoilData), method='multhop', grid='default',
+                 grid_pts=None, M=None):
         """Build a LiftAnalysis object
         
         Parameters
@@ -51,16 +52,18 @@ def generate(cls, wing, airfoil_db=defaultdict(AirfoilData), method='multhop', g
 
             ys[len(ys)//2] = 0.0
 
+        elif grid == 'defined':
+            ys = grid_pts
         else:
-            ys = grid
+            raise Exception(f'Unknown grid argument: {grid}')
 
         try:
             calculator = _calculator_dict[method](wing, ys, airfoil_db)
         except:
             raise NotImplementedError('{} is not implemented yet!'.format(method))
 
         analysis = cls()
-
+        
         analysis.ys = ys
         analysis._base = calculator.baselift()
         analysis._airbrake = calculator.airbrakelift()

diff --git a/wingstructure/aero/multhop.py b/wingstructure/aero/multhop.py
@@ -147,12 +147,10 @@ def multhop(ys: np.ndarray, αs: np.ndarray, chords: np.ndarray,
 
         chords = solverinput[3]
 
-        import pdb
-
     else:
         M = len(ys)
 
-        θs = np.arccos(-2* ys/b)
+        θs = np.arccos(-2 * np.array(ys)/b)
 
         γs, α_is = _multhop_solve(θs, αs, chords, dcls, b)
 

diff --git a/wingstructure/wingloads.py b/wingstructure/wingloads.py
@@ -81,7 +81,6 @@ def calculation_points(flatwing, M):
     array
         span wise calculation positions
     """
-    from .aero.multhop import _calc_gridpoints
 
     b = flatwing.span