From d1aab2399f08c0d7208ce35dc9b696d5d7e950f2 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 28 Sep 2011 12:37:41 +0100
Subject: [PATCH 1/2] ENH: Added SCOTCH_ROOT to scotch and ptscotch options
 files

---
 src/parallel/decompose/ptscotchDecomp/Make/options | 3 ++-
 src/parallel/decompose/scotchDecomp/Make/options   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index ea5b0c3ad8..1e34631aa1 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -3,9 +3,10 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
+    -I$(SCOTCH_ROOT)/include \
     -I$(SCOTCH_ARCH_PATH)/include/$(FOAM_MPI) \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lrt
+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN)/$(FOAM_MPI) -lptscotch -lptscotcherrexit -lrt
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index b2f7015e24..3bb11fba5c 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -7,9 +7,10 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
+    -I$(SCOTCH_ROOT)/include \
     -I$(SCOTCH_ARCH_PATH)/include \
     -I/usr/include/scotch \
     -I../decompositionMethods/lnInclude
 
 LIB_LIBS = \
-    -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt
+    -L$(SCOTCH_ROOT)/lib -L$(FOAM_EXT_LIBBIN) -lscotch -lscotcherrexit -lrt

From 45a4fbda2c607646a193cc530eca90e71b33693b Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 28 Sep 2011 13:58:08 +0100
Subject: [PATCH 2/2] ENH: Added ddtPhiCorr to pimpleDyMFoam on a switch

---
 .../solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H   | 5 +++++
 .../incompressible/pimpleFoam/pimpleDyMFoam/readControls.H   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
index 7e84ef50fe..3e8a587768 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pEqn.H
@@ -7,6 +7,11 @@ if (pimple.nCorr() <= 1)
 
 phi = (fvc::interpolate(U) & mesh.Sf());
 
+if (ddtPhiCorr)
+{
+    phi += fvc::ddtPhiCorr(rAU, U, phi);
+}
+
 if (p.needReference())
 {
     fvc::makeRelative(phi, U);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
index 8f48f5d7d4..2ad7f610f0 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/readControls.H
@@ -8,3 +8,5 @@
     const bool checkMeshCourantNo =
         pimpleDict.lookupOrDefault("checkMeshCourantNo", false);
 
+    const bool ddtPhiCorr =
+        pimpleDict.lookupOrDefault("ddtPhiCorr", true);