From cac4ef2bc1868dec3ba4fbde8c0bf7309797db80 Mon Sep 17 00:00:00 2001
From: helo <Jonathan.Hahn@t-online.de>
Date: Mon, 21 Oct 2019 16:58:16 +0200
Subject: [PATCH] remove debug stuff

---
 wingstructure/aero/liftingline.py | 9 ++++++---
 wingstructure/aero/multhop.py     | 4 +---
 wingstructure/wingloads.py        | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wingstructure/aero/liftingline.py b/wingstructure/aero/liftingline.py
index fc1aa62..078a063 100644
--- 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,8 +52,10 @@ 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)
@@ -60,7 +63,7 @@ def generate(cls, wing, airfoil_db=defaultdict(AirfoilData), method='multhop', g
             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
index 6a3ace1..81c3d8f 100644
--- 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
index c4964d3..412c1c2 100644
--- 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