Heated cylinders test case

Inc_Heated_Cylinders/cht_2d_3cylinders.cfg

@@ -15,21 +15,18 @@
 %                               POISSON_EQUATION)             
 SOLVER= MULTIPHYSICS
 %
-% Regime type (COMPRESSIBLE, INCOMPRESSIBLE, FREESURFACE)
+% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
 MATH_PROBLEM= DIRECT
 %
 % 
-CONFIG_LIST = (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
+CONFIG_LIST= (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
 %
 %
 MARKER_ZONE_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
 %
 %
 MARKER_CHT_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
 %
-%
-TIME_DOMAIN = NO
-%
 % Number of total iterations
 OUTER_ITER = 10000
 %
@@ -38,6 +35,10 @@ MESH_FILENAME= mesh_cht_3cyl.su2
 %
 % Mesh input file format (SU2, CGNS, NETCDF_ASCII)
 MESH_FORMAT= SU2
+%
+% Output file format
+OUTPUT_FILES= (RESTART, TECPLOT, PARAVIEW, SURFACE_TECPLOT, SURFACE_PARAVIEW)
+
 
 % These are just default parameters so that we can run SU2_DOT_AD, they have no physical meaning for this test case.
 
@@ -51,7 +52,7 @@ MESH_FORMAT= SU2
 DV_KIND= HICKS_HENNE
 %
 % Marker of the surface in which we are going apply the shape deformation
-DV_MARKER= ( cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3  )
+DV_MARKER= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
 %
 % Parameters of the shape deformation
 % - NO_DEFORMATION ( 1.0 )

Inc_Heated_Cylinders/flow_cylinder.cfg

@@ -30,16 +30,10 @@ RESTART_SOL= NO
 OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
 %
 % List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
-OBJECTIVE_WEIGHT = 1.0
-%
-% Read binary restart files (YES, NO)
-READ_BINARY_RESTART = NO
-%
-% Write binary restart files (YES, NO)
-WRT_BINARY_RESTART = NO
+OBJECTIVE_WEIGHT= 1.0
 %
 % Data written to history file
-HISTORY_OUTPUT=(ITER, RMS_RES, HEAT )
+HISTORY_OUTPUT= (ITER, RMS_RES, HEAT)
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
@@ -199,10 +193,6 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
-%                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
-%
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
 %
@@ -245,7 +235,7 @@ WRT_CON_FREQ= 1
 DEFORM_LINEAR_SOLVER= FGMRES
 %
 % Number of smoothing iterations for mesh deformation
-DEFORM_LINEAR_ITER= 200
+DEFORM_LINEAR_SOLVER_ITER= 200
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1

Inc_Heated_Cylinders/solid_cylinder1.cfg

@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
 %
 % List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
 OBJECTIVE_WEIGHT = 1.0
-%
-% Read binary restart files (YES, NO)
-READ_BINARY_RESTART = NO
-%
-% Write binary restart files (YES, NO)
-WRT_BINARY_RESTART = NO
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
 SOLID_DENSITY= 0.000210322
 %
 % Solid specific heat (J/kg*K)
-SPECIFIC_HEAT_CP_SOLID = 1004.703
+SPECIFIC_HEAT_CP = 1004.703
 %
 % Solid thermal conductivity (W/m*K)
-THERMAL_CONDUCTIVITY_SOLID= 0.1028
+SOLID_THERMAL_CONDUCTIVITY= 0.1028
 
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
@@ -127,10 +121,6 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
-%                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
-%
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
 %
@@ -173,7 +163,7 @@ WRT_CON_FREQ= 1
 DEFORM_LINEAR_SOLVER= FGMRES
 %
 % Number of smoothing iterations for mesh deformation
-DEFORM_LINEAR_ITER= 200
+DEFORM_LINEAR_SOLVER_ITER= 200
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1

Inc_Heated_Cylinders/solid_cylinder2.cfg

@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
 %
 % List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
 OBJECTIVE_WEIGHT = 1.0
-%
-% Read binary restart files (YES, NO)
-READ_BINARY_RESTART = NO
-%
-% Write binary restart files (YES, NO)
-WRT_BINARY_RESTART = NO
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
 SOLID_DENSITY= 0.000210322
 %
 % Solid specific heat (J/kg*K)
-SPECIFIC_HEAT_CP_SOLID = 1004.703
+SPECIFIC_HEAT_CP = 1004.703
 %
 % Solid thermal conductivity (W/m*K)
-THERMAL_CONDUCTIVITY_SOLID= 0.1028
+SOLID_THERMAL_CONDUCTIVITY= 0.1028
 
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
@@ -137,10 +131,6 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
-%                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
-%
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
 %
@@ -183,7 +173,7 @@ WRT_CON_FREQ= 1
 DEFORM_LINEAR_SOLVER= FGMRES
 %
 % Number of smoothing iterations for mesh deformation
-DEFORM_LINEAR_ITER= 200
+DEFORM_LINEAR_SOLVER_ITER= 200
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1

Inc_Heated_Cylinders/solid_cylinder3.cfg

@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
 %
 % List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
 OBJECTIVE_WEIGHT = 1.0
-%
-% Read binary restart files (YES, NO)
-READ_BINARY_RESTART = NO
-%
-% Write binary restart files (YES, NO)
-WRT_BINARY_RESTART = NO
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
 SOLID_DENSITY= 0.000210322
 %
 % Solid specific heat (J/kg*K)
-SPECIFIC_HEAT_CP_SOLID = 1004.703
+SPECIFIC_HEAT_CP = 1004.703
 %
 % Solid thermal conductivity (W/m*K)
-THERMAL_CONDUCTIVITY_SOLID= 0.1028
+SOLID_THERMAL_CONDUCTIVITY= 0.1028
 
 % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
 %
@@ -137,10 +131,6 @@ SOLUTION_FILENAME= solution_flow.dat
 % Restart adjoint input file
 SOLUTION_ADJ_FILENAME= solution_adj.dat
 %
-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
-%                     FIELDVIEW, FIELDVIEW_BINARY)
-OUTPUT_FORMAT= TECPLOT
-%
 % Output file convergence history (w/o extension)
 CONV_FILENAME= history
 %
@@ -183,7 +173,7 @@ WRT_CON_FREQ= 1
 DEFORM_LINEAR_SOLVER= FGMRES
 %
 % Number of smoothing iterations for mesh deformation
-DEFORM_LINEAR_ITER= 200
+DEFORM_LINEAR_SOLVER_ITER= 200
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1

Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg

@@ -205,7 +205,7 @@ DV_VALUE= 1.0
 % ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
 %
 % Number of smoothing iterations for FEA mesh deformation
-DEFORM_LINEAR_ITER= 500
+DEFORM_LINEAR_SOLVER_ITER= 500
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1
@@ -301,12 +301,17 @@ WRT_HALO= NO
 SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
+%
 % Available flow based objective functions or constraint functions
-%    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
+%    DRAG, LIFT, SIDEFORCE, EFFICIENCY, BUFFET, 
 %    FORCE_X, FORCE_Y, FORCE_Z,
 %    MOMENT_X, MOMENT_Y, MOMENT_Z,
 %    THRUST, TORQUE, FIGURE_OF_MERIT,
 %    EQUIVALENT_AREA, NEARFIELD_PRESSURE,
+%    TOTAL_HEATFLUX, MAXIMUM_HEATFLUX,
+%    INVERSE_DESIGN_PRESSURE, INVERSE_DESIGN_HEATFLUX,
+%    SURFACE_TOTAL_PRESSURE, SURFACE_MASSFLOW
+%    SURFACE_STATIC_PRESSURE, SURFACE_MACH
 %
 % Available geometrical based objective functions or constraint functions
 %    AIRFOIL_AREA, AIRFOIL_THICKNESS, AIRFOIL_CHORD, AIRFOIL_TOC, AIRFOIL_AOA,
@@ -315,18 +320,27 @@ SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
 %    STATION#_TWIST (where # is the index of the station defined in GEO_LOCATION_STATIONS)
 %
 % Available design variables
-%    HICKS_HENNE 	(  1, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
-%    SPHERICAL		(  3, Scale | Mark. List | ControlPoint_Index, Theta_Disp, R_Disp )
-%    NACA_4DIGITS	(  4, Scale | Mark. List |  1st digit, 2nd digit, 3rd and 4th digit )
-%    DISPLACEMENT	(  5, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
-%    ROTATION		(  6, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
-%    FFD_CONTROL_POINT	(  7, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
-%    FFD_TWIST 	(  9, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
-%    FFD_ROTATION 	( 10, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
-%    FFD_CAMBER 	( 11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
-%    FFD_THICKNESS 	( 12, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
-%    FFD_VOLUME 	( 13, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
-%    FOURIER 		( 14, Scale | Mark. List | Lower(0)/Upper(1) side, index, cos(0)/sin(1) )
+% 2D Design variables
+%    FFD_CONTROL_POINT_2D   (  19, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
+%    FFD_CAMBER_2D          (  20, Scale | Mark. List | FFD_BoxTag, i_Ind )
+%    FFD_THICKNESS_2D       (  21, Scale | Mark. List | FFD_BoxTag, i_Ind )
+%    FFD_TWIST_2D           (  22, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig )
+%    HICKS_HENNE            (  30, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
+%    ANGLE_OF_ATTACK        ( 101, Scale | Mark. List | 1.0 )
+%
+% 3D Design variables
+%    FFD_CONTROL_POINT      (  11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
+%    FFD_NACELLE            (  12, Scale | Mark. List | FFD_BoxTag, rho_Ind, theta_Ind, phi_Ind, rho_Mov, phi_Mov )
+%    FFD_GULL               (  13, Scale | Mark. List | FFD_BoxTag, j_Ind )
+%    FFD_CAMBER             (  14, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
+%    FFD_TWIST              (  15, Scale | Mark. List | FFD_BoxTag, j_Ind, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
+%    FFD_THICKNESS          (  16, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
+%    FFD_ROTATION           (  18, Scale | Mark. List | FFD_BoxTag, x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
+%    FFD_ANGLE_OF_ATTACK    (  24, Scale | Mark. List | FFD_BoxTag, 1.0 )
+%
+% Global design variables
+%    TRANSLATION            (   1, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
+%    ROTATION               (   2, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
 %
 % Optimization objective function with scaling factor, separated by semicolons.
 % To include quadratic penalty function: use OPT_CONSTRAINT option syntax within the OPT_OBJECTIVE list.
@@ -359,4 +373,4 @@ OPT_BOUND_UPPER= 0.1
 OPT_BOUND_LOWER= -0.1
 %
 % Optimization design variables, separated by semicolons
-DEFINITION_DV= ( 1, 1.0 | airfoil | 0, 0.05 ); ( 1, 1.0 | airfoil | 0, 0.10 ); ( 1, 1.0 | airfoil | 0, 0.15 ); ( 1, 1.0 | airfoil | 0, 0.20 ); ( 1, 1.0 | airfoil | 0, 0.25 ); ( 1, 1.0 | airfoil | 0, 0.30 ); ( 1, 1.0 | airfoil | 0, 0.35 ); ( 1, 1.0 | airfoil | 0, 0.40 ); ( 1, 1.0 | airfoil | 0, 0.45 ); ( 1, 1.0 | airfoil | 0, 0.50 ); ( 1, 1.0 | airfoil | 0, 0.55 ); ( 1, 1.0 | airfoil | 0, 0.60 ); ( 1, 1.0 | airfoil | 0, 0.65 ); ( 1, 1.0 | airfoil | 0, 0.70 ); ( 1, 1.0 | airfoil | 0, 0.75 ); ( 1, 1.0 | airfoil | 0, 0.80 ); ( 1, 1.0 | airfoil | 0, 0.85 ); ( 1, 1.0 | airfoil | 0, 0.90 ); ( 1, 1.0 | airfoil | 0, 0.95 ); ( 1, 1.0 | airfoil | 1, 0.05 ); ( 1, 1.0 | airfoil | 1, 0.10 ); ( 1, 1.0 | airfoil | 1, 0.15 ); ( 1, 1.0 | airfoil | 1, 0.20 ); ( 1, 1.0 | airfoil | 1, 0.25 ); ( 1, 1.0 | airfoil | 1, 0.30 ); ( 1, 1.0 | airfoil | 1, 0.35 ); ( 1, 1.0 | airfoil | 1, 0.40 ); ( 1, 1.0 | airfoil | 1, 0.45 ); ( 1, 1.0 | airfoil | 1, 0.50 ); ( 1, 1.0 | airfoil | 1, 0.55 ); ( 1, 1.0 | airfoil | 1, 0.60 ); ( 1, 1.0 | airfoil | 1, 0.65 ); ( 1, 1.0 | airfoil | 1, 0.70 ); ( 1, 1.0 | airfoil | 1, 0.75 ); ( 1, 1.0 | airfoil | 1, 0.80 ); ( 1, 1.0 | airfoil | 1, 0.85 ); ( 1, 1.0 | airfoil | 1, 0.90 ); ( 1, 1.0 | airfoil | 1, 0.95 )
+DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.05 ); ( 30, 1.0 | airfoil | 0, 0.10 ); ( 30, 1.0 | airfoil | 0, 0.15 ); ( 30, 1.0 | airfoil | 0, 0.20 ); ( 30, 1.0 | airfoil | 0, 0.25 ); ( 30, 1.0 | airfoil | 0, 0.30 ); ( 30, 1.0 | airfoil | 0, 0.35 ); ( 30, 1.0 | airfoil | 0, 0.40 ); ( 30, 1.0 | airfoil | 0, 0.45 ); ( 30, 1.0 | airfoil | 0, 0.50 ); ( 30, 1.0 | airfoil | 0, 0.55 ); ( 30, 1.0 | airfoil | 0, 0.60 ); ( 30, 1.0 | airfoil | 0, 0.65 ); ( 30, 1.0 | airfoil | 0, 0.70 ); ( 30, 1.0 | airfoil | 0, 0.75 ); ( 30, 1.0 | airfoil | 0, 0.80 ); ( 30, 1.0 | airfoil | 0, 0.85 ); ( 30, 1.0 | airfoil | 0, 0.90 ); ( 30, 1.0 | airfoil | 0, 0.95 ); ( 30, 1.0 | airfoil | 1, 0.05 ); ( 30, 1.0 | airfoil | 1, 0.10 ); ( 30, 1.0 | airfoil | 1, 0.15 ); ( 30, 1.0 | airfoil | 1, 0.20 ); ( 30, 1.0 | airfoil | 1, 0.25 ); ( 30, 1.0 | airfoil | 1, 0.30 ); ( 30, 1.0 | airfoil | 1, 0.35 ); ( 30, 1.0 | airfoil | 1, 0.40 ); ( 30, 1.0 | airfoil | 1, 0.45 ); ( 30, 1.0 | airfoil | 1, 0.50 ); ( 30, 1.0 | airfoil | 1, 0.55 ); ( 30, 1.0 | airfoil | 1, 0.60 ); ( 30, 1.0 | airfoil | 1, 0.65 ); ( 30, 1.0 | airfoil | 1, 0.70 ); ( 30, 1.0 | airfoil | 1, 0.75 ); ( 30, 1.0 | airfoil | 1, 0.80 ); ( 30, 1.0 | airfoil | 1, 0.85 ); ( 30, 1.0 | airfoil | 1, 0.90 ); ( 30, 1.0 | airfoil | 1, 0.95 )

Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg

@@ -329,7 +329,7 @@ DV_PARAM= (MAIN_BOX, 3,0, 0,1.0,0,0 )
 % Value of the shape deformation deformation
 DV_VALUE= 0.5
 % Number of smoothing iterations for FEA mesh deformation
-DEFORM_LINEAR_ITER= 500
+DEFORM_LINEAR_SOLVER_ITER= 500
 %
 % Number of nonlinear deformation iterations (surface deformation increments)
 DEFORM_NONLINEAR_ITER= 1
@@ -346,15 +346,17 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 
 % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
 %
+%
 % Available flow based objective functions or constraint functions
-%    DRAG, LIFT, SIDEFORCE, EFFICIENCY,
+%    DRAG, LIFT, SIDEFORCE, EFFICIENCY, BUFFET, 
 %    FORCE_X, FORCE_Y, FORCE_Z,
 %    MOMENT_X, MOMENT_Y, MOMENT_Z,
 %    THRUST, TORQUE, FIGURE_OF_MERIT,
-%    EQUIVALENT_AREA, NEARFIELD_PRESSURE, 
+%    EQUIVALENT_AREA, NEARFIELD_PRESSURE,
 %    TOTAL_HEATFLUX, MAXIMUM_HEATFLUX,
 %    INVERSE_DESIGN_PRESSURE, INVERSE_DESIGN_HEATFLUX,
-%    FREE_SURFACE, SURFACE_TOTAL_PRESSURE, SURFACE_MASSFLOW
+%    SURFACE_TOTAL_PRESSURE, SURFACE_MASSFLOW
+%    SURFACE_STATIC_PRESSURE, SURFACE_MACH
 %
 % Available geometrical based objective functions or constraint functions
 %    AIRFOIL_AREA, AIRFOIL_THICKNESS, AIRFOIL_CHORD, AIRFOIL_TOC, AIRFOIL_AOA,
@@ -363,21 +365,27 @@ DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 %    STATION#_TWIST (where # is the index of the station defined in GEO_LOCATION_STATIONS)
 %
 % Available design variables
-%    HICKS_HENNE 	(  1, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
-%    SPHERICAL		(  3, Scale | Mark. List | ControlPoint_Index, Theta_Disp, R_Disp )
-%    NACA_4DIGITS	(  4, Scale | Mark. List | 1st digit, 2nd digit, 3rd and 4th digit )
-%    DISPLACEMENT	(  5, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
-%    ROTATION		(  6, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
-%    FFD_CONTROL_POINT	(  7, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
-%    FFD_TWIST 	(  9, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
-%    FFD_ROTATION 	( 10, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
-%    FFD_CAMBER 	( 11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
-%    FFD_THICKNESS 	( 12, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
-%    FOURIER 		( 14, Scale | Mark. List | Lower(0)/Upper(1) side, index, cos(0)/sin(1) )
-%    FFD_CONTROL_POINT_2D (  15, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
-%    FFD_CAMBER_2D 	( 16, Scale | Mark. List | FFD_BoxTag, i_Ind )
-%    FFD_THICKNESS_2D 	( 17, Scale | Mark. List | FFD_BoxTag, i_Ind )
-%    FFD_CONTROL_SURFACE 	( 18, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
+% 2D Design variables
+%    FFD_CONTROL_POINT_2D   (  19, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
+%    FFD_CAMBER_2D          (  20, Scale | Mark. List | FFD_BoxTag, i_Ind )
+%    FFD_THICKNESS_2D       (  21, Scale | Mark. List | FFD_BoxTag, i_Ind )
+%    FFD_TWIST_2D           (  22, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig )
+%    HICKS_HENNE            (  30, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
+%    ANGLE_OF_ATTACK        ( 101, Scale | Mark. List | 1.0 )
+%
+% 3D Design variables
+%    FFD_CONTROL_POINT      (  11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
+%    FFD_NACELLE            (  12, Scale | Mark. List | FFD_BoxTag, rho_Ind, theta_Ind, phi_Ind, rho_Mov, phi_Mov )
+%    FFD_GULL               (  13, Scale | Mark. List | FFD_BoxTag, j_Ind )
+%    FFD_CAMBER             (  14, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
+%    FFD_TWIST              (  15, Scale | Mark. List | FFD_BoxTag, j_Ind, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
+%    FFD_THICKNESS          (  16, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
+%    FFD_ROTATION           (  18, Scale | Mark. List | FFD_BoxTag, x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
+%    FFD_ANGLE_OF_ATTACK    (  24, Scale | Mark. List | FFD_BoxTag, 1.0 )
+%
+% Global design variables
+%    TRANSLATION            (   1, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
+%    ROTATION               (   2, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
 %
 % Optimization objective function with scaling factor, separated by semicolons.
 % To include quadratic penalty function: use OPT_CONSTRAINT option syntax within the OPT_OBJECTIVE list.
@@ -404,5 +412,5 @@ OPT_BOUND_UPPER= 0.1
 OPT_BOUND_LOWER= -0.1
 %
 % Optimization design variables, separated by semicolons
-DEFINITION_DV= (15, 1.0| lower | MAIN_BOX, 3,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 4,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 5,0,0,1.0);(15, 1.0| lower | MAIN_BOX, 6,0,0,1.0)
+DEFINITION_DV= ( 19, 1.0| lower | MAIN_BOX, 3,0,0,1.0);( 19, 1.0| lower | MAIN_BOX, 4,0,0,1.0);( 19, 1.0| lower | MAIN_BOX, 5,0,0,1.0);( 19, 1.0| lower | MAIN_BOX, 6,0,0,1.0)