From 8d2bed91cebd1b9ac4f70e50b261d54e36f207df Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 12:24:12 +0000 Subject: [PATCH 1/6] Added ddtPhiCorr back into the pEqn, use if wisely. --- applications/solvers/compressible/rhoPimpleFoam/pEqn.H | 2 +- applications/solvers/compressible/rhoPisoFoam/pEqn.H | 2 +- .../solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C | 3 +-- .../multiphase/compressibleInterDyMFoam/Make/options | 7 +++++-- .../compressibleInterDyMFoam/alphaEqnsSubCycle.H | 2 ++ .../compressibleInterDyMFoam/compressibleInterDyMFoam.C | 4 ++-- .../multiphase/compressibleInterDyMFoam/correctPhi.H | 1 + .../solvers/multiphase/compressibleInterDyMFoam/pEqn.H | 2 +- .../solvers/multiphase/interDyMFoam/interDyMFoam.C | 3 +-- 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 7918618404..61eab188c2 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -55,7 +55,7 @@ else fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) - //+ fvc::ddtPhiCorr(rUA, rho, U, phi) + + fvc::ddtPhiCorr(rUA, rho, U, phi) ); //bool closedVolume = adjustPhi(phi, U, p); diff --git a/applications/solvers/compressible/rhoPisoFoam/pEqn.H b/applications/solvers/compressible/rhoPisoFoam/pEqn.H index 05db89627d..b506245034 100644 --- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPisoFoam/pEqn.H @@ -34,7 +34,7 @@ if (transonic) } else { - phi = + phi = fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C index 42aae85309..8ed5017eaf 100644 --- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C @@ -60,12 +60,11 @@ int main(int argc, char *argv[]) { # include "readControls.H" # include "CourantNo.H" +# include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); -# include "setDeltaT.H" - runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options index 13d31339e4..18b09d886b 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options @@ -8,7 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ -linterfaceProperties \ @@ -18,5 +19,7 @@ EXE_LIBS = \ -lfiniteVolume \ -ldynamicMesh \ -lmeshTools \ - -ldynamicFvMesh + -ldynamicFvMesh \ + -lsampling + diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H index e161a3cbe6..32a7163130 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H @@ -12,7 +12,9 @@ surfaceScalarField phic = mag(phi/mesh.magSf()); phic = min(interface.cAlpha()*phic, max(phic)); + fvc::makeAbsolute(phi, U); volScalarField divU = fvc::div(phi); + fvc::makeRelative(phi, U); if (nAlphaSubCycles > 1) { diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C index e24de6658d..6252c1d22d 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C @@ -42,6 +42,7 @@ Description #include "interfaceProperties.H" #include "twoPhaseMixture.H" #include "turbulenceModel.H" +#include "probes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,12 +65,11 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" + #include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); - #include "setDeltaT.H" - runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H index 4152105784..f71b0fb7c5 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H @@ -27,6 +27,7 @@ fvm::laplacian(rAUf, pcorr) == fvc::div(phi) - divU ); + pcorrEqn.setReference(0, 0); pcorrEqn.solve(); if (nonOrth == nNonOrthCorr) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H index 013d8eb05f..b0f3378408 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H @@ -21,7 +21,7 @@ surfaceScalarField phiU ( "phiU", - (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) + (fvc::interpolate(U) & mesh.Sf()) ); phi = phiU + diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C index 0ea32adcc8..496db6e226 100644 --- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C @@ -65,12 +65,11 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" + #include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); - #include "setDeltaT.H" - runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; From 799f09ed7f18ac3fff8b9f6388b24602ff983e54 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 12:25:36 +0000 Subject: [PATCH 2/6] Reverting "Added ddtPhiCorr back into the pEqn, use if wisely." --- applications/solvers/compressible/rhoPimpleFoam/pEqn.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 61eab188c2..7918618404 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -55,7 +55,7 @@ else fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) - + fvc::ddtPhiCorr(rUA, rho, U, phi) + //+ fvc::ddtPhiCorr(rUA, rho, U, phi) ); //bool closedVolume = adjustPhi(phi, U, p); From 83a365ca865a87afdaa53501a897979ec6aa926a Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 12:26:11 +0000 Subject: [PATCH 3/6] Minor formatting change. --- applications/solvers/compressible/rhoPisoFoam/pEqn.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/compressible/rhoPisoFoam/pEqn.H b/applications/solvers/compressible/rhoPisoFoam/pEqn.H index b506245034..05db89627d 100644 --- a/applications/solvers/compressible/rhoPisoFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPisoFoam/pEqn.H @@ -34,7 +34,7 @@ if (transonic) } else { - phi = + phi = fvc::interpolate(rho)* ( (fvc::interpolate(U) & mesh.Sf()) From 4d02f410b4c3b9ba9c90426f9a60df9cefbd9e20 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 12:27:36 +0000 Subject: [PATCH 4/6] Moved setDeltaT to before the flux is made absolute. --- .../solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C | 3 ++- applications/solvers/multiphase/interDyMFoam/interDyMFoam.C | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C index 8ed5017eaf..42aae85309 100644 --- a/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleDyMFoam/pimpleDyMFoam.C @@ -60,11 +60,12 @@ int main(int argc, char *argv[]) { # include "readControls.H" # include "CourantNo.H" -# include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); +# include "setDeltaT.H" + runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C index 496db6e226..0ea32adcc8 100644 --- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C +++ b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C @@ -65,11 +65,12 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" - #include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); + #include "setDeltaT.H" + runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; From 1d22ab652e0aa16869b097465a53475161cbe012 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 12:28:19 +0000 Subject: [PATCH 5/6] Corrected the code for moving-mesh cases with dilatation. --- .../multiphase/compressibleInterDyMFoam/Make/options | 7 ++----- .../compressibleInterDyMFoam/alphaEqnsSubCycle.H | 2 -- .../compressibleInterDyMFoam/compressibleInterDyMFoam.C | 4 ++-- .../multiphase/compressibleInterDyMFoam/correctPhi.H | 1 - .../solvers/multiphase/compressibleInterDyMFoam/pEqn.H | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options index 18b09d886b..13d31339e4 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/Make/options @@ -8,8 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude EXE_LIBS = \ -linterfaceProperties \ @@ -19,7 +18,5 @@ EXE_LIBS = \ -lfiniteVolume \ -ldynamicMesh \ -lmeshTools \ - -ldynamicFvMesh \ - -lsampling - + -ldynamicFvMesh diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H index 32a7163130..e161a3cbe6 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/alphaEqnsSubCycle.H @@ -12,9 +12,7 @@ surfaceScalarField phic = mag(phi/mesh.magSf()); phic = min(interface.cAlpha()*phic, max(phic)); - fvc::makeAbsolute(phi, U); volScalarField divU = fvc::div(phi); - fvc::makeRelative(phi, U); if (nAlphaSubCycles > 1) { diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C index 6252c1d22d..e24de6658d 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/compressibleInterDyMFoam.C @@ -42,7 +42,6 @@ Description #include "interfaceProperties.H" #include "twoPhaseMixture.H" #include "turbulenceModel.H" -#include "probes.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -65,11 +64,12 @@ int main(int argc, char *argv[]) { #include "readControls.H" #include "CourantNo.H" - #include "setDeltaT.H" // Make the fluxes absolute fvc::makeAbsolute(phi, U); + #include "setDeltaT.H" + runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H index f71b0fb7c5..4152105784 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H @@ -27,7 +27,6 @@ fvm::laplacian(rAUf, pcorr) == fvc::div(phi) - divU ); - pcorrEqn.setReference(0, 0); pcorrEqn.solve(); if (nonOrth == nNonOrthCorr) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H index b0f3378408..013d8eb05f 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H @@ -21,7 +21,7 @@ surfaceScalarField phiU ( "phiU", - (fvc::interpolate(U) & mesh.Sf()) + (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) ); phi = phiU + From 9663072b5f8ba77b780c20b6b49d5edc796d7147 Mon Sep 17 00:00:00 2001 From: henry Date: Fri, 12 Dec 2008 15:06:04 +0000 Subject: [PATCH 6/6] Removed ddtPhiCorr. --- applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H index 013d8eb05f..b0f3378408 100644 --- a/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleInterDyMFoam/pEqn.H @@ -21,7 +21,7 @@ surfaceScalarField phiU ( "phiU", - (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) + (fvc::interpolate(U) & mesh.Sf()) ); phi = phiU +