populationBalanceModel: Corrected handling of residual control

Patch contributed by Institute of Fluid Dynamics, Helmholtz-Zentrum
Dresden - Rossendorf (HZDR)

applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C

@@ -1174,15 +1174,9 @@ void Foam::diameterModels::populationBalanceModel::solve()
         }
 
         int iCorr = 0;
-        scalar initialResidual = 0;
         scalar maxInitialResidual = 1;
 
-        while
+        while (++iCorr <= nCorr && maxInitialResidual > tolerance)
-        (
-            maxInitialResidual > tolerance
-            &&
-            ++iCorr <= nCorr
-        )
         {
             Info<< "populationBalance "
                 << this->name()
@@ -1194,6 +1188,8 @@ void Foam::diameterModels::populationBalanceModel::solve()
 
             dmdt();
 
+            maxInitialResidual = 0;
+
             forAll(sizeGroups_, i)
             {
                 sizeGroup& fi = *sizeGroups_[i];
@@ -1223,16 +1219,11 @@ void Foam::diameterModels::populationBalanceModel::solve()
                   - fvm::ddt(residualAlpha*rho, fi)
                 );
 
-                sizeGroupEqn.relax
+                sizeGroupEqn.relax();
-                (
-                    fi.mesh().equationRelaxationFactor("f")
-                );
-
-                initialResidual = sizeGroupEqn.solve().initialResidual();
 
                 maxInitialResidual = max
                 (
-                    initialResidual,
+                    sizeGroupEqn.solve().initialResidual(),
                     maxInitialResidual
                 );
             }

test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/binaryBreakup/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }
 

test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/breakup/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }
 

test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/coalescence/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }
 

test/multiphase/reactingMultiphaseEulerFoam/populationBalanceModeling/simultaneousCoalescenceAndBreakup/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }
 

test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/drift/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }
 

test/multiphase/reactingTwoPhaseEulerFoam/populationBalanceModeling/negativeDrift/system/fvSolution

@@ -66,7 +66,7 @@ relaxationFactors
 {
     equations
     {
-        f                  1.0;
+        "f.*"              1.0;
     }
 }