Merge pull request #21 from su2code/cleanup_linsol_options

talbring · web-flow · commit d7868cf96f0e · 2019-10-28T09:43:48.000+01:00
Replace DEFORM_LINEAR_ITER by DEFORM_LINEAR_SOLVER_ITER
diff --git a/Inc_Heated_Cylinders/flow_cylinder.cfg b/Inc_Heated_Cylinders/flow_cylinder.cfg
@@ -245,7 +245,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
diff --git a/Inc_Heated_Cylinders/solid_cylinder1.cfg b/Inc_Heated_Cylinders/solid_cylinder1.cfg
@@ -173,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
diff --git a/Inc_Heated_Cylinders/solid_cylinder2.cfg b/Inc_Heated_Cylinders/solid_cylinder2.cfg
@@ -183,7 +183,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
diff --git a/Inc_Heated_Cylinders/solid_cylinder3.cfg b/Inc_Heated_Cylinders/solid_cylinder3.cfg
@@ -183,7 +183,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
diff --git a/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg b/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
diff --git a/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg b/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg
@@ -304,7 +304,7 @@ DV_VALUE= 0.0
 DEFORM_LINEAR_SOLVER= FGMRES
 %
 % Number of smoothing iterations for mesh deformation
-DEFORM_LINEAR_ITER= 500
+DEFORM_LINEAR_SOLVER_ITER= 500
 %
 % Minimum residual criteria for the linear solver convergence of grid deformation
 DEFORM_LINEAR_SOLVER_ERROR= 1E-14
diff --git a/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg b/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

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ WRT_CON_FREQ= 1`
`245`	`245`	`DEFORM_LINEAR_SOLVER= FGMRES`
`246`	`246`	`%`
`247`	`247`	`% Number of smoothing iterations for mesh deformation`
`248`		`-DEFORM_LINEAR_ITER= 200`
	`248`	`+DEFORM_LINEAR_SOLVER_ITER= 200`
`249`	`249`	`%`
`250`	`250`	`% Number of nonlinear deformation iterations (surface deformation increments)`
`251`	`251`	`DEFORM_NONLINEAR_ITER= 1`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ WRT_CON_FREQ= 1`
`173`	`173`	`DEFORM_LINEAR_SOLVER= FGMRES`
`174`	`174`	`%`
`175`	`175`	`% Number of smoothing iterations for mesh deformation`
`176`		`-DEFORM_LINEAR_ITER= 200`
	`176`	`+DEFORM_LINEAR_SOLVER_ITER= 200`
`177`	`177`	`%`
`178`	`178`	`% Number of nonlinear deformation iterations (surface deformation increments)`
`179`	`179`	`DEFORM_NONLINEAR_ITER= 1`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ WRT_CON_FREQ= 1`
`183`	`183`	`DEFORM_LINEAR_SOLVER= FGMRES`
`184`	`184`	`%`
`185`	`185`	`% Number of smoothing iterations for mesh deformation`
`186`		`-DEFORM_LINEAR_ITER= 200`
	`186`	`+DEFORM_LINEAR_SOLVER_ITER= 200`
`187`	`187`	`%`
`188`	`188`	`% Number of nonlinear deformation iterations (surface deformation increments)`
`189`	`189`	`DEFORM_NONLINEAR_ITER= 1`
Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,7 @@ DV_VALUE= 1.0`
`205`	`205`	`% ------------------------ GRID DEFORMATION PARAMETERS ------------------------%`
`206`	`206`	`%`
`207`	`207`	`% Number of smoothing iterations for FEA mesh deformation`
`208`		`-DEFORM_LINEAR_ITER= 500`
	`208`	`+DEFORM_LINEAR_SOLVER_ITER= 500`
`209`	`209`	`%`
`210`	`210`	`% Number of nonlinear deformation iterations (surface deformation increments)`
`211`	`211`	`DEFORM_NONLINEAR_ITER= 1`
Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,7 @@ DV_VALUE= 0.0`
`304`	`304`	`DEFORM_LINEAR_SOLVER= FGMRES`
`305`	`305`	`%`
`306`	`306`	`% Number of smoothing iterations for mesh deformation`
`307`		`-DEFORM_LINEAR_ITER= 500`
	`307`	`+DEFORM_LINEAR_SOLVER_ITER= 500`
`308`	`308`	`%`
`309`	`309`	`% Minimum residual criteria for the linear solver convergence of grid deformation`
`310`	`310`	`DEFORM_LINEAR_SOLVER_ERROR= 1E-14`
Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ DV_PARAM= (MAIN_BOX, 3,0, 0,1.0,0,0 )`
`329`	`329`	`% Value of the shape deformation deformation`
`330`	`330`	`DV_VALUE= 0.5`
`331`	`331`	`% Number of smoothing iterations for FEA mesh deformation`
`332`		`-DEFORM_LINEAR_ITER= 500`
	`332`	`+DEFORM_LINEAR_SOLVER_ITER= 500`
`333`	`333`	`%`
`334`	`334`	`% Number of nonlinear deformation iterations (surface deformation increments)`
`335`	`335`	`DEFORM_NONLINEAR_ITER= 1`