From a0eeb3f09d09876247631e2f19eb4bd2bdcbcb61 Mon Sep 17 00:00:00 2001 From: andy <andy> Date: Mon, 10 Dec 2012 10:16:49 +0000 Subject: [PATCH] ENH: Removed unused entry from tutorial input dictionary --- applications/solvers/combustion/XiFoam/EaEqn.H | 2 ++ applications/solvers/combustion/XiFoam/EauEqn.H | 11 ++++++++++- applications/solvers/combustion/XiFoam/UEqn.H | 2 ++ applications/solvers/combustion/XiFoam/bEqn.H | 6 ++++++ applications/solvers/combustion/XiFoam/ftEqn.H | 2 ++ applications/solvers/combustion/engineFoam/UEqn.H | 2 ++ applications/solvers/combustion/fireFoam/UEqn.H | 1 + applications/solvers/combustion/fireFoam/YEEqn.H | 4 ++++ applications/solvers/combustion/fireFoam/rhoEqn.H | 4 +++- applications/solvers/combustion/reactingFoam/EEqn.H | 2 ++ applications/solvers/combustion/reactingFoam/UEqn.H | 2 ++ applications/solvers/combustion/reactingFoam/YEqn.H | 2 ++ .../pimpleFoam/channel395/constant/sourcesProperties | 1 - 13 files changed, 38 insertions(+), 3 deletions(-) diff --git a/applications/solvers/combustion/XiFoam/EaEqn.H b/applications/solvers/combustion/XiFoam/EaEqn.H index 5493722c937..2565e3f9e3a 100644 --- a/applications/solvers/combustion/XiFoam/EaEqn.H +++ b/applications/solvers/combustion/XiFoam/EaEqn.H @@ -25,5 +25,7 @@ EaEqn.solve(); + sources.correct(hea); + thermo.correct(); } diff --git a/applications/solvers/combustion/XiFoam/EauEqn.H b/applications/solvers/combustion/XiFoam/EauEqn.H index b13a63bb60b..d3ae73d7238 100644 --- a/applications/solvers/combustion/XiFoam/EauEqn.H +++ b/applications/solvers/combustion/XiFoam/EauEqn.H @@ -2,7 +2,7 @@ if (ign.ignited()) { volScalarField& heau = thermo.heu(); - solve + fvScalarMatrix heauEqn ( fvm::ddt(rho, heau) + mvConvection->fvmDiv(phi, heau) + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou() @@ -23,5 +23,14 @@ if (ign.ignited()) // A possible solution would be to solve for ftu as well as ft. //- fvm::div(muEff*fvc::grad(b)/(b + 0.001), heau) //+ fvm::Sp(fvc::div(muEff*fvc::grad(b)/(b + 0.001)), heau) + + == + sources(heau) ); + + sources.constrain(heauEqn); + + heauEqn.solve(); + + sources.correct(heau); } diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 643a99f1343..95f10bfcc96 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -15,5 +15,7 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + + sources.correct(U); K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H index 49c2c63ae7c..e10be7b6dfa 100644 --- a/applications/solvers/combustion/XiFoam/bEqn.H +++ b/applications/solvers/combustion/XiFoam/bEqn.H @@ -71,6 +71,8 @@ if (ign.ignited()) bEqn.solve(); + sources.correct(b); + Info<< "min(b) = " << min(b).value() << endl; @@ -167,6 +169,8 @@ if (ign.ignited()) SuEqn.solve(); + sources.correct(Su); + // Limit the maximum Su // ~~~~~~~~~~~~~~~~~~~~ Su.min(SuMax); @@ -252,6 +256,8 @@ if (ign.ignited()) XiEqn.solve(); + sources.correct(Xi); + // Correct boundedness of Xi // ~~~~~~~~~~~~~~~~~~~~~~~~~ Xi.max(1.0); diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H index da1d76fe690..013e8b3180f 100644 --- a/applications/solvers/combustion/XiFoam/ftEqn.H +++ b/applications/solvers/combustion/XiFoam/ftEqn.H @@ -25,4 +25,6 @@ if (composition.contains("ft")) sources.constrain(ftEqn); ftEqn.solve(); + + sources.correct(ft); } diff --git a/applications/solvers/combustion/engineFoam/UEqn.H b/applications/solvers/combustion/engineFoam/UEqn.H index de3dc757ccf..a8b02072255 100644 --- a/applications/solvers/combustion/engineFoam/UEqn.H +++ b/applications/solvers/combustion/engineFoam/UEqn.H @@ -10,5 +10,7 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + + sources.correct(U); K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H index 90e633fc366..81d90bd695e 100644 --- a/applications/solvers/combustion/fireFoam/UEqn.H +++ b/applications/solvers/combustion/fireFoam/UEqn.H @@ -27,5 +27,6 @@ ) ); + sources.correct(U); K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index a23f99dab74..358e4953d1a 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -39,6 +39,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection YiEqn.solve(mesh.solver("Yi")); + sources.correct(Yi); + Yi.max(0.0); Yt += Yi; } @@ -82,6 +84,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection EEqn.solve(); + sources.correct(he); + thermo.correct(); Info<< "min/max(T) = " diff --git a/applications/solvers/combustion/fireFoam/rhoEqn.H b/applications/solvers/combustion/fireFoam/rhoEqn.H index c465309edbc..5cc780abb1d 100644 --- a/applications/solvers/combustion/fireFoam/rhoEqn.H +++ b/applications/solvers/combustion/fireFoam/rhoEqn.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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,6 +43,8 @@ Description sources.constrain(rhoEqn); rhoEqn.solve(); + + sources.correct(rho); } // ************************************************************************* // diff --git a/applications/solvers/combustion/reactingFoam/EEqn.H b/applications/solvers/combustion/reactingFoam/EEqn.H index 5568c7e5be7..c3f25da17d4 100644 --- a/applications/solvers/combustion/reactingFoam/EEqn.H +++ b/applications/solvers/combustion/reactingFoam/EEqn.H @@ -28,6 +28,8 @@ EEqn.solve(); + sources.correct(he); + thermo.correct(); Info<< "min/max(T) = " diff --git a/applications/solvers/combustion/reactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/UEqn.H index 643a99f1343..95f10bfcc96 100644 --- a/applications/solvers/combustion/reactingFoam/UEqn.H +++ b/applications/solvers/combustion/reactingFoam/UEqn.H @@ -15,5 +15,7 @@ if (pimple.momentumPredictor()) { solve(UEqn == -fvc::grad(p)); + + sources.correct(U); K = 0.5*magSqr(U); } diff --git a/applications/solvers/combustion/reactingFoam/YEqn.H b/applications/solvers/combustion/reactingFoam/YEqn.H index 2f0d29fd849..c9b4942a5ba 100644 --- a/applications/solvers/combustion/reactingFoam/YEqn.H +++ b/applications/solvers/combustion/reactingFoam/YEqn.H @@ -37,6 +37,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection YiEqn.solve(mesh.solver("Yi")); + sources.correct(Yi); + Yi.max(0.0); Yt += Yi; } diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties index 708bdbd63cc..501ab02cb1a 100644 --- a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties +++ b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties @@ -27,7 +27,6 @@ momentumSource { fieldNames (U); Ubar ( 0.1335 0 0 ); - gradP 0; } } -- GitLab