Merge branch 'develop' into feature-wake_cleanup

suavecode · Jul 13, 2022 · 6b6e8f9 · 6b6e8f9
2 parents 7a016ea + a3b8af4
commit 6b6e8f9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/trunk/SUAVE/Input_Output/OpenVSP/vsp_propeller.py b/trunk/SUAVE/Input_Output/OpenVSP/vsp_propeller.py
@@ -256,9 +256,9 @@ def make_header_text(vsp_bem,prop):
     Y         = np.round(prop.origin[0][1],5)
     Z         = np.round(prop.origin[0][2],5)
     rotations = np.dot(prop.body_to_prop_vel(),np.array([-1,0,0])) # The sign is because props point opposite flow
-    Xn        = np.round(rotations[0],5)
-    Yn        = np.round(rotations[1],5)
-    Zn        = np.round(rotations[2],5)
+    Xn        = np.round(rotations[0][0],5)
+    Yn        = np.round(rotations[0][1],5)
+    Zn        = np.round(rotations[0][2],5)
 
     beta_3_4  = np.interp(prop.tip_radius*0.75,prop.radius_distribution,beta)
 

diff --git a/trunk/SUAVE/Optimization/helper_functions.py b/trunk/SUAVE/Optimization/helper_functions.py
@@ -249,7 +249,13 @@ def get_values(dictionary,outputs,aliases):
 
     values = np.zeros(len(outputs))
     for ii in range(0,len(outputs)):
-        splitstring = pointer[ii].split('.')
+
+        if isinstance(pointer[ii], str) and not ('*' in pointer[ii]) :
+            splitstring = pointer[ii].split('.')
+
+        else :
+            raise TypeError("Pointers for Objectives and Constraints must be unique path (str), not list or contain asterisk")
+
         values[ii]  = eval('dictionary.'+'.'.join(splitstring[0:]))
 
     return values
@@ -364,4 +370,4 @@ def unscale_const_values(inputs,x):
     provided_scale = np.array(inputs[:,-2],dtype = float)
     scaled =  x*provided_scale/provided_units
 
-    return scaled
+    return scaled