Skip to content

Commit 9d9da6c

Browse files
pcarruscagpcarruscag
authored
Merge pull request #17 from su2code/develop
Develop
2 parents 21de2c9 + 93c742f commit 9d9da6c

File tree

39 files changed

+98560
-237
lines changed

39 files changed

+98560
-237
lines changed

‎compressible_flow/ActuatorDisk_VariableLoad/propeller_variable_load.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
184184
% Maximum number of iterations
185185
ITER= 1500
186186
%
187-
% Convergence criteria (CAUCHY, RESIDUAL)
188-
CONV_CRITERIA= RESIDUAL
189-
%
190187
% Min value of the residual (log10 of the residual)
191188
CONV_RESIDUAL_MINVAL= -8
192189
%

‎compressible_flow/NICFD_nozzle/NICFD_nozzle.cfg

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ MU_CONSTANT= 1.21409E-05
104104
CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY
105105
%
106106
% Molecular Thermal Conductivity that would be constant (0.0257 by default)
107-
KT_CONSTANT= 0.030542828
107+
THERMAL_CONDUCTIVITY_CONSTANT= 0.030542828
108108

109109
% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
110110
%
@@ -204,11 +204,6 @@ CFL_REDUCTION_TURB= 1.0
204204
% Number of total iterations
205205
ITER= 1000
206206
%
207-
% Convergence criteria (CAUCHY, RESIDUAL)
208-
%
209-
CONV_CRITERIA= RESIDUAL
210-
%
211-
%
212207
% Min value of the residual (log10 of the residual)
213208
CONV_RESIDUAL_MINVAL= -24
214209
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -177,11 +177,6 @@ CFL_REDUCTION_TURB= 1.0
177177

178178
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
179179
%
180-
% Convergence criteria (CAUCHY, RESIDUAL)
181-
%
182-
CONV_CRITERIA= CAUCHY
183-
%
184-
%
185180
% Min value of the residual (log10 of the residual)
186181
CONV_RESIDUAL_MINVAL= -9
187182
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq_1c.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
194194

195195
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
196196
%
197-
% Convergence criteria (CAUCHY, RESIDUAL)
198-
%
199-
CONV_CRITERIA= CAUCHY
200-
%
201-
%
202197
% Min value of the residual (log10 of the residual)
203198
CONV_RESIDUAL_MINVAL= -9
204199
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq_2c.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
194194

195195
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
196196
%
197-
% Convergence criteria (CAUCHY, RESIDUAL)
198-
%
199-
CONV_CRITERIA= CAUCHY
200-
%
201-
%
202197
% Min value of the residual (log10 of the residual)
203198
CONV_RESIDUAL_MINVAL= -9
204199
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq_3c.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
194194

195195
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
196196
%
197-
% Convergence criteria (CAUCHY, RESIDUAL)
198-
%
199-
CONV_CRITERIA= CAUCHY
200-
%
201-
%
202197
% Min value of the residual (log10 of the residual)
203198
CONV_RESIDUAL_MINVAL= -9
204199
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c1.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
194194

195195
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
196196
%
197-
% Convergence criteria (CAUCHY, RESIDUAL)
198-
%
199-
CONV_CRITERIA= CAUCHY
200-
%
201-
%
202197
% Min value of the residual (log10 of the residual)
203198
CONV_RESIDUAL_MINVAL= -9
204199
%

‎compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c2.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
194194

195195
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
196196
%
197-
% Convergence criteria (CAUCHY, RESIDUAL)
198-
%
199-
CONV_CRITERIA= CAUCHY
200-
%
201-
%
202197
% Min value of the residual (log10 of the residual)
203198
CONV_RESIDUAL_MINVAL= -9
204199
%

‎compressible_flow/Unsteady_NACA0012/unsteady_naca0012.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
145145
%
146146
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
147147
%
148-
% Convergence criteria (CAUCHY, RESIDUAL)
149-
CONV_CRITERIA = RESIDUAL
150148
% Field to apply Cauchy Criterion to
151149
CONV_FIELD= REL_RMS_DENSITY
152150
% Min value of the residual (log10 of the residual)

‎design/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
221221
DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
222222

223223
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
224-
% Convergence criteria (CAUCHY, RESIDUAL)
225-
%
226-
CONV_CRITERIA= RESIDUAL
227-
%
228224
%
229225
% Min value of the residual (log10 of the residual)
230226
CONV_RESIDUAL_MINVAL= -13

‎design/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,6 @@ GEO_MODE= FUNCTION
173173

