Skip to content

Commit ecbb09b

Browse files
talbringtalbring
committed
Merge branch 'develop' of https://github.com/su2code/su2code.github.io into release_v7.0.0
2 parents 25b4f97 + 136f440 commit ecbb09b

File tree

20 files changed

+199
-169
lines changed

20 files changed

+199
-169
lines changed

‎Inc_Heated_Cylinders/cht_2d_3cylinders.cfg‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,18 @@
1515
% POISSON_EQUATION)
1616
SOLVER= MULTIPHYSICS
1717
%
18-
% Regime type (COMPRESSIBLE, INCOMPRESSIBLE, FREESURFACE)
18+
% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
1919
MATH_PROBLEM= DIRECT
2020
%
2121
%
22-
CONFIG_LIST = (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
22+
CONFIG_LIST= (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
2323
%
2424
%
2525
MARKER_ZONE_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
2626
%
2727
%
2828
MARKER_CHT_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
2929
%
30-
%
31-
TIME_DOMAIN = NO
32-
%
3330
% Number of total iterations
3431
OUTER_ITER = 10000
3532
%
@@ -38,6 +35,10 @@ MESH_FILENAME= mesh_cht_3cyl.su2
3835
%
3936
% Mesh input file format (SU2, CGNS, NETCDF_ASCII)
4037
MESH_FORMAT= SU2
38+
%
39+
% Output file format
40+
OUTPUT_FILES= (RESTART, TECPLOT, PARAVIEW, SURFACE_TECPLOT, SURFACE_PARAVIEW)
41+
4142

4243
% These are just default parameters so that we can run SU2_DOT_AD, they have no physical meaning for this test case.
4344

@@ -51,7 +52,7 @@ MESH_FORMAT= SU2
5152
DV_KIND= HICKS_HENNE
5253
%
5354
% Marker of the surface in which we are going apply the shape deformation
54-
DV_MARKER= ( cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3 )
55+
DV_MARKER= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
5556
%
5657
% Parameters of the shape deformation
5758
% - NO_DEFORMATION ( 1.0 )

‎Inc_Heated_Cylinders/flow_cylinder.cfg‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,10 @@ RESTART_SOL= NO
3030
OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
3131
%
3232
% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
33-
OBJECTIVE_WEIGHT = 1.0
34-
%
35-
% Read binary restart files (YES, NO)
36-
READ_BINARY_RESTART = NO
37-
%
38-
% Write binary restart files (YES, NO)
39-
WRT_BINARY_RESTART = NO
33+
OBJECTIVE_WEIGHT= 1.0
4034
%
4135
% Data written to history file
42-
HISTORY_OUTPUT=(ITER, RMS_RES, HEAT )
36+
HISTORY_OUTPUT= (ITER, RMS_RES, HEAT)
4337

4438
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
4539
%
@@ -199,10 +193,6 @@ SOLUTION_FILENAME= solution_flow.dat
199193
% Restart adjoint input file
200194
SOLUTION_ADJ_FILENAME= solution_adj.dat
201195
%
202-
% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
203-
% FIELDVIEW, FIELDVIEW_BINARY)
204-
OUTPUT_FORMAT= TECPLOT
205-
%
206196
% Output file convergence history (w/o extension)
207197
CONV_FILENAME= history
208198
%
@@ -245,7 +235,7 @@ WRT_CON_FREQ= 1
245235
DEFORM_LINEAR_SOLVER= FGMRES
246236
%
247237
% Number of smoothing iterations for mesh deformation
248-
DEFORM_LINEAR_ITER= 200
238+
DEFORM_LINEAR_SOLVER_ITER= 200
249239
%
250240
% Number of nonlinear deformation iterations (surface deformation increments)
251241
DEFORM_NONLINEAR_ITER= 1

‎Inc_Heated_Cylinders/solid_cylinder1.cfg‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
2828
%
2929
% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
3030
OBJECTIVE_WEIGHT = 1.0
31-
%
32-
% Read binary restart files (YES, NO)
33-
READ_BINARY_RESTART = NO
34-
%
35-
% Write binary restart files (YES, NO)
36-
WRT_BINARY_RESTART = NO
3731

3832
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
3933
%
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
5953
SOLID_DENSITY= 0.000210322
6054
%
6155
% Solid specific heat (J/kg*K)
62-
SPECIFIC_HEAT_CP_SOLID = 1004.703
56+
SPECIFIC_HEAT_CP = 1004.703
6357
%
6458
% Solid thermal conductivity (W/m*K)
65-
THERMAL_CONDUCTIVITY_SOLID= 0.1028
59+
SOLID_THERMAL_CONDUCTIVITY= 0.1028
6660

6761
% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
6862
%
@@ -127,10 +121,6 @@ SOLUTION_FILENAME= solution_flow.dat
127121
% Restart adjoint input file
128122
SOLUTION_ADJ_FILENAME= solution_adj.dat
129123
%
130-
% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
131-
% FIELDVIEW, FIELDVIEW_BINARY)
132-
OUTPUT_FORMAT= TECPLOT
133-
%
134124
% Output file convergence history (w/o extension)
135125
CONV_FILENAME= history
136126
%
@@ -173,7 +163,7 @@ WRT_CON_FREQ= 1
173163
DEFORM_LINEAR_SOLVER= FGMRES
174164
%
175165
% Number of smoothing iterations for mesh deformation
176-
DEFORM_LINEAR_ITER= 200
166+
DEFORM_LINEAR_SOLVER_ITER= 200
177167
%
178168
% Number of nonlinear deformation iterations (surface deformation increments)
179169
DEFORM_NONLINEAR_ITER= 1

