Merge pull request #17 from su2code/develop

Develop
su2code · Aug 16, 2021 · 9d9da6c · 9d9da6c
2 parents 21de2c9 + 93c742f
commit 9d9da6c
Show file tree

Hide file tree

Showing 39 changed files with 98,560 additions and 237 deletions.
diff --git a/compressible_flow/ActuatorDisk_VariableLoad/propeller_variable_load.cfg b/compressible_flow/ActuatorDisk_VariableLoad/propeller_variable_load.cfg
@@ -184,9 +184,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 % Maximum number of iterations
 ITER= 1500
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -8
 %

diff --git a/compressible_flow/NICFD_nozzle/NICFD_nozzle.cfg b/compressible_flow/NICFD_nozzle/NICFD_nozzle.cfg
@@ -104,7 +104,7 @@ MU_CONSTANT= 1.21409E-05
 CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY
 %
 % Molecular Thermal Conductivity that would be constant (0.0257 by default)
-KT_CONSTANT= 0.030542828
+THERMAL_CONDUCTIVITY_CONSTANT= 0.030542828
 
 % -------------------- BOUNDARY CONDITION DEFINITION --------------------------%
 %
@@ -204,11 +204,6 @@ CFL_REDUCTION_TURB= 1.0
 % Number of total iterations
 ITER= 1000
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -24
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq.cfg
@@ -177,11 +177,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_1c.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_1c.cfg
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_2c.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_2c.cfg
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_3c.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_3c.cfg
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c1.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c1.cfg
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c2.cfg b/compressible_flow/UQ_NACA0012/turb_NACA0012_uq_p1c2.cfg
@@ -194,11 +194,6 @@ CFL_REDUCTION_TURB= 1.0
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= CAUCHY
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -9
 %

diff --git a/compressible_flow/Unsteady_NACA0012/unsteady_naca0012.cfg b/compressible_flow/Unsteady_NACA0012/unsteady_naca0012.cfg
@@ -145,8 +145,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA = RESIDUAL
 % Field to apply Cauchy Criterion to
 CONV_FIELD= REL_RMS_DENSITY
 % Min value of the residual (log10 of the residual)

diff --git a/design/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg b/design/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg
@@ -221,10 +221,6 @@ DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 DEFORM_STIFFNESS_TYPE= INVERSE_VOLUME
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
 %
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -13

diff --git a/design/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg b/design/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg
@@ -173,9 +173,6 @@ GEO_MODE= FUNCTION
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------&
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
 %

diff --git a/design/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg b/design/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg
@@ -217,11 +217,6 @@ MARKER_ANALYZE_AVERAGE = AREA
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-%
-CONV_CRITERIA= RESIDUAL
-%
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -11
 %

diff --git a/design/Turbulent_2D_Constrained_RAE2822/turb_SA_RAE2822.cfg b/design/Turbulent_2D_Constrained_RAE2822/turb_SA_RAE2822.cfg
@@ -219,9 +219,6 @@ GEO_MODE= FUNCTION
 
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA= RESIDUAL
-%
 % Min value of the residual (log10 of the residual)
 CONV_RESIDUAL_MINVAL= -12
 %

diff --git a/design/Unsteady_Shape_Opt_NACA0012/unsteady_naca0012_opt.cfg b/design/Unsteady_Shape_Opt_NACA0012/unsteady_naca0012_opt.cfg
@@ -158,8 +158,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-% Convergence criteria (CAUCHY, RESIDUAL)
-CONV_CRITERIA = RESIDUAL
 % Field to apply Cauchy Criterion to
 CONV_FIELD= REL_RMS_DENSITY
 % Min value of the residual (log10 of the residual)

diff --git a/incompressible_flow/Inc_Laminar_Cavity/lam_buoyancy_cavity.cfg b/incompressible_flow/Inc_Laminar_Cavity/lam_buoyancy_cavity.cfg
@@ -77,7 +77,7 @@ MU_CONSTANT= 1.716e-5
 CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY
 %
 % Molecular Thermal Conductivity that would be constant (0.0257 by default)
-KT_CONSTANT= 0.0246295028571
+THERMAL_CONDUCTIVITY_CONSTANT= 0.0246295028571
 
 % ----------------------- BODY FORCE DEFINITION -------------------------------%
 %

diff --git a/incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_dp_hf_tp.cfg b/incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_dp_hf_tp.cfg
@@ -102,7 +102,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-CONV_CRITERIA= RESIDUAL
 CONV_FIELD= RMS_TEMPERATURE
 CONV_RESIDUAL_MINVAL= -4.07
 CONV_STARTITER= 10

diff --git a/incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_mf_hf.cfg b/incompressible_flow/Inc_Streamwise_Periodic/sp_pinArray_2d_mf_hf.cfg
@@ -107,7 +107,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT
 %
 % --------------------------- CONVERGENCE PARAMETERS --------------------------%
 %
-CONV_CRITERIA= RESIDUAL
 CONV_FIELD= RMS_TEMPERATURE
 CONV_RESIDUAL_MINVAL= -10.9
 CONV_STARTITER= 10