174174
% --------------------------- CONVERGENCE PARAMETERS --------------------------&
175175
%
176-
% Convergence criteria (CAUCHY, RESIDUAL)
177-
CONV_CRITERIA= RESIDUAL
178-
%
179176
% Min value of the residual (log10 of the residual)
180177
CONV_RESIDUAL_MINVAL= -12
181178
%

‎design/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,6 @@ MARKER_ANALYZE_AVERAGE = AREA
217217

218218
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
219219
%
220-
% Convergence criteria (CAUCHY, RESIDUAL)
221-
%
222-
CONV_CRITERIA= RESIDUAL
223-
%
224-
%
225220
% Min value of the residual (log10 of the residual)
226221
CONV_RESIDUAL_MINVAL= -11
227222
%

‎design/Turbulent_2D_Constrained_RAE2822/turb_SA_RAE2822.cfg

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,9 +219,6 @@ GEO_MODE= FUNCTION
219219
220220
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
221221
%
222-
% Convergence criteria (CAUCHY, RESIDUAL)
223-
CONV_CRITERIA= RESIDUAL
224-
%
225222
% Min value of the residual (log10 of the residual)
226223
CONV_RESIDUAL_MINVAL= -12
227224
%

‎design/Unsteady_Shape_Opt_NACA0012/unsteady_naca0012_opt.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
158158
%
159159
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
160160
%
161-
% Convergence criteria (CAUCHY, RESIDUAL)
162-
CONV_CRITERIA = RESIDUAL
163161
% Field to apply Cauchy Criterion to
164162
CONV_FIELD= REL_RMS_DENSITY
165163
% Min value of the residual (log10 of the residual)

‎incompressible_flow/Inc_Laminar_Cavity/lam_buoyancy_cavity.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ MU_CONSTANT= 1.716e-5
7777
CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY
7878
%
7979
% Molecular Thermal Conductivity that would be constant (0.0257 by default)
80-
KT_CONSTANT= 0.0246295028571
80+
THERMAL_CONDUCTIVITY_CONSTANT= 0.0246295028571
8181

8282
% ----------------------- BODY FORCE DEFINITION -------------------------------%
8383
%

‎incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_dp_hf_tp.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
102102
%
103103
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
104104
%
105-
CONV_CRITERIA= RESIDUAL
106105
CONV_FIELD= RMS_TEMPERATURE
107106
CONV_RESIDUAL_MINVAL= -4.07
108107
CONV_STARTITER= 10

‎incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_mf_hf.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
107107
%
108108
% --------------------------- CONVERGENCE PARAMETERS --------------------------%
109109
%
110-
CONV_CRITERIA= RESIDUAL
111110
CONV_FIELD= RMS_TEMPERATURE
112111
CONV_RESIDUAL_MINVAL= -10.9
113112
CONV_STARTITER= 10

‎multiphysics/steady_cht/cht_2d_3cylinders.cfg

