Update for Inc_Heated_Cylinders config files.

oleburghardt · oleburghardt · commit 88325defc612 · 2019-11-04T11:16:02.000+01:00
diff --git a/Inc_Heated_Cylinders/cht_2d_3cylinders.cfg b/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 )
diff --git a/Inc_Heated_Cylinders/flow_cylinder.cfg b/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
 %
diff --git a/Inc_Heated_Cylinders/solid_cylinder1.cfg b/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
 %
diff --git a/Inc_Heated_Cylinders/solid_cylinder2.cfg b/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
 %
diff --git a/Inc_Heated_Cylinders/solid_cylinder3.cfg b/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
 %

Original file line number	Diff line number	Diff line change
`@@ -15,21 +15,18 @@`
`15`	`15`	`% POISSON_EQUATION)`
`16`	`16`	`SOLVER= MULTIPHYSICS`
`17`	`17`	`%`
`18`		`-% Regime type (COMPRESSIBLE, INCOMPRESSIBLE, FREESURFACE)`
	`18`	`+% Mathematical problem (DIRECT, CONTINUOUS_ADJOINT, DISCRETE_ADJOINT)`
`19`	`19`	`MATH_PROBLEM= DIRECT`
`20`	`20`	`%`
`21`	`21`	`%`
`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)`
`23`	`23`	`%`
`24`	`24`	`%`
`25`	`25`	`MARKER_ZONE_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)`
`26`	`26`	`%`
`27`	`27`	`%`
`28`	`28`	`MARKER_CHT_INTERFACE= (cylinder_outer1, cylinder_inner1, cylinder_outer2, cylinder_inner2, cylinder_outer3, cylinder_inner3)`
`29`	`29`	`%`
`30`		`-%`
`31`		`-TIME_DOMAIN = NO`
`32`		`-%`
`33`	`30`	`% Number of total iterations`
`34`	`31`	`OUTER_ITER = 10000`
`35`	`32`	`%`
`@@ -38,6 +35,10 @@ MESH_FILENAME= mesh_cht_3cyl.su2`
`38`	`35`	`%`
`39`	`36`	`% Mesh input file format (SU2, CGNS, NETCDF_ASCII)`
`40`	`37`	`MESH_FORMAT= SU2`
	`38`	`+%`
	`39`	`+% Output file format`
	`40`	`+OUTPUT_FILES= (RESTART, TECPLOT, PARAVIEW, SURFACE_TECPLOT, SURFACE_PARAVIEW)`
	`41`	`+`
`41`	`42`
`42`	`43`	`% These are just default parameters so that we can run SU2_DOT_AD, they have no physical meaning for this test case.`
`43`	`44`
`@@ -51,7 +52,7 @@ MESH_FORMAT= SU2`
`51`	`52`	`DV_KIND= HICKS_HENNE`
`52`	`53`	`%`
`53`	`54`	`% 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)`
`55`	`56`	`%`
`56`	`57`	`% Parameters of the shape deformation`
`57`	`58`	`% - NO_DEFORMATION ( 1.0 )`
Original file line number	Diff line number	Diff line change
`@@ -30,16 +30,10 @@ RESTART_SOL= NO`
`30`	`30`	`OBJECTIVE_FUNCTION= TOTAL_HEATFLUX`
`31`	`31`	`%`
`32`	`32`	`% 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`
`40`	`34`	`%`
`41`	`35`	`% Data written to history file`
`42`		`-HISTORY_OUTPUT=(ITER, RMS_RES, HEAT )`
	`36`	`+HISTORY_OUTPUT= (ITER, RMS_RES, HEAT)`
`43`	`37`
`44`	`38`	`% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%`
`45`	`39`	`%`
`@@ -199,10 +193,6 @@ SOLUTION_FILENAME= solution_flow.dat`
`199`	`193`	`% Restart adjoint input file`
`200`	`194`	`SOLUTION_ADJ_FILENAME= solution_adj.dat`
`201`	`195`	`%`
`202`		`-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,`
`203`		`-% FIELDVIEW, FIELDVIEW_BINARY)`
`204`		`-OUTPUT_FORMAT= TECPLOT`
`205`		`-%`
`206`	`196`	`% Output file convergence history (w/o extension)`
`207`	`197`	`CONV_FILENAME= history`
`208`	`198`	`%`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +28,6 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX`
`28`	`28`	`%`
`29`	`29`	`% List of weighting values when using more than one OBJECTIVE_FUNCTION. Separate by commas and match with MARKER_MONITORING.`
`30`	`30`	`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`
`37`	`31`
`38`	`32`	`% -------------------- BOUNDARY CONDITION DEFINITION --------------------------%`
`39`	`33`	`%`
`@@ -59,10 +53,10 @@ SOLID_TEMPERATURE_INIT= 350.0`
`59`	`53`	`SOLID_DENSITY= 0.000210322`
`60`	`54`	`%`
`61`	`55`	`% Solid specific heat (J/kg*K)`
`62`		`-SPECIFIC_HEAT_CP_SOLID = 1004.703`
	`56`	`+SPECIFIC_HEAT_CP = 1004.703`
`63`	`57`	`%`
`64`	`58`	`% Solid thermal conductivity (W/m*K)`
`65`		`-THERMAL_CONDUCTIVITY_SOLID= 0.1028`
	`59`	`+SOLID_THERMAL_CONDUCTIVITY= 0.1028`
`66`	`60`
`67`	`61`	`% ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------%`
`68`	`62`	`%`
`@@ -127,10 +121,6 @@ SOLUTION_FILENAME= solution_flow.dat`
`127`	`121`	`% Restart adjoint input file`
`128`	`122`	`SOLUTION_ADJ_FILENAME= solution_adj.dat`
`129`	`123`	`%`
`130`		`-% Output file format (TECPLOT, TECPLOT_BINARY, PARAVIEW,`
`131`		`-% FIELDVIEW, FIELDVIEW_BINARY)`
`132`		`-OUTPUT_FORMAT= TECPLOT`
`133`		`-%`
`134`	`124`	`% Output file convergence history (w/o extension)`
`135`	`125`	`CONV_FILENAME= history`
`136`	`126`	`%`