From 953397a2c6e7badc970f5fb4e32e4e68d1985155 Mon Sep 17 00:00:00 2001 From: planes Date: Fri, 20 Mar 2020 12:54:38 -0700 Subject: [PATCH 1/7] scipy and SU2 fixes --- .../Energy/Converters/Motor_Lo_Fid.py | 3 ++ trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py | 30 +++++++++++-------- .../Package_Setups/scipy_setup.py | 4 +-- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py index 16857188fd..4a9340f156 100644 --- a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py +++ b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py @@ -9,6 +9,8 @@ # Imports # ---------------------------------------------------------------------- +import numpy as np + # suave imports import SUAVE @@ -100,6 +102,7 @@ def omega(self,conditions): # Omega omega1 = (Kv*v)/2. + (Kv*(Res*Res*io*io - 2.*Res*etam*io*v - 2.*Res*io*v + etam*etam*v*v - 2.*etam*v*v + v*v)**(1./2.))/2. - (Kv*Res*io)/2. + (Kv*etam*v)/2. + omega1[np.isnan(omega1)] = 0.0 Q = ((v-omega1/Kv)/Res -io)/Kv omega1[v==0] = 0. diff --git a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py index f2706e6fe9..4e751923ca 100644 --- a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py +++ b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py @@ -40,9 +40,14 @@ def write_SU2_cfg(tag,SU2_settings): f = open(filename,mode='w') # Problem definition - f.write('PHYSICAL_PROBLEM = EULER\n\n') + f.write('SOLVER = EULER\n\n') + f.write('KIND_TURB_MODEL = NONE\n\n') + f.write('KIND_VERIFICATION_SOLUTION= NO_VERIFICATION_SOLUTION\n\n') f.write('MATH_PROBLEM = DIRECT\n\n') + f.write('AXISYMMETRIC= NO\n\n') f.write('RESTART_SOL = NO\n\n') + f.write('DISCARD_INFILES= NO\n\n') + f.write('SYSTEM_MEASUREMENTS= SI\n\n') # Freestream definition f.write('MACH_NUMBER = ' + str(float(mach)) + '\n\n') @@ -77,7 +82,7 @@ def write_SU2_cfg(tag,SU2_settings): f.write('CFL_ADAPT = YES\n\n') f.write('CFL_ADAPT_PARAM = ( 1.5, 0.5, 1.0, 100.0 )\n\n') f.write('RK_ALPHA_COEFF = ( 0.66667, 0.66667, 1.000000 )\n\n') - f.write('EXT_ITER ='+str(int(iters)) +'\n\n') + f.write('INNER_ITER ='+str(int(iters)) +'\n\n') f.write('LINEAR_SOLVER = FGMRES\n\n') f.write('LINEAR_SOLVER_ERROR = 1E-6\n\n') f.write('LINEAR_SOLVER_ITER = 2\n\n') @@ -114,28 +119,27 @@ def write_SU2_cfg(tag,SU2_settings): # Convergence parameters f.write('CONV_CRITERIA = CAUCHY\n\n') - f.write('RESIDUAL_REDUCTION = 8\n\n') - f.write('RESIDUAL_MINVAL = -12\n\n') - f.write('STARTCONV_ITER = 25\n\n') - f.write('CAUCHY_ELEMS = 100\n\n') - f.write('CAUCHY_EPS = 1E-6\n\n') - f.write('CAUCHY_FUNC_FLOW = LIFT\n\n') + f.write('CONV_RESIDUAL_MINVAL = -12\n\n') + f.write('CONV_STARTITER = 25\n\n') + f.write('CONV_CAUCHY_ELEMS = 100\n\n') + f.write('CONV_CAUCHY_EPS = 1E-6\n\n') + #f.write('CAUCHY_FUNC_FLOW = LIFT\n\n') # Input/Output f.write('MESH_FILENAME = ' + tag + '.su2\n\n') f.write('MESH_OUT_FILENAME = mesh_out.su2\n\n') - f.write('SOLUTION_FLOW_FILENAME = solution_flow.dat\n\n') + f.write('SOLUTION_FILENAME = solution_flow.dat\n\n') f.write('SOLUTION_ADJ_FILENAME = solution_adj.dat\n\n') f.write('MESH_FORMAT = SU2\n\n') - f.write('OUTPUT_FORMAT = TECPLOT\n\n') + f.write('TABULAR_FORMAT = TECPLOT\n\n') f.write('CONV_FILENAME = ' + tag + '_history\n\n') f.write('BREAKDOWN_FILENAME = ' + tag + '_forces_breakdown.dat\n\n') - f.write('RESTART_FLOW_FILENAME = ' + tag + '_restart_flow.dat\n\n') + f.write('RESTART_FILENAME = ' + tag + '_restart_flow.dat\n\n') f.write('RESTART_ADJ_FILENAME = restart_adj.dat\n\n') - f.write('VOLUME_FLOW_FILENAME = ' + tag + '_flow\n\n') + f.write('VOLUME_FILENAME = ' + tag + '_flow\n\n') f.write('VOLUME_ADJ_FILENAME = adjoint\n\n') f.write('GRAD_OBJFUNC_FILENAME = of_grad.dat\n\n') - f.write('SURFACE_FLOW_FILENAME = ' + tag + '_surface_flow\n\n') + f.write('SURFACE_FILENAME = ' + tag + '_surface_flow\n\n') f.write('SURFACE_ADJ_FILENAME = surface_adjoint\n\n') f.write('WRT_SOL_FREQ = 1000\n\n') f.write('WRT_CON_FREQ = 1\n\n') diff --git a/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py b/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py index 745babdaef..1810c0eb5b 100644 --- a/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py +++ b/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py @@ -17,7 +17,7 @@ # ---------------------------------------------------------------------- ## @ingroup Optimization-Package_Setups -def SciPy_Solve(problem,solver='SLSQP', sense_step = 1.4901161193847656e-08, pop_size = 10 , prob_seed = None ): +def SciPy_Solve(problem,solver='SLSQP', sense_step = 1.4901161193847656e-08, tolerance = 1e-6, pop_size = 10 , prob_seed = None ): """ This converts your SUAVE Nexus problem into a SciPy optimization problem and solves it SciPy has many algorithms, they can be switched out by using the solver input. @@ -67,7 +67,7 @@ def SciPy_Solve(problem,solver='SLSQP', sense_step = 1.4901161193847656e-08, pop # Finalize problem statement and run if solver=='SLSQP': - outputs = sp.optimize.fmin_slsqp(wrapper,x,f_eqcons=problem.equality_constraint,f_ieqcons=problem.inequality_constraint,bounds=bnds,iter=200, epsilon = sense_step, acc = sense_step**2) + outputs = sp.optimize.fmin_slsqp(wrapper,x,f_eqcons=problem.equality_constraint,f_ieqcons=problem.inequality_constraint,bounds=bnds,iter=200, epsilon = sense_step, acc = tolerance) elif solver == 'differential_evolution': outputs = sp.optimize.differential_evolution(wrapper, bounds= de_bnds, strategy='best1bin', maxiter=1000, popsize = pop_size, tol=0.01, mutation=(0.5, 1), recombination=0.7, seed=prob_seed, callback=None, disp=False, polish=True, init='latinhypercube', atol=0, updating='immediate', workers=1) elif solver == 'particle_swarm_optimization': From 42e2396e29f90b38d77546fcaf7978c051257604 Mon Sep 17 00:00:00 2001 From: planes Date: Fri, 20 Mar 2020 16:37:06 -0700 Subject: [PATCH 2/7] fixed avl and SU2 --- .../Analyses/Aerodynamics/SU2_inviscid.py | 4 ++-- trunk/SUAVE/Input_Output/SU2/call_SU2_CFD.py | 4 ++-- trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py | 2 ++ .../Methods/Aerodynamics/AVL/read_results.py | 20 +++++++++---------- .../Aerodynamics/AVL/write_input_deck.py | 2 +- trunk/setup.py | 4 ++-- 6 files changed, 19 insertions(+), 17 deletions(-) diff --git a/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py b/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py index c982e51e38..dbd3f24039 100644 --- a/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py +++ b/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py @@ -264,8 +264,8 @@ def build_surrogate(self): regr_cl = gaussian_process.GaussianProcessRegressor(kernel=gp_kernel_ES) regr_cd = gaussian_process.GaussianProcessRegressor(kernel=gp_kernel_ES) cl_surrogate = regr_cl.fit(xy, CL_data) - cd_surrogate = regr_cd.fit(xy, CD_data) - + cd_surrogate = regr_cd.fit(xy, CD_data) + # KNN #regr_cl = neighbors.KNeighborsRegressor(n_neighbors=1,weights='distance') #regr_cd = neighbors.KNeighborsRegressor(n_neighbors=1,weights='distance') diff --git a/trunk/SUAVE/Input_Output/SU2/call_SU2_CFD.py b/trunk/SUAVE/Input_Output/SU2/call_SU2_CFD.py index 9e1c203863..da1fb78720 100644 --- a/trunk/SUAVE/Input_Output/SU2/call_SU2_CFD.py +++ b/trunk/SUAVE/Input_Output/SU2/call_SU2_CFD.py @@ -50,8 +50,8 @@ def call_SU2_CFD(tag,parallel=False,processors=1): # Lift and Drag - CL = float(final_state[1]) - CD = float(final_state[2]) + CL = float(final_state[9]) + CD = float(final_state[8]) SU2_results.coefficient_of_lift = CL SU2_results.coefficient_of_drag = CD diff --git a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py index 4e751923ca..48bc62cdc3 100644 --- a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py +++ b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py @@ -126,6 +126,8 @@ def write_SU2_cfg(tag,SU2_settings): #f.write('CAUCHY_FUNC_FLOW = LIFT\n\n') # Input/Output + f.write('SCREEN_OUTPUT= ( LIFT, DRAG, INNER_ITER, WALL_TIME, RMS_DENSITY, RMS_ENERGY)\n\n') + f.write('HISTORY_OUTPUT= ( ITER, AERO_COEFF, RMS_RES )\n\n') f.write('MESH_FILENAME = ' + tag + '.su2\n\n') f.write('MESH_OUT_FILENAME = mesh_out.su2\n\n') f.write('SOLUTION_FILENAME = solution_flow.dat\n\n') diff --git a/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py b/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py index dbdf218bd3..f03f800ceb 100644 --- a/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py +++ b/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py @@ -77,16 +77,16 @@ def read_results(avl_object): case_res.aerodynamics.induced_drag_coefficient = float(lines[25][32:42].strip()) case_res.aerodynamics.oswald_efficiency = float(lines[27][32:42].strip()) - case_res.stability.alpha_derivatives.lift_curve_slope = float(lines[36+num_ctrl][24:34].strip()) # CL_a - case_res.stability.alpha_derivatives.side_force_derivative = float(lines[37+num_ctrl][24:34].strip()) # CY_a - case_res.stability.alpha_derivatives.roll_moment_derivative = float(lines[38+num_ctrl][24:34].strip()) # Cl_a - case_res.stability.alpha_derivatives.pitch_moment_derivative = float(lines[39+num_ctrl][24:34].strip()) # Cm_a - case_res.stability.alpha_derivatives.yaw_moment_derivative = float(lines[40+num_ctrl][24:34].strip()) # Cn_a - case_res.stability.beta_derivatives.lift_coefficient_derivative = float(lines[36+num_ctrl][43:54].strip()) # CL_b - case_res.stability.beta_derivatives.side_force_derivative = float(lines[37+num_ctrl][43:54].strip()) # CY_b - case_res.stability.beta_derivatives.roll_moment_derivative = float(lines[38+num_ctrl][43:54].strip()) # Cl_b - case_res.stability.beta_derivatives.pitch_moment_derivative = float(lines[39+num_ctrl][43:54].strip()) # Cm_b - case_res.stability.beta_derivatives.yaw_moment_derivative = float(lines[40+num_ctrl][43:54].strip()) # Cn_b + case_res.stability.alpha_derivatives.lift_curve_slope = float(lines[36][24:34].strip()) # CL_a + case_res.stability.alpha_derivatives.side_force_derivative = float(lines[37][24:34].strip()) # CY_a + case_res.stability.alpha_derivatives.roll_moment_derivative = float(lines[38][24:34].strip()) # Cl_a + case_res.stability.alpha_derivatives.pitch_moment_derivative = float(lines[39][24:34].strip()) # Cm_a + case_res.stability.alpha_derivatives.yaw_moment_derivative = float(lines[40][24:34].strip()) # Cn_a + case_res.stability.beta_derivatives.lift_coefficient_derivative = float(lines[36][43:54].strip()) # CL_b + case_res.stability.beta_derivatives.side_force_derivative = float(lines[37][43:54].strip()) # CY_b + case_res.stability.beta_derivatives.roll_moment_derivative = float(lines[38][43:54].strip()) # Cl_b + case_res.stability.beta_derivatives.pitch_moment_derivative = float(lines[39][43:54].strip()) # Cm_b + case_res.stability.beta_derivatives.yaw_moment_derivative = float(lines[40][43:54].strip()) # Cn_b case_res.stability.CL_p = float(lines[44+num_ctrl][24:34].strip()) case_res.stability.CL_q = float(lines[44+num_ctrl][43:54].strip()) diff --git a/trunk/SUAVE/Methods/Aerodynamics/AVL/write_input_deck.py b/trunk/SUAVE/Methods/Aerodynamics/AVL/write_input_deck.py index d12517cf7f..5116445364 100644 --- a/trunk/SUAVE/Methods/Aerodynamics/AVL/write_input_deck.py +++ b/trunk/SUAVE/Methods/Aerodynamics/AVL/write_input_deck.py @@ -13,7 +13,7 @@ ## @ingroup Methods-Aerodynamics-AVL def write_input_deck(avl_object,trim_aircraft): - """ This fucntions writes the execution steps used in the AVL call + """ This function writes the execution steps used in the AVL call Assumptions: None diff --git a/trunk/setup.py b/trunk/setup.py index c3a1093274..82ed02f26d 100644 --- a/trunk/setup.py +++ b/trunk/setup.py @@ -16,8 +16,8 @@ def main(): import sys the_package = 'SUAVE' - version = '2.0.0' - date = 'February 14, 2019' + version = '2.1.0' + date = 'March 25, 2020' if len(sys.argv) >= 2: command = sys.argv[1] From cdaae04629b6fdc2bcc5015acb4729821c4a5993 Mon Sep 17 00:00:00 2001 From: planes Date: Fri, 20 Mar 2020 17:37:28 -0700 Subject: [PATCH 3/7] putting things as they were --- .../Analyses/Aerodynamics/SU2_inviscid.py | 4 ++-- .../Methods/Aerodynamics/AVL/read_results.py | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py b/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py index dbd3f24039..c982e51e38 100644 --- a/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py +++ b/trunk/SUAVE/Analyses/Aerodynamics/SU2_inviscid.py @@ -264,8 +264,8 @@ def build_surrogate(self): regr_cl = gaussian_process.GaussianProcessRegressor(kernel=gp_kernel_ES) regr_cd = gaussian_process.GaussianProcessRegressor(kernel=gp_kernel_ES) cl_surrogate = regr_cl.fit(xy, CL_data) - cd_surrogate = regr_cd.fit(xy, CD_data) - + cd_surrogate = regr_cd.fit(xy, CD_data) + # KNN #regr_cl = neighbors.KNeighborsRegressor(n_neighbors=1,weights='distance') #regr_cd = neighbors.KNeighborsRegressor(n_neighbors=1,weights='distance') diff --git a/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py b/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py index f03f800ceb..dbdf218bd3 100644 --- a/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py +++ b/trunk/SUAVE/Methods/Aerodynamics/AVL/read_results.py @@ -77,16 +77,16 @@ def read_results(avl_object): case_res.aerodynamics.induced_drag_coefficient = float(lines[25][32:42].strip()) case_res.aerodynamics.oswald_efficiency = float(lines[27][32:42].strip()) - case_res.stability.alpha_derivatives.lift_curve_slope = float(lines[36][24:34].strip()) # CL_a - case_res.stability.alpha_derivatives.side_force_derivative = float(lines[37][24:34].strip()) # CY_a - case_res.stability.alpha_derivatives.roll_moment_derivative = float(lines[38][24:34].strip()) # Cl_a - case_res.stability.alpha_derivatives.pitch_moment_derivative = float(lines[39][24:34].strip()) # Cm_a - case_res.stability.alpha_derivatives.yaw_moment_derivative = float(lines[40][24:34].strip()) # Cn_a - case_res.stability.beta_derivatives.lift_coefficient_derivative = float(lines[36][43:54].strip()) # CL_b - case_res.stability.beta_derivatives.side_force_derivative = float(lines[37][43:54].strip()) # CY_b - case_res.stability.beta_derivatives.roll_moment_derivative = float(lines[38][43:54].strip()) # Cl_b - case_res.stability.beta_derivatives.pitch_moment_derivative = float(lines[39][43:54].strip()) # Cm_b - case_res.stability.beta_derivatives.yaw_moment_derivative = float(lines[40][43:54].strip()) # Cn_b + case_res.stability.alpha_derivatives.lift_curve_slope = float(lines[36+num_ctrl][24:34].strip()) # CL_a + case_res.stability.alpha_derivatives.side_force_derivative = float(lines[37+num_ctrl][24:34].strip()) # CY_a + case_res.stability.alpha_derivatives.roll_moment_derivative = float(lines[38+num_ctrl][24:34].strip()) # Cl_a + case_res.stability.alpha_derivatives.pitch_moment_derivative = float(lines[39+num_ctrl][24:34].strip()) # Cm_a + case_res.stability.alpha_derivatives.yaw_moment_derivative = float(lines[40+num_ctrl][24:34].strip()) # Cn_a + case_res.stability.beta_derivatives.lift_coefficient_derivative = float(lines[36+num_ctrl][43:54].strip()) # CL_b + case_res.stability.beta_derivatives.side_force_derivative = float(lines[37+num_ctrl][43:54].strip()) # CY_b + case_res.stability.beta_derivatives.roll_moment_derivative = float(lines[38+num_ctrl][43:54].strip()) # Cl_b + case_res.stability.beta_derivatives.pitch_moment_derivative = float(lines[39+num_ctrl][43:54].strip()) # Cm_b + case_res.stability.beta_derivatives.yaw_moment_derivative = float(lines[40+num_ctrl][43:54].strip()) # Cn_b case_res.stability.CL_p = float(lines[44+num_ctrl][24:34].strip()) case_res.stability.CL_q = float(lines[44+num_ctrl][43:54].strip()) From 2fc113c69bfaf469970eb0d18915bf404dae0a87 Mon Sep 17 00:00:00 2001 From: planes Date: Sat, 21 Mar 2020 14:06:13 -0700 Subject: [PATCH 4/7] comments --- trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py index 4a9340f156..44aa57fa60 100644 --- a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py +++ b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py @@ -102,7 +102,11 @@ def omega(self,conditions): # Omega omega1 = (Kv*v)/2. + (Kv*(Res*Res*io*io - 2.*Res*etam*io*v - 2.*Res*io*v + etam*etam*v*v - 2.*etam*v*v + v*v)**(1./2.))/2. - (Kv*Res*io)/2. + (Kv*etam*v)/2. + + # If the voltage supplied is too low this function will NaN. However, that really means it won't spin omega1[np.isnan(omega1)] = 0.0 + + # The torqu Q = ((v-omega1/Kv)/Res -io)/Kv omega1[v==0] = 0. From 2ea3a0c14597b0250f26628ef68dc813e2329223 Mon Sep 17 00:00:00 2001 From: planes Date: Sat, 21 Mar 2020 15:19:00 -0700 Subject: [PATCH 5/7] updating doxygen config --- doc/suave_config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/suave_config b/doc/suave_config index ad74589c39..3be86c82de 100644 --- a/doc/suave_config +++ b/doc/suave_config @@ -38,7 +38,7 @@ PROJECT_NAME = SUAVE # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 2.0.0 +PROJECT_NUMBER = 2.1.0 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From c9fe282ddf9d21eb7ae8e1fba26df017d205f835 Mon Sep 17 00:00:00 2001 From: planes Date: Sat, 21 Mar 2020 16:28:01 -0700 Subject: [PATCH 6/7] fixing comment errors --- trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py | 2 +- trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py index 44aa57fa60..6b6e8a387e 100644 --- a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py +++ b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py @@ -106,7 +106,7 @@ def omega(self,conditions): # If the voltage supplied is too low this function will NaN. However, that really means it won't spin omega1[np.isnan(omega1)] = 0.0 - # The torqu + # The torque Q = ((v-omega1/Kv)/Res -io)/Kv omega1[v==0] = 0. diff --git a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py index 48bc62cdc3..2896e275b6 100644 --- a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py +++ b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py @@ -123,7 +123,6 @@ def write_SU2_cfg(tag,SU2_settings): f.write('CONV_STARTITER = 25\n\n') f.write('CONV_CAUCHY_ELEMS = 100\n\n') f.write('CONV_CAUCHY_EPS = 1E-6\n\n') - #f.write('CAUCHY_FUNC_FLOW = LIFT\n\n') # Input/Output f.write('SCREEN_OUTPUT= ( LIFT, DRAG, INNER_ITER, WALL_TIME, RMS_DENSITY, RMS_ENERGY)\n\n') From 5536b105e52c77fd798f8336996bb6f88c2b7860 Mon Sep 17 00:00:00 2001 From: planes Date: Sat, 21 Mar 2020 17:09:38 -0700 Subject: [PATCH 7/7] updated headers --- trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py | 1 + trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py | 1 + trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py | 1 + 3 files changed, 3 insertions(+) diff --git a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py index 6b6e8a387e..f1738dd87c 100644 --- a/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py +++ b/trunk/SUAVE/Components/Energy/Converters/Motor_Lo_Fid.py @@ -4,6 +4,7 @@ # Created: Jun 2014, E. Botero # Modified: Jan 2016, T. MacDonald # Mar 2020, M. Clarke +# Mar 2020, E. Botero # ---------------------------------------------------------------------- # Imports diff --git a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py index 2896e275b6..647ce8c997 100644 --- a/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py +++ b/trunk/SUAVE/Input_Output/SU2/write_SU2_cfg.py @@ -4,6 +4,7 @@ # Created: Oct 2016, T. MacDonald # Modified: Jan 2017, T. MacDonald # Mar 2018, T. MacDonald +# Mar 2020, E. Botero ## @ingroup Input_Output-SU2 def write_SU2_cfg(tag,SU2_settings): diff --git a/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py b/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py index 1810c0eb5b..f448074daf 100644 --- a/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py +++ b/trunk/SUAVE/Optimization/Package_Setups/scipy_setup.py @@ -3,6 +3,7 @@ # # Created: Aug 2015, E. Botero # Modified: Feb 2017, M. Vegh +# Mar 2020, E. Botero # ---------------------------------------------------------------------- # Imports