pimpleFoam, rhoPimpleFoam, interDyMFoam: Rationalized mesh-motion support

Added support for mesh-motion update within PIMPLE loop in pimpleFoam and rhoPimpleFoam.

applications/solvers/compressible/rhoPimpleFoam/readControls.H

@@ -1,10 +0,0 @@
-#include "readTimeControls.H"
-
-bool correctPhi = pimple.dict().lookupOrDefault<Switch>
-(
-    "correctPhi",
-    !isA<staticFvMesh>(mesh)
-);
-
-bool checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -54,12 +54,11 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "createDyMControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
     #include "createRhoUfIfPresent.H"
-    #include "createTimeControls.H"
 
     turbulence->validate();
 
@@ -75,9 +74,8 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
 
-        {
         // Store divrhoU from the previous mesh so that it can be mapped
         // and used in correctPhi to ensure the corrected phi has the
         // same divergence
@@ -105,6 +103,11 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
+        {
+            if (pimple.firstIter() || moveMeshOuterCorrectors)
+            {
                 // Store momentum to set rhoUf for introduced faces.
                 autoPtr<volVectorField> rhoU;
                 if (rhoUf.valid())
@@ -115,15 +118,14 @@ int main(int argc, char *argv[])
                 // Do any mesh changes
                 mesh.update();
 
-            #include "updateRhoUf.H"
-
                 if (mesh.changing())
                 {
                     MRF.update();
 
                     if (correctPhi)
                     {
-                    // Calculate absolute flux from the mapped surface velocity
+                        // Calculate absolute flux
+                        // from the mapped surface velocity
                         phi = mesh.Sf() & rhoUf();
 
                         #include "correctPhi.H"
@@ -144,9 +146,6 @@ int main(int argc, char *argv[])
                 #include "rhoEqn.H"
             }
 
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
             #include "UEqn.H"
             #include "EEqn.H"
 

applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C

@@ -50,8 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "createDyMControls.H"
-    #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
     #include "createRhoUf.H"
@@ -67,7 +66,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
 
         {
             // Store divrhoU from the previous mesh so that it can be mapped

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControls.H"
+    #include "createDyMControls.H"
     #include "createFields.H"
     #include "createUfIfPresent.H"
     #include "CourantNo.H"
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 
@@ -72,17 +72,21 @@ int main(int argc, char *argv[])
 
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
+        // --- Pressure-velocity PIMPLE corrector loop
+        while (pimple.loop())
+        {
+            if (pimple.firstIter() || moveMeshOuterCorrectors)
+            {
                 mesh.update();
 
-        #include "updateUf.H"
-
                 if (mesh.changing())
                 {
                     MRF.update();
 
                     if (correctPhi)
                     {
-                // Calculate absolute flux from the mapped surface velocity
+                        // Calculate absolute flux
+                        // from the mapped surface velocity
                         phi = mesh.Sf() & Uf();
 
                         #include "correctPhi.H"
@@ -96,10 +100,8 @@ int main(int argc, char *argv[])
                         #include "meshCourantNo.H"
                     }
                 }
+            }
 
-        // --- Pressure-velocity PIMPLE corrector loop
-        while (pimple.loop())
-        {
             #include "UEqn.H"
 
             // --- Pressure corrector loop

applications/solvers/incompressible/pimpleFoam/readControls.H

@@ -1,5 +0,0 @@
-#include "readTimeControls.H"
-
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
-
-checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C

@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControls.H"
+    #include "createDyMControls.H"
     #include "createFields.H"
     #include "createUcf.H"
     #include "initContinuityErrs.H"
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 

applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/createControls.H

@@ -1,12 +0,0 @@
-#include "createControl.H"
-#include "createTimeControls.H"
-
-bool correctPhi
-(
-    pimple.dict().lookupOrDefault("correctPhi", false)
-);
-
-bool checkMeshCourantNo
-(
-    pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
-);

applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/readControls.H

@@ -1,5 +0,0 @@
-#include "readTimeControls.H"
-
-correctPhi = pimple.dict().lookupOrDefault("correctPhi", false);
-
-checkMeshCourantNo = pimple.dict().lookupOrDefault("checkMeshCourantNo", false);

applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C

@@ -50,8 +50,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "createDyMControls.H"
-    #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
     #include "createRhoUf.H"
@@ -67,7 +66,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
 
         {
             // Store divrhoU from the previous time-step/mesh for the correctPhi

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,7 +50,6 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
     #include "createControls.H"
     #include "createFields.H"
     #include "createUf.H"

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createControls.H

@@ -1,11 +1,6 @@
-#include "createTimeControls.H"
+#include "createDyMControls.H"
 
 scalar maxAcousticCo
 (
     readScalar(runTime.controlDict().lookup("maxAcousticCo"))
 );
-
-bool correctPhi
-(
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
-);

applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H

@@ -1,4 +1,3 @@
-#include "readTimeControls.H"
+#include "readDyMControls.H"
 
 maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C

@@ -60,10 +60,9 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControl.H"
+    #include "createDyMControls.H"
     #include "createFields.H"
     #include "createUf.H"
-    #include "createControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
@@ -77,7 +76,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
 
         // Store divU from the previous mesh so that it can be mapped
         // and used in correctPhi to ensure the corrected phi has the

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/createControls.H

@@ -1,16 +0,0 @@
-#include "createTimeControls.H"
-
-bool correctPhi
-(
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
-);
-
-bool checkMeshCourantNo
-(
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
-);
-
-bool moveMeshOuterCorrectors
-(
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
-);

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/readControls.H

@@ -1,9 +0,0 @@
-#include "readTimeControls.H"
-
-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
-
-checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
-
-moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);

applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H

@@ -3,7 +3,7 @@ CorrectPhi
     U,
     phi,
     p_rgh,
-    surfaceScalarField("rAUf", fvc::interpolate(rAU)),
+    surfaceScalarField("rAUf", fvc::interpolate(rAU())),
     geometricZeroField(),
     pimple
 );

applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H

@@ -1,14 +0,0 @@
-bool correctPhi
-(
-    pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
-);
-
-bool checkMeshCourantNo
-(
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false)
-);
-
-bool moveMeshOuterCorrectors
-(
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false)
-);

applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C

@@ -56,13 +56,15 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControl.H"
-    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
 
-    volScalarField rAU
+    tmp<volScalarField> rAU;
+
+    if (correctPhi)
+    (
+        rAU = new volScalarField
         (
             IOobject
             (
@@ -73,11 +75,12 @@ int main(int argc, char *argv[])
                 IOobject::AUTO_WRITE
             ),
             mesh,
-        dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
+            dimensionedScalar("rAU", dimTime/dimDensity, 1)
+        )
     );
 
     #include "correctPhi.H"
-    #include "createUf.H"
+    #include "createUfIfPresent.H"
 
     turbulence->validate();
 
@@ -92,7 +95,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
 
         if (LTS)
         {
@@ -114,16 +117,10 @@ int main(int argc, char *argv[])
         {
             if (pimple.firstIter() || moveMeshOuterCorrectors)
             {
-                scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime();
-
                 mesh.update();
 
                 if (mesh.changing())
                 {
-                    Info<< "Execution time for mesh.update() = "
-                        << runTime.elapsedCpuTime() - timeBeforeMeshUpdate
-                        << " s" << endl;
-
                     // Do not apply previous time-step mesh compression flux
                     // if the mesh topology changed
                     if (mesh.topoChanging())
@@ -140,7 +137,7 @@ int main(int argc, char *argv[])
                     {
                         // Calculate absolute flux
                         // from the mapped surface velocity
-                        phi = mesh.Sf() & Uf;
+                        phi = mesh.Sf() & Uf();
 
                         #include "correctPhi.H"
 

applications/solvers/multiphase/interFoam/interDyMFoam/pEqn.H

@@ -1,12 +1,12 @@
 {
     rAU = 1.0/UEqn.A();
-    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU));
+    surfaceScalarField rAUf("rAUf", fvc::interpolate(rAU()));
-    volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p_rgh));
+    volVectorField HbyA(constrainHbyA(rAU()*UEqn.H(), U, p_rgh));
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
         fvc::flux(HbyA)
-      + fvc::interpolate(rho*rAU)*fvc::ddtCorr(U, Uf)
+      + fvc::interpolate(rho*rAU())*fvc::ddtCorr(U, phi, Uf)
     );
     MRF.makeRelative(phiHbyA);
 
@@ -47,7 +47,7 @@
 
             p_rgh.relax();
 
-            U = HbyA + rAU*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
+            U = HbyA + rAU()*fvc::reconstruct((phig - p_rghEqn.flux())/rAUf);
             U.correctBoundaryConditions();
             fvOptions.correct(U);
         }
@@ -55,11 +55,8 @@
 
     #include "continuityErrs.H"
 
-    {
+    // Correct Uf if the mesh is moving
-        Uf = fvc::interpolate(U);
+    fvc::correctUf(Uf, U, phi);
-        surfaceVectorField n(mesh.Sf()/mesh.magSf());
-        Uf += n*(phi/mesh.magSf() - (n & Uf));
-    }
 
     // Make the fluxes relative to the mesh motion
     fvc::makeRelative(phi, U);
@@ -76,4 +73,9 @@
         );
         p_rgh = p - rho*gh;
     }
+
+    if (!correctPhi)
+    {
+        rAU.clear();
+    }
 }

applications/solvers/multiphase/interFoam/interDyMFoam/readControls.H

@@ -1,9 +0,0 @@
-#include "readTimeControls.H"
-
-correctPhi = pimple.dict().lookupOrDefault<Switch>("correctPhi", true);
-
-checkMeshCourantNo =
-    pimple.dict().lookupOrDefault<Switch>("checkMeshCourantNo", false);
-
-moveMeshOuterCorrectors =
-    pimple.dict().lookupOrDefault<Switch>("moveMeshOuterCorrectors", false);

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -61,9 +61,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
-    #include "createControl.H"
+    #include "createDyMControls.H"
-    #include "createTimeControls.H"
-    #include "../interFoam/interDyMFoam/createDyMControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
 
@@ -93,7 +91,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "../interFoam/interDyMFoam/readControls.H"
+        #include "readDyMControls.H"
 
         // Store divU from the previous mesh so that it can be mapped
         // and used in correctPhi to ensure the corrected phi has the

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C

@@ -51,12 +51,14 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControl.H"
-    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
 
-    volScalarField rAU
+    tmp<volScalarField> rAU;
+
+    if (correctPhi)
+    (
+        rAU = new volScalarField
         (
             IOobject
             (
@@ -67,11 +69,13 @@ int main(int argc, char *argv[])
                 IOobject::AUTO_WRITE
             ),
             mesh,
-        dimensionedScalar("rAUf", dimTime/rho.dimensions(), 1.0)
+            dimensionedScalar("rAU", dimTime/dimDensity, 1)
+        )
     );
 
     #include "correctPhi.H"
-    #include "createUf.H"
+    #include "createUfIfPresent.H"
+
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 
@@ -85,7 +89,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
         #include "CourantNo.H"
         #include "alphaCourantNo.H"
 
@@ -117,7 +121,7 @@ int main(int argc, char *argv[])
                 if (mesh.changing() && correctPhi)
                 {
                     // Calculate absolute flux from the mapped surface velocity
-                    phi = mesh.Sf() & Uf;
+                    phi = mesh.Sf() & Uf();
 
                     #include "correctPhi.H"
 

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C

@@ -56,8 +56,6 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
-    #include "createControl.H"
-    #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
 
@@ -86,7 +84,7 @@ int main(int argc, char *argv[])
 
     while (runTime.run())
     {
-        #include "readControls.H"
+        #include "readDyMControls.H"
         #include "CourantNo.H"
         #include "setDeltaT.H"
 

src/OpenFOAM/meshes/polyMesh/polyMesh.H

@@ -493,6 +493,12 @@ public:
 
         // Mesh motion
 
+            //- Is mesh dynamic
+            virtual bool dynamic() const
+            {
+                return false;
+            }
+
             //- Is mesh moving
             bool moving() const
             {

src/dynamicFvMesh/dynamicFvMesh/dynamicFvMesh.H

@@ -121,6 +121,12 @@ public:
 
     // Member Functions
 
+        //- Is mesh dynamic
+        virtual bool dynamic() const
+        {
+            return true;
+        }
+
         //- Update the mesh for both mesh motion and topology change
         virtual bool update() = 0;
 };
@@ -131,10 +137,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "staticFvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //

src/dynamicFvMesh/dynamicFvMesh/dynamicFvMeshNew.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "dynamicFvMesh.H"
+#include "staticFvMesh.H"
 
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 

src/dynamicFvMesh/include/createDyMControls.H

@@ -3,10 +3,15 @@
 
 bool correctPhi
 (
-    pimple.dict().lookupOrDefault("correctPhi", false)
+    pimple.dict().lookupOrDefault("correctPhi", mesh.dynamic())
 );
 
 bool checkMeshCourantNo
 (
     pimple.dict().lookupOrDefault("checkMeshCourantNo", false)
 );
+
+bool moveMeshOuterCorrectors
+(
+    pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
+);

src/dynamicFvMesh/include/readDyMControls.H

@@ -0,0 +1,19 @@
+#include "readTimeControls.H"
+
+correctPhi = pimple.dict().lookupOrDefault
+(
+    "correctPhi",
+    correctPhi
+);
+
+checkMeshCourantNo = pimple.dict().lookupOrDefault
+(
+    "checkMeshCourantNo",
+    checkMeshCourantNo
+);
+
+moveMeshOuterCorrectors = pimple.dict().lookupOrDefault
+(
+    "moveMeshOuterCorrectors",
+    moveMeshOuterCorrectors
+);

src/dynamicFvMesh/staticFvMesh/staticFvMesh.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -77,6 +77,12 @@ public:
 
     // Member Functions
 
+        //- Is mesh dynamic
+        virtual bool dynamic() const
+        {
+            return false;
+        }
+
         //- Dummy update function which does not change the mesh
         virtual bool update();
 };

src/finiteVolume/cfdTools/compressible/createRhoUfIfPresent.H

@@ -25,7 +25,7 @@ Global
     createRhoUf
 
 Description
-    Creates and initialises the velocity field rhoUf if present.
+    Creates and initialises the velocity field rhoUf if required.
 
 \*---------------------------------------------------------------------------*/
 
@@ -33,19 +33,22 @@ Description
 
 autoPtr<surfaceVectorField> rhoUf;
 
-IOobject rhoUfHeader
+if (mesh.dynamic())
+{
+    Info<< "Constructing face momentum rhoUf" << endl;
+
+    rhoUf = new surfaceVectorField
+    (
+        IOobject
         (
             "rhoUf",
             runTime.timeName(),
             mesh,
-    IOobject::MUST_READ,
+            IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
+        ),
+        fvc::interpolate(rho*U)
     );
-
-if (rhoUfHeader.typeHeaderOk<surfaceVectorField>(true))
-{
-    Info<< "Reading face momentum rhoUf\n" << endl;
-    rhoUf = new surfaceVectorField(rhoUfHeader, mesh);
 }
 
 // ************************************************************************* //

src/finiteVolume/cfdTools/compressible/updateRhoUf.H

@@ -31,25 +31,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-if (mesh.changing())
+#error Remove rhoUpdateUf.H
-{
-    if (!rhoUf.valid())
-    {
-        Info<< "Constructing face momentum rhoUf" << endl;
-
-        rhoUf = new surfaceVectorField
-        (
-            IOobject
-            (
-                "rhoUf",
-                runTime.timeName(),
-                mesh,
-                IOobject::READ_IF_PRESENT,
-                IOobject::AUTO_WRITE
-            ),
-            fvc::interpolate(rho*U)
-        );
-    }
-}
 
 // ************************************************************************* //

src/finiteVolume/cfdTools/incompressible/createUfIfPresent.H

@@ -25,7 +25,7 @@ Global
     createUf
 
 Description
-    Creates and initialises the velocity field Uf if present.
+    Creates and initialises the velocity field Uf if required.
 
 \*---------------------------------------------------------------------------*/
 
@@ -33,19 +33,22 @@ Description
 
 autoPtr<surfaceVectorField> Uf;
 
-IOobject UfHeader
+if (mesh.dynamic())
+{
+    Info<< "Constructing face velocity Uf\n" << endl;
+
+    Uf = new surfaceVectorField
+    (
+        IOobject
         (
             "Uf",
             runTime.timeName(),
             mesh,
-    IOobject::MUST_READ,
+            IOobject::READ_IF_PRESENT,
             IOobject::AUTO_WRITE
+        ),
+        fvc::interpolate(U)
     );
-
-if (UfHeader.typeHeaderOk<surfaceVectorField>(true))
-{
-    Info<< "Reading face velocity Uf\n" << endl;
-    Uf = new surfaceVectorField(UfHeader, mesh);
 }
 
 // ************************************************************************* //

src/finiteVolume/cfdTools/incompressible/updateUf.H

@@ -31,25 +31,6 @@ Description
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-if (mesh.changing())
+#error Remove updateUf.H
-{
-    if (!Uf.valid())
-    {
-        Info<< "Constructing face velocity Uf" << endl;
-
-        Uf = new surfaceVectorField
-        (
-            IOobject
-            (
-                "Uf",
-                runTime.timeName(),
-                mesh,
-                IOobject::READ_IF_PRESENT,
-                IOobject::AUTO_WRITE
-            ),
-            fvc::interpolate(U)
-        );
-    }
-}
 
 // ************************************************************************* //

src/finiteVolume/finiteVolume/fvc/fvcDdt.C

@@ -215,7 +215,7 @@ ddtCorr
     const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
 )
 {
-    if (U.mesh().changing())
+    if (U.mesh().dynamic())
     {
         return ddtCorr(U, Uf());
     }
@@ -280,7 +280,7 @@ ddtCorr
     const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
 )
 {
-    if (U.mesh().changing())
+    if (U.mesh().dynamic())
     {
         return ddtCorr(rho, U, Uf());
     }

src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C

@@ -228,7 +228,7 @@ void Foam::fvc::correctUf
 {
     const fvMesh& mesh = U.mesh();
 
-    if (mesh.changing())
+    if (mesh.dynamic())
     {
         Uf() = fvc::interpolate(U);
         surfaceVectorField n(mesh.Sf()/mesh.magSf());
@@ -247,7 +247,7 @@ void Foam::fvc::correctRhoUf
 {
     const fvMesh& mesh = U.mesh();
 
-    if (mesh.changing())
+    if (mesh.dynamic())
     {
         rhoUf() = fvc::interpolate(rho*U);
         surfaceVectorField n(mesh.Sf()/mesh.magSf());

tutorials/multiphase/interDyMFoam/laminar/damBreakWithObstacle/constant/dynamicMeshDict

@@ -47,7 +47,7 @@ correctFluxes
     (phi none)
     (nHatf none)
     (rhoPhi none)
-    (alphaPhi none)
+    (alphaPhi0.water none)
     (ghf none)
 );