‎Inc_Heated_Cylinders/solid_cylinder2.cfg‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
2828
%
2929
% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
3030
OBJECTIVE_WEIGHT = 1.0
31-
%
32-
% Read binary restart files (YES, NO)
33-
READ_BINARY_RESTART = NO
34-
%
35-
% Write binary restart files (YES, NO)
36-
WRT_BINARY_RESTART = NO
3731

3832
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
3933
%
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
5953
SOLID_DENSITY= 0.000210322
6054
%
6155
% Solid specific heat (J/kg*K)
62-
SPECIFIC_HEAT_CP_SOLID = 1004.703
56+
SPECIFIC_HEAT_CP = 1004.703
6357
%
6458
% Solid thermal conductivity (W/m*K)
65-
THERMAL_CONDUCTIVITY_SOLID= 0.1028
59+
SOLID_THERMAL_CONDUCTIVITY= 0.1028
6660

6761
% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
6862
%
@@ -137,10 +131,6 @@ SOLUTION_FILENAME= solution_flow.dat
137131
% Restart adjoint input file
138132
SOLUTION_ADJ_FILENAME= solution_adj.dat
139133
%
140-
% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
141-
% FIELDVIEW, FIELDVIEW_BINARY)
142-
OUTPUT_FORMAT= TECPLOT
143-
%
144134
% Output file convergence history (w/o extension)
145135
CONV_FILENAME= history
146136
%
@@ -183,7 +173,7 @@ WRT_CON_FREQ= 1
183173
DEFORM_LINEAR_SOLVER= FGMRES
184174
%
185175
% Number of smoothing iterations for mesh deformation
186-
DEFORM_LINEAR_ITER= 200
176+
DEFORM_LINEAR_SOLVER_ITER= 200
187177
%
188178
% Number of nonlinear deformation iterations (surface deformation increments)
189179
DEFORM_NONLINEAR_ITER= 1

‎Inc_Heated_Cylinders/solid_cylinder3.cfg‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
2828
%
2929
% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
3030
OBJECTIVE_WEIGHT = 1.0
31-
%
32-
% Read binary restart files (YES, NO)
33-
READ_BINARY_RESTART = NO
34-
%
35-
% Write binary restart files (YES, NO)
36-
WRT_BINARY_RESTART = NO
3731

3832
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
3933
%
@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0
5953
SOLID_DENSITY= 0.000210322
6054
%
6155
% Solid specific heat (J/kg*K)
62-
SPECIFIC_HEAT_CP_SOLID = 1004.703
56+
SPECIFIC_HEAT_CP = 1004.703
6357
%
6458
% Solid thermal conductivity (W/m*K)
65-
THERMAL_CONDUCTIVITY_SOLID= 0.1028
59+
SOLID_THERMAL_CONDUCTIVITY= 0.1028
6660

6761
% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%
6862
%
@@ -137,10 +131,6 @@ SOLUTION_FILENAME= solution_flow.dat
137131
% Restart adjoint input file
138132
SOLUTION_ADJ_FILENAME= solution_adj.dat
139133
%
140-
% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,
141-
% FIELDVIEW, FIELDVIEW_BINARY)
142-
OUTPUT_FORMAT= TECPLOT
143-
%
144134
% Output file convergence history (w/o extension)
145135
CONV_FILENAME= history
146136
%
@@ -183,7 +173,7 @@ WRT_CON_FREQ= 1
183173
DEFORM_LINEAR_SOLVER= FGMRES
184174
%
185175
% Number of smoothing iterations for mesh deformation
186-
DEFORM_LINEAR_ITER= 200
176+
DEFORM_LINEAR_SOLVER_ITER= 200
187177
%
188178
% Number of nonlinear deformation iterations (surface deformation increments)
189179
DEFORM_NONLINEAR_ITER= 1

‎Inc_Heated_Cylinders/solution_flow_0.dat‎

-2.65 MB
Binary file not shown.

‎Inc_Heated_Cylinders/solution_flow_1.dat‎

-317 KB
Binary file not shown.

‎Inc_Heated_Cylinders/solution_flow_2.dat‎

-317 KB
Binary file not shown.

‎Inc_Heated_Cylinders/solution_flow_3.dat‎

-317 KB
Binary file not shown.

‎Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ DV_VALUE= 1.0
205205
% ------------------------ GRID DEFORMATION PARAMETERS ------------------------%
206206
%
207207
% Number of smoothing iterations for FEA mesh deformation
208-
DEFORM_LINEAR_ITER= 500
208+
DEFORM_LINEAR_SOLVER_ITER= 500
209209
%
210210
% Number of nonlinear deformation iterations (surface deformation increments)
211211
DEFORM_NONLINEAR_ITER= 1
@@ -301,12 +301,17 @@ WRT_HALO= NO
301301
SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
302302