Lines changed: 16 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
% Author: O. Burghardt, T. Economon %
66
% Institution: Chair for Scientific Computing, TU Kaiserslautern %
77
% Date: August 8, 2019 %
8-
% File Version 6.0.1 "Falcon" %
8+
% File Version 7.1.1 "Blackbird" %
99
% %
1010
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
11-
1211
%
1312
% Physical governing equations (EULER, NAVIER_STOKES,
1413
% WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
@@ -18,67 +17,34 @@ SOLVER= MULTIPHYSICS
1817
% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
1918
MATH_PROBLEM= DIRECT
2019
%
21-
% Restart solution (NO, YES)
22-
RESTART_SOL= NO
2320
%
24-
% Configuration file list, one for each physical zone
25-
CONFIG_LIST= (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
21+
CONFIG_LIST = (flow_cylinder.cfg, solid_cylinder1.cfg, solid_cylinder2.cfg, solid_cylinder3.cfg)
22+
%
2623
%
27-
% Definition of the interface
2824
MARKER_ZONE_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
25+
%
26+
%
2927
MARKER_CHT_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
3028
%
31-
% Objective function in gradient evaluation (DRAG, LIFT, SIDEFORCE, MOMENT_X,
32-
% MOMENT_Y, MOMENT_Z, EFFICIENCY,
33-
% EQUIVALENT_AREA, NEARFIELD_PRESSURE,
34-
% FORCE_X, FORCE_Y, FORCE_Z, THRUST,
35-
% TORQUE, TOTAL_HEATFLUX,
36-
% MAXIMUM_HEATFLUX, INVERSE_DESIGN_PRESSURE,
37-
% INVERSE_DESIGN_HEATFLUX, SURFACE_TOTAL_PRESSURE,
38-
% SURFACE_MASSFLOW, SURFACE_STATIC_PRESSURE, SURFACE_MACH)
39-
% For a weighted sum of objectives: separate by commas, add OBJECTIVE_WEIGHT and MARKER_MONITORING in matching order.
40-
OBJECTIVE_FUNCTION= TOTAL_HEATFLUX
4129
%
42-
% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.
43-
OBJECTIVE_WEIGHT= 1.0
30+
CHT_COUPLING_METHOD= DIRECT_TEMPERATURE_ROBIN_HEATFLUX
31+
%
32+
%
33+
TIME_DOMAIN = NO
4434
%
45-
% Number of total iterations
46-
OUTER_ITER = 15000
47-
OUTPUT_WRT_FREQ = 15000
35+
% Number of total iterations (15000 for suitable results)
36+
OUTER_ITER = 11
4837
%
4938
% Mesh input file
5039
MESH_FILENAME= mesh_cht_3cyl_ffd.su2
51-
MESH_OUT_FILENAME= mesh_cht_3cyl_out.su2
5240
%
5341
% Mesh input file format (SU2, CGNS, NETCDF_ASCII)
5442
MESH_FORMAT= SU2
5543
%
5644
% Output file format
57-
OUTPUT_FILES= (RESTART, TECPLOT, PARAVIEW, SURFACE_TECPLOT, SURFACE_PARAVIEW)
58-
%
59-
% Multizone convergence criteria
60-
CONV_RESIDUAL_MINVAL= -20
61-
62-
% -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
63-
%
64-
% Tolerance of the Free-Form Deformation point inversion
65-
FFD_TOLERANCE= 1E-12
66-
%
67-
% Maximum number of iterations in the Free-Form Deformation point inversion
68-
FFD_ITERATIONS= 500
69-
%
70-
% FFD box definition: 3D case (FFD_BoxTag, X1, Y1, Z1, X2, Y2, Z2, X3, Y3, Z3, X4, Y4, Z4,
71-
% X5, Y5, Z5, X6, Y6, Z6, X7, Y7, Z7, X8, Y8, Z8)
72-
% 2D case (FFD_BoxTag, X1, Y1, 0.0, X2, Y2, 0.0, X3, Y3, 0.0, X4, Y4, 0.0,
73-
% 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
74-
FFD_DEFINITION= (MAIN_BOX, -0.1, -0.6, 0.0, 1.1, -0.6, 0.0, 1.1, 0.6, 0.0, -0.1, 0.6, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)
75-
%
76-
% FFD box degree: 3D case (x_degree, y_degree, z_degree)
77-
% 2D case (x_degree, y_degree, 0)
78-
FFD_DEGREE= ( 24, 1, 0)
45+
OUTPUT_FILES= (RESTART, PARAVIEW_MULTIBLOCK)
7946
%
80-
% Surface continuity at the intersection with the FFD (1ST_DERIVATIVE, 2ND_DERIVATIVE)
81-
FFD_CONTINUITY= 2ND_DERIVATIVE
47+
% These are just default parameters so that we can run SU2_DOT_AD, they have no physical meaning for this test case.
8248

8349
% ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
8450
%
@@ -87,10 +53,10 @@ FFD_CONTINUITY= 2ND_DERIVATIVE
8753
% FFD_CONTROL_POINT, FFD_CAMBER, FFD_THICKNESS, FFD_TWIST
8854
% FFD_CONTROL_POINT_2D, FFD_CAMBER_2D, FFD_THICKNESS_2D, FFD_TWIST_2D,
8955
% HICKS_HENNE, SURFACE_BUMP)
90-
DV_KIND= FFD_CONTROL_POINT_2D
56+
DV_KIND= HICKS_HENNE
9157
%
9258
% Marker of the surface in which we are going apply the shape deformation
93-
DV_MARKER= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)
59+
DV_MARKER= ( cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3 )
9460
%
9561
% Parameters of the shape deformation
9662
% - NO_DEFORMATION ( 1.0 )
@@ -112,7 +78,7 @@ DV_MARKER= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2,
11278
% - FFD_TWIST_2D ( FFD_BoxTag, x_Orig, y_Orig )
11379
% - HICKS_HENNE ( Lower Surface (0)/Upper Surface (1)/Only one Surface (2), x_Loc )
11480
% - SURFACE_BUMP ( x_Start, x_End, x_Loc )
115-
DV_PARAM= ( MAIN_BOX, 12, 1, 0.0, 1.0 )
81+
DV_PARAM= (0.0, 0.5)
11682
%
11783
% Value of the shape deformation
11884
DV_VALUE= 0.1

0 commit comments

Comments
 (0)