same logic for target tol

pcarruscag · pcarruscag · commit a5f5513a38a0 · 2025-10-05T15:45:55.000-07:00
diff --git a/SU2_CFD/src/integration/CNewtonIntegration.cpp b/SU2_CFD/src/integration/CNewtonIntegration.cpp
@@ -277,9 +277,10 @@ void CNewtonIntegration::MultiGrid_Iteration(CGeometry ****geometry_, CSolver **
     solvers[FLOW_SOL]->SetResLinSolver(eps);
 
     if (!startupPeriod && autoRelaxation) {
-      if (eps > config->GetLinear_Solver_Error()) {
+      const su2double adaptTol = config->GetCFL_Adapt() ? config->GetCFL_AdaptParam(4) : 0;
+      if (eps > fmax(config->GetLinear_Solver_Error(), adaptTol)) {
         nkRelaxation *= 0.9;
-      } else if (iter < config->GetLinear_Solver_Iter()) {
+      } else if (eps < 0.9 * fmax(config->GetLinear_Solver_Error(), adaptTol)) {
         nkRelaxation = fmin(nkRelaxation * 1.05, 1);
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -277,9 +277,10 @@ void CNewtonIntegration::MultiGrid_Iteration(CGeometry **geometry_, CSolver `
`277`	`277`	`solvers[FLOW_SOL]->SetResLinSolver(eps);`
`278`	`278`
`279`	`279`	`if (!startupPeriod && autoRelaxation) {`
`280`		`- if (eps > config->GetLinear_Solver_Error()) {`
	`280`	`+ const su2double adaptTol = config->GetCFL_Adapt() ? config->GetCFL_AdaptParam(4) : 0;`
	`281`	`+ if (eps > fmax(config->GetLinear_Solver_Error(), adaptTol)) {`
`281`	`282`	`nkRelaxation *= 0.9;`
`282`		`- } else if (iter < config->GetLinear_Solver_Iter()) {`
	`283`	`+ } else if (eps < 0.9 * fmax(config->GetLinear_Solver_Error(), adaptTol)) {`
`283`	`284`	`nkRelaxation = fmin(nkRelaxation * 1.05, 1);`
`284`	`285`	`}`
`285`	`286`	`}`