303303
% --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------%
304+
%
304305
% Available flow based objective functions or constraint functions
305-
% DRAG, LIFT, SIDEFORCE, EFFICIENCY,
306+
% DRAG, LIFT, SIDEFORCE, EFFICIENCY, BUFFET,
306307
% FORCE_X, FORCE_Y, FORCE_Z,
307308
% MOMENT_X, MOMENT_Y, MOMENT_Z,
308309
% THRUST, TORQUE, FIGURE_OF_MERIT,
309310
% EQUIVALENT_AREA, NEARFIELD_PRESSURE,
311+
% TOTAL_HEATFLUX, MAXIMUM_HEATFLUX,
312+
% INVERSE_DESIGN_PRESSURE, INVERSE_DESIGN_HEATFLUX,
313+
% SURFACE_TOTAL_PRESSURE, SURFACE_MASSFLOW
314+
% SURFACE_STATIC_PRESSURE, SURFACE_MACH
310315
%
311316
% Available geometrical based objective functions or constraint functions
312317
% AIRFOIL_AREA, AIRFOIL_THICKNESS, AIRFOIL_CHORD, AIRFOIL_TOC, AIRFOIL_AOA,
@@ -315,18 +320,27 @@ SCREEN_OUTPUT= (INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG)
315320
% STATION#_TWIST (where # is the index of the station defined in GEO_LOCATION_STATIONS)
316321
%
317322
% Available design variables
318-
% HICKS_HENNE ( 1, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
319-
% SPHERICAL ( 3, Scale | Mark. List | ControlPoint_Index, Theta_Disp, R_Disp )
320-
% NACA_4DIGITS ( 4, Scale | Mark. List | 1st digit, 2nd digit, 3rd and 4th digit )
321-
% DISPLACEMENT ( 5, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
322-
% ROTATION ( 6, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
323-
% FFD_CONTROL_POINT ( 7, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
324-
% FFD_TWIST ( 9, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
325-
% FFD_ROTATION ( 10, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
326-
% FFD_CAMBER ( 11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
327-
% FFD_THICKNESS ( 12, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
328-
% FFD_VOLUME ( 13, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
329-
% FOURIER ( 14, Scale | Mark. List | Lower(0)/Upper(1) side, index, cos(0)/sin(1) )
323+
% 2D Design variables
324+
% FFD_CONTROL_POINT_2D ( 19, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, x_Mov, y_Mov )
325+
% FFD_CAMBER_2D ( 20, Scale | Mark. List | FFD_BoxTag, i_Ind )
326+
% FFD_THICKNESS_2D ( 21, Scale | Mark. List | FFD_BoxTag, i_Ind )
327+
% FFD_TWIST_2D ( 22, Scale | Mark. List | FFD_BoxTag, x_Orig, y_Orig )
328+
% HICKS_HENNE ( 30, Scale | Mark. List | Lower(0)/Upper(1) side, x_Loc )
329+
% ANGLE_OF_ATTACK ( 101, Scale | Mark. List | 1.0 )
330+
%
331+
% 3D Design variables
332+
% FFD_CONTROL_POINT ( 11, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind, k_Ind, x_Mov, y_Mov, z_Mov )
333+
% FFD_NACELLE ( 12, Scale | Mark. List | FFD_BoxTag, rho_Ind, theta_Ind, phi_Ind, rho_Mov, phi_Mov )
334+
% FFD_GULL ( 13, Scale | Mark. List | FFD_BoxTag, j_Ind )
335+
% FFD_CAMBER ( 14, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
336+
% FFD_TWIST ( 15, Scale | Mark. List | FFD_BoxTag, j_Ind, x_Orig, y_Orig, z_Orig, x_End, y_End, z_End )
337+
% FFD_THICKNESS ( 16, Scale | Mark. List | FFD_BoxTag, i_Ind, j_Ind )
338+
% FFD_ROTATION ( 18, Scale | Mark. List | FFD_BoxTag, x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
339+
% FFD_ANGLE_OF_ATTACK ( 24, Scale | Mark. List | FFD_BoxTag, 1.0 )
340+
%
341+
% Global design variables
342+
% TRANSLATION ( 1, Scale | Mark. List | x_Disp, y_Disp, z_Disp )
343+
% ROTATION ( 2, Scale | Mark. List | x_Axis, y_Axis, z_Axis, x_Turn, y_Turn, z_Turn )
330344
%
331345
% Optimization objective function with scaling factor, separated by semicolons.
332346
% To include quadratic penalty function: use OPT_CONSTRAINT option syntax within the OPT_OBJECTIVE list.
@@ -359,4 +373,4 @@ OPT_BOUND_UPPER= 0.1
359373
OPT_BOUND_LOWER= -0.1
360374
%
361375
% Optimization design variables, separated by semicolons
362-
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 )
376+
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 )

0 commit comments

Comments
 (0)