solvers::*:moveMesh: rationalised the application of correctPhi

Flux correction is now applied if either the topology changed or the mesh is
moving and correctPhi is true.  This strategy allows moving mesh cases without
topology change to be run without any change to the fluxes which is appropriate
for solid-body motion of the entire domain or a rotating sub-domain with NCC.

applications/solvers/modules/VoFSolver/moveMesh.C

@@ -35,7 +35,7 @@ void Foam::solvers::VoFSolver::moveMesh()
     {
         if
         (
-            correctPhi
+            (correctPhi || mesh.topoChanged())
          && divergent()
          && !divU.valid()
         )
@@ -65,8 +65,6 @@ void Foam::solvers::VoFSolver::moveMesh()
 
                 correctUphiBCs(U_, phi, true);
 
-                if (correctPhi)
-                {
                 if (divU.valid())
                 {
                     CorrectPhi
@@ -93,7 +91,6 @@ void Foam::solvers::VoFSolver::moveMesh()
                         pimple
                     );
                 }
-                }
 
                 // Make the fluxes relative to the mesh motion
                 fvc::makeRelative(phi, U);

applications/solvers/modules/incompressibleFluid/moveMesh.C

@@ -48,8 +48,6 @@ void Foam::solvers::incompressibleFluid::moveMesh()
 
                 correctUphiBCs(U, phi, true);
 
-                if (correctPhi)
-                {
                 CorrectPhi
                 (
                     phi,
@@ -60,7 +58,6 @@ void Foam::solvers::incompressibleFluid::moveMesh()
                     pressureReference,
                     pimple
                 );
-                }
 
                 // Make the flux relative to the mesh motion
                 fvc::makeRelative(phi, U);

applications/solvers/modules/isothermalFluid/moveMesh.C

@@ -57,8 +57,6 @@ void Foam::solvers::isothermalFluid::moveMesh()
 
                 correctUphiBCs(rho, U, phi, true);
 
-                if (correctPhi)
-                {
                 CorrectPhi
                 (
                     phi,
@@ -69,7 +67,6 @@ void Foam::solvers::isothermalFluid::moveMesh()
                     divrhoU(),
                     pimple
                 );
-                }
 
                 // Make the fluxes relative to the mesh-motion
                 fvc::makeRelative(phi, rho, U);

applications/solvers/modules/multiphaseEuler/multiphaseEuler/moveMesh.C

@@ -37,7 +37,11 @@ void Foam::solvers::multiphaseEuler::moveMesh()
      && (pimple.firstIter() || pimple.moveMeshOuterCorrectors())
     )
     {
-        if (correctPhi && !divU.valid())
+        if
+        (
+            (correctPhi || mesh.topoChanged())
+         && !divU.valid()
+        )
         {
             // Construct and register divU for mapping
             divU = new volScalarField
@@ -53,20 +57,22 @@ void Foam::solvers::multiphaseEuler::moveMesh()
         // Move the mesh
         mesh_.move();
 
-        if (mesh.changing() || mesh.topoChanged())
+        if (mesh.changing())
         {
             buoyancy.moveMesh();
 
+            if (correctPhi || mesh.topoChanged())
+            {
                 fluid.meshUpdate();
 
                 fluid.correctPhi
                 (
                     p_rgh,
                     divU,
-                correctPhi,
                     pressureReference,
                     pimple
                 );
+            }
 
             meshCourantNo();
         }

applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.C

@@ -727,7 +727,6 @@ void Foam::phaseSystem::correctPhi
 (
     const volScalarField& p_rgh,
     const tmp<volScalarField>& divU,
-    const bool correctPhi,
     const pressureReference& pressureReference,
     nonOrthogonalSolutionControl& pimple
 )
@@ -760,7 +759,6 @@ void Foam::phaseSystem::correctPhi
     // Correct fixed-flux BCs to be consistent with the velocity BCs
     correctBoundaryFlux();
 
-    {
     phi_ = Zero;
     PtrList<surfaceScalarField> alphafs(phaseModels_.size());
     forAll(movingPhases(), movingPhasei)
@@ -776,8 +774,6 @@ void Foam::phaseSystem::correctPhi
         phi_ += alphafs[phasei]*(mesh_.Sf() & phase.UfRef());
     }
 
-        if (correctPhi)
-        {
     CorrectPhi
     (
         phi_,
@@ -789,13 +785,11 @@ void Foam::phaseSystem::correctPhi
         pressureReference,
         pimple
     );
-        }
 
     // Make the flux relative to the mesh motion
     fvc::makeRelative(phi_, movingPhases()[0].U());
 
     setMixturePhi(alphafs, phi_);
-    }
 }
 
 

applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H

@@ -657,7 +657,6 @@ public:
             (
                 const volScalarField& p_rgh,
                 const tmp<volScalarField>& divU,
-                const bool correctPhi,
                 const pressureReference& pressureReference,
                 nonOrthogonalSolutionControl& pimple
             );