diff --git a/multiphysics/steady_cht/cht_2d_3cylinders.cfg b/multiphysics/steady_cht/cht_2d_3cylinders.cfg
@@ -5,10 +5,9 @@
 % Author: O. Burghardt, T. Economon                                             %
 % Institution: Chair for Scientific Computing, TU Kaiserslautern                %
 % Date: August 8, 2019                                                          %
-% File Version 6.0.1 "Falcon"                                                   %
+% File Version 7.1.1 "Blackbird"                                                %
 %                                                                               %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
 %
 % Physical governing equations (EULER, NAVIER_STOKES,
 %                               WAVE_EQUATION, HEAT_EQUATION, FEM_ELASTICITY,
@@ -18,67 +17,34 @@ SOLVER= MULTIPHYSICS
 % Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)
 MATH_PROBLEM= DIRECT
 %
-% Restart solution (NO, YES)
-RESTART_SOL= NO
 %
-% Configuration file list, one for each physical zone 
-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)
+%
 %
-% Definition of the interface
 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)
 %
-% Objective function in gradient evaluation   (DRAG, LIFT, SIDEFORCE, MOMENT_X,
-%                                             MOMENT_Y, MOMENT_Z, EFFICIENCY,
-%                                             EQUIVALENT_AREA, NEARFIELD_PRESSURE,
-%                                             FORCE_X, FORCE_Y, FORCE_Z, THRUST,
-%                                             TORQUE, TOTAL_HEATFLUX,
-%                                             MAXIMUM_HEATFLUX, INVERSE_DESIGN_PRESSURE,
-%                                             INVERSE_DESIGN_HEATFLUX, SURFACE_TOTAL_PRESSURE,
-%                                             SURFACE_MASSFLOW, SURFACE_STATIC_PRESSURE, SURFACE_MACH)
-% For a weighted sum of objectives: separate by commas, add OBJECTIVE_WEIGHT and MARKER_MONITORING in matching order.
-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
+CHT_COUPLING_METHOD= DIRECT_TEMPERATURE_ROBIN_HEATFLUX
+%
+%
+TIME_DOMAIN = NO
 %
-% Number of total iterations
-OUTER_ITER = 15000
-OUTPUT_WRT_FREQ = 15000
+% Number of total iterations (15000 for suitable results)
+OUTER_ITER = 11
 %
 % Mesh input file
 MESH_FILENAME= mesh_cht_3cyl_ffd.su2
-MESH_OUT_FILENAME= mesh_cht_3cyl_out.su2
 %
 % Mesh input file format (SU2, CGNS, NETCDF_ASCII)
 MESH_FORMAT= SU2
 %
 % Output file format
-OUTPUT_FILES= (RESTART, TECPLOT, PARAVIEW, SURFACE_TECPLOT, SURFACE_PARAVIEW)
-%
-% Multizone convergence criteria
-CONV_RESIDUAL_MINVAL= -20
-
-% -------------------- FREE-FORM DEFORMATION PARAMETERS -----------------------%
-%
-% Tolerance of the Free-Form Deformation point inversion
-FFD_TOLERANCE= 1E-12
-%
-% Maximum number of iterations in the Free-Form Deformation point inversion
-FFD_ITERATIONS= 500
-%
-% FFD box definition: 3D case (FFD_BoxTag, X1, Y1, Z1, X2, Y2, Z2, X3, Y3, Z3, X4, Y4, Z4,
-%                              X5, Y5, Z5, X6, Y6, Z6, X7, Y7, Z7, X8, Y8, Z8)
-%                     2D case (FFD_BoxTag, X1, Y1, 0.0, X2, Y2, 0.0, X3, Y3, 0.0, X4, Y4, 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)
-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)
-%
-% FFD box degree: 3D case (x_degree, y_degree, z_degree)
-%                 2D case (x_degree, y_degree, 0)
-FFD_DEGREE= ( 24, 1, 0)
+OUTPUT_FILES= (RESTART, PARAVIEW_MULTIBLOCK)
 %
-% Surface continuity at the intersection with the FFD (1ST_DERIVATIVE, 2ND_DERIVATIVE)
-FFD_CONTINUITY= 2ND_DERIVATIVE
+% These are just default parameters so that we can run SU2_DOT_AD, they have no physical meaning for this test case.
 
 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------%
 %
@@ -87,10 +53,10 @@ FFD_CONTINUITY= 2ND_DERIVATIVE
 %                      FFD_CONTROL_POINT, FFD_CAMBER, FFD_THICKNESS, FFD_TWIST
 %                      FFD_CONTROL_POINT_2D, FFD_CAMBER_2D, FFD_THICKNESS_2D, FFD_TWIST_2D,
 %                      HICKS_HENNE, SURFACE_BUMP)
-DV_KIND= FFD_CONTROL_POINT_2D
+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 )
@@ -112,7 +78,7 @@ DV_MARKER= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2,
 % - FFD_TWIST_2D ( FFD_BoxTag, x_Orig, y_Orig )
 % - HICKS_HENNE ( Lower Surface (0)/Upper Surface (1)/Only one Surface (2), x_Loc )
 % - SURFACE_BUMP ( x_Start, x_End, x_Loc )
-DV_PARAM= ( MAIN_BOX, 12, 1, 0.0, 1.0 )
+DV_PARAM= (0.0, 0.5)
 %
 % Value of the shape deformation
 DV_VALUE= 0.1