Removing options for DEFORM_TOL_FACTOR.

economon · economon · commit e173066e1755 · 2018-12-01T16:24:31.000-08:00
diff --git a/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg b/Inviscid_2D_Unconstrained_NACA0012/inv_NACA0012_basic.cfg
@@ -213,8 +213,8 @@ DEFORM_NONLINEAR_ITER= 1
 % Print the residuals during mesh deformation to the console (YES, NO)
 DEFORM_CONSOLE_OUTPUT= YES
 %
-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)
-DEFORM_TOL_FACTOR = 0.001
+% Minimum residual criteria for the linear solver convergence of grid deformation
+DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 %
 % Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME, 
 %                                          WALL_DISTANCE, CONSTANT_STIFFNESS)
diff --git a/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg b/Inviscid_3D_Constrained_ONERAM6/inv_ONERAM6_adv.cfg
@@ -312,8 +312,8 @@ DEFORM_LINEAR_SOLVER= FGMRES
 % Number of smoothing iterations for mesh deformation
 DEFORM_LINEAR_ITER= 500
 %
-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)
-DEFORM_TOL_FACTOR = 1E-6
+% Minimum residual criteria for the linear solver convergence of grid deformation
+DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 %
 % Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME, 
 %                                          WALL_DISTANCE, CONSTANT_STIFFNESS)
diff --git a/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg b/Multi_Objective_Shape_Design/inv_wedge_ROE_multiobj_combo.cfg
@@ -337,8 +337,8 @@ DEFORM_NONLINEAR_ITER= 1
 % Print the residuals during mesh deformation to the console (YES, NO)
 DEFORM_CONSOLE_OUTPUT= YES
 %
-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)
-DEFORM_TOL_FACTOR = 1e-15
+% Minimum residual criteria for the linear solver convergence of grid deformation
+DEFORM_LINEAR_SOLVER_ERROR= 1E-14
 %
 % Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME,
 %                                          WALL_DISTANCE, CONSTANT_STIFFNESS)

Original file line number	Diff line number	Diff line change
`@@ -213,8 +213,8 @@ DEFORM_NONLINEAR_ITER= 1`
`213`	`213`	`% Print the residuals during mesh deformation to the console (YES, NO)`
`214`	`214`	`DEFORM_CONSOLE_OUTPUT= YES`
`215`	`215`	`%`
`216`		`-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)`
`217`		`-DEFORM_TOL_FACTOR = 0.001`
	`216`	`+% Minimum residual criteria for the linear solver convergence of grid deformation`
	`217`	`+DEFORM_LINEAR_SOLVER_ERROR= 1E-14`
`218`	`218`	`%`
`219`	`219`	`% Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME,`
`220`	`220`	`% WALL_DISTANCE, CONSTANT_STIFFNESS)`
Original file line number	Diff line number	Diff line change
`@@ -312,8 +312,8 @@ DEFORM_LINEAR_SOLVER= FGMRES`
`312`	`312`	`% Number of smoothing iterations for mesh deformation`
`313`	`313`	`DEFORM_LINEAR_ITER= 500`
`314`	`314`	`%`
`315`		`-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)`
`316`		`-DEFORM_TOL_FACTOR = 1E-6`
	`315`	`+% Minimum residual criteria for the linear solver convergence of grid deformation`
	`316`	`+DEFORM_LINEAR_SOLVER_ERROR= 1E-14`
`317`	`317`	`%`
`318`	`318`	`% Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME,`
`319`	`319`	`% WALL_DISTANCE, CONSTANT_STIFFNESS)`
Original file line number	Diff line number	Diff line change
`@@ -337,8 +337,8 @@ DEFORM_NONLINEAR_ITER= 1`
`337`	`337`	`% Print the residuals during mesh deformation to the console (YES, NO)`
`338`	`338`	`DEFORM_CONSOLE_OUTPUT= YES`
`339`	`339`	`%`
`340`		`-% Factor to multiply smallest cell volume for deform tolerance (0.001 default)`
`341`		`-DEFORM_TOL_FACTOR = 1e-15`
	`340`	`+% Minimum residual criteria for the linear solver convergence of grid deformation`
	`341`	`+DEFORM_LINEAR_SOLVER_ERROR= 1E-14`
`342`	`342`	`%`
`343`	`343`	`% Type of element stiffness imposed for FEA mesh deformation (INVERSE_VOLUME,`
`344`	`344`	`% WALL_DISTANCE, CONSTANT_STIFFNESS)`