From e86258bc4eafbb134cb9128ae21a89a504892d79 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 10 Dec 2012 10:50:47 +0000 Subject: [PATCH] ENH: Updated sources for compressible solvers --- applications/solvers/compressible/rhoPimpleFoam/EEqn.H | 4 ++++ applications/solvers/compressible/rhoPimpleFoam/UEqn.H | 2 ++ applications/solvers/compressible/rhoSimpleFoam/EEqn.H | 4 ++++ applications/solvers/compressible/rhoSimpleFoam/UEqn.H | 4 ++++ .../compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H | 4 ++++ .../compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H | 4 ++++ 6 files changed, 22 insertions(+) diff --git a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H index 1cc6ed584c..712a3a9ab4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/EEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/EEqn.H @@ -21,8 +21,12 @@ ); EEqn.relax(); + sources.constrain(EEqn); + EEqn.solve(); + sources.correct(he); + thermo.correct(); } diff --git a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H index e4fa5cd6b3..daa25ac316 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/UEqn.H @@ -16,5 +16,7 @@ sources.constrain(UEqn()); if (pimple.momentumPredictor()) { solve(UEqn() == -fvc::grad(p)); + + sources.correct(U); K = 0.5*magSqr(U); } diff --git a/applications/solvers/compressible/rhoSimpleFoam/EEqn.H b/applications/solvers/compressible/rhoSimpleFoam/EEqn.H index e496906d08..7adacc8fd1 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/EEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/EEqn.H @@ -15,8 +15,12 @@ ); EEqn.relax(); + sources.constrain(EEqn); + EEqn.solve(); + sources.correct(he); + thermo.correct(); } diff --git a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H index 8bbd960281..c01b4d7984 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/UEqn.H @@ -10,4 +10,8 @@ UEqn().relax(); + sources.constrain(UEqn()); + solve(UEqn() == -fvc::grad(p)); + + sources.correct(U); diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H index e496906d08..7adacc8fd1 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H @@ -15,8 +15,12 @@ ); EEqn.relax(); + sources.constrain(EEqn); + EEqn.solve(); + sources.correct(he); + thermo.correct(); } diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H index 52e15e07b5..e1c964a179 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H @@ -33,6 +33,8 @@ U = trTU() & ((UEqn() == sources(rho, U))().H() - gradp); } U.correctBoundaryConditions(); + + sources.correct(U); } else { @@ -42,6 +44,8 @@ solve(UEqn() == -fvc::grad(p) + sources(rho, U)); + sources.correct(U); + trAU = 1.0/UEqn().A(); trAU().rename("rAU"); }