From 927a5267d39b64d2777d6c598fd2b5173a632763 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 29 Apr 2013 14:36:19 +0100
Subject: [PATCH] interDyMFoam and compressibleInterDyMFoam: improved handling
 of fluxes

---
 .../compressibleInterDyMFoam/compressibleInterDyMFoam.C       | 3 ---
 .../compressibleInterDyMFoam/correctPhi.H                     | 4 ++--
 .../solvers/multiphase/interFoam/interDyMFoam/correctPhi.H    | 4 ++--
 .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C  | 3 ++-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
index 27d3b87cd1..7590e6ff45 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -137,9 +137,6 @@ int main(int argc, char *argv[])
             while (pimple.correct())
             {
                 #include "pEqn.H"
-
-                // Make the fluxes relative to the mesh motion
-                fvc::makeRelative(phi, U);
             }
         }
 
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
index 513ef961bd..c8709d3347 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/correctPhi.H
@@ -38,7 +38,7 @@
         pcorrTypes
     );
 
-    dimensionedScalar rAUf("(1|A(U))", dimTime/rho.dimensions(), 1.0);
+    dimensionedScalar Dp("Dp", dimTime/rho.dimensions(), 1.0);
 
     adjustPhi(phi, U, pcorr);
 
@@ -46,7 +46,7 @@
     {
         fvScalarMatrix pcorrEqn
         (
-            fvm::laplacian(rAUf, pcorr) == fvc::div(phi) - divU
+            fvm::laplacian(Dp, pcorr) == fvc::div(phi) - divU
         );
 
         pcorrEqn.solve();
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
index c4cdbc044b..8d3e60da40 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/correctPhi.H
@@ -50,11 +50,11 @@
         {
             phi -= pcorrEqn.flux();
             phiAbs = phi;
+            phiAbs.oldTime() = phi;
             fvc::makeRelative(phi, U);
+            phi.oldTime() = phi;
         }
     }
 }
 
-phi.oldTime() = phi;
-
 #include "continuityErrs.H"
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index fa16f17141..3ccfa73fee 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -51,10 +51,11 @@ int main(int argc, char *argv[])
     #include "createDynamicFvMesh.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "readTimeControls.H"
 
     pimpleControl pimple(mesh);
 
+    #include "readTimeControls.H"
+
     surfaceScalarField phiAbs("phiAbs", phi);
     fvc::makeAbsolute(phiAbs, U);