zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of dm:/home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
opencfd
2012-12-10 17:09:34 +00:00
parent 391a703b90 9e81cba908
commit de29a1ed27
177 changed files with 619 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/XiFoam/EaEqn.H
View File

@ -25,5 +25,7 @@
EaEqn.solve();
sources.correct(hea);
thermo.correct();
}

11
applications/solvers/combustion/XiFoam/EauEqn.H
View File

@ -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(rho, heau)
);
sources.constrain(heauEqn);
heauEqn.solve();
sources.correct(heau);
}

2
applications/solvers/combustion/XiFoam/UEqn.H
View File

@ -15,5 +15,7 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

1
applications/solvers/combustion/XiFoam/XiFoam.C
View File

@ -69,6 +69,7 @@ int main(int argc, char *argv[])
#include "readCombustionProperties.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "compressibleCourantNo.H"

6
applications/solvers/combustion/XiFoam/bEqn.H
View File

@ -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);

2
applications/solvers/combustion/XiFoam/createFields.H
View File

@ -138,5 +138,3 @@
fields.add(b);
fields.add(thermo.he());
fields.add(thermo.heu());
IObasicSourceList sources(mesh);

2
applications/solvers/combustion/XiFoam/ftEqn.H
View File

@ -25,4 +25,6 @@ if (composition.contains("ft"))
sources.constrain(ftEqn);
ftEqn.solve();
sources.correct(ft);
}

1
applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C
View File

@ -47,6 +47,7 @@ int main(int argc, char *argv[])
#include "createEngineTime.H"
#include "createEngineMesh.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readEngineTimeControls.H"
#include "compressibleCourantNo.H"

3
applications/solvers/combustion/coldEngineFoam/createFields.H
View File

@ -69,6 +69,3 @@
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

2
applications/solvers/combustion/engineFoam/UEqn.H
View File

@ -10,5 +10,7 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

1
applications/solvers/combustion/engineFoam/engineFoam.C
View File

@ -71,6 +71,7 @@ int main(int argc, char *argv[])
#include "createEngineMesh.H"
#include "readCombustionProperties.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readEngineTimeControls.H"
#include "compressibleCourantNo.H"

1
applications/solvers/combustion/fireFoam/UEqn.H
View File

@ -27,5 +27,6 @@
)
);
sources.correct(U);
K = 0.5*magSqr(U);
}

4
applications/solvers/combustion/fireFoam/YEEqn.H
View File

@ -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) = "

3
applications/solvers/combustion/fireFoam/createFields.H
View File

@ -146,6 +146,3 @@
(
additionalControlsDict.lookup("solvePrimaryRegion")
);
IObasicSourceList sources(mesh);

1
applications/solvers/combustion/fireFoam/fireFoam.C
View File

@ -52,6 +52,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "createClouds.H"
#include "createSurfaceFilmModel.H"
#include "createPyrolysisModel.H"

4
applications/solvers/combustion/fireFoam/rhoEqn.H
View File

@ -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);
}
// ************************************************************************* //

2
applications/solvers/combustion/reactingFoam/EEqn.H
View File

@ -28,6 +28,8 @@
EEqn.solve();
sources.correct(he);
thermo.correct();
Info<< "min/max(T) = "

2
applications/solvers/combustion/reactingFoam/UEqn.H
View File

@ -15,5 +15,7 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

2
applications/solvers/combustion/reactingFoam/YEqn.H
View File

@ -37,6 +37,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
YiEqn.solve(mesh.solver("Yi"));
sources.correct(Yi);
Yi.max(0.0);
Yt += Yi;
}

2
applications/solvers/combustion/reactingFoam/createFields.H
View File

@ -99,5 +99,3 @@ volScalarField dQ
mesh,
dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
);
IObasicSourceList sources(mesh);

1
applications/solvers/combustion/reactingFoam/reactingFoam.C
View File

@ -45,6 +45,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "compressibleCourantNo.H"

2
applications/solvers/combustion/rhoReactingFoam/createFields.H
View File

@ -101,5 +101,3 @@ volScalarField dQ
mesh,
dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
);
IObasicSourceList sources(mesh);

1
applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C
View File

@ -46,6 +46,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "compressibleCourantNo.H"

4
applications/solvers/compressible/rhoPimpleFoam/EEqn.H
View File

@ -21,8 +21,12 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
}

2
applications/solvers/compressible/rhoPimpleFoam/UEqn.H
View File

@ -16,5 +16,7 @@ sources.constrain(UEqn());
if (pimple.momentumPredictor())
{
solve(UEqn() == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

3
applications/solvers/compressible/rhoPimpleFoam/createFields.H
View File

@ -69,6 +69,3 @@
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

1
applications/solvers/compressible/rhoPimpleFoam/rhoLTSPimpleFoam/rhoLTSPimpleFoam.C
View File

@ -54,6 +54,7 @@ int main(int argc, char *argv[])
#include "setInitialrDeltaT.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
View File

@ -51,6 +51,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/rhoPimplecFoam.C
View File

@ -51,6 +51,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
applications/solvers/compressible/rhoSimpleFoam/Allwclean
View File

@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
set -x
wclean
wclean rhoPorousMRFSimpleFoam
wclean rhoPorousSimpleFoam
wclean rhoSimplecFoam
# ----------------------------------------------------------------- end-of-file

2
applications/solvers/compressible/rhoSimpleFoam/Allwmake
View File

@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory
set -x
wmake
wmake rhoPorousMRFSimpleFoam
wmake rhoPorousSimpleFoam
wmake rhoSimplecFoam
# ----------------------------------------------------------------- end-of-file

4
applications/solvers/compressible/rhoSimpleFoam/EEqn.H
View File

@ -15,8 +15,12 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
}

4
applications/solvers/compressible/rhoSimpleFoam/UEqn.H
View File

@ -10,4 +10,8 @@
UEqn().relax();
sources.constrain(UEqn());
solve(UEqn() == -fvc::grad(p));
sources.correct(U);

3
applications/solvers/compressible/rhoSimpleFoam/createFields.H
View File

@ -60,6 +60,3 @@
);
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

4
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/EEqn.H
View File

@ -15,8 +15,12 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
}

4
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H
View File

@ -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");
}

3
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
View File

@ -59,6 +59,3 @@
);
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

1
applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
View File

@ -50,6 +50,7 @@ int main(int argc, char *argv[])
simpleControl simple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "createZones.H"
#include "initContinuityErrs.H"

1
applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
View File

@ -47,6 +47,7 @@ int main(int argc, char *argv[])
simpleControl simple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/rhoSimplecFoam.C
View File

@ -49,6 +49,7 @@ int main(int argc, char *argv[])
simpleControl simple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

4
applications/solvers/heatTransfer/buoyantPimpleFoam/EEqn.H
View File

@ -21,8 +21,12 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
}

2
applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H
View File

@ -27,5 +27,7 @@
)*mesh.magSf()
)
);
sources.correct(U);
K = 0.5*magSqr(U);
}

1
applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
View File

@ -49,6 +49,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"

3
applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H
View File

@ -86,6 +86,3 @@
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

2
applications/solvers/heatTransfer/buoyantSimpleFoam/EEqn.H
View File

@ -21,6 +21,8 @@
EEqn.solve();
sources.correct(he);
thermo.correct();
radiation->correct();
}

2
applications/solvers/heatTransfer/buoyantSimpleFoam/UEqn.H
View File

@ -26,4 +26,6 @@
)*mesh.magSf()
)
);
sources.correct(U);
}

1
applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
View File

@ -46,6 +46,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"

2
applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H
View File

@ -87,5 +87,3 @@
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
dimensionedScalar totalVolume = sum(mesh.V());
IObasicSourceList sources(mesh);

1
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C
View File

@ -45,7 +45,6 @@ Description
#include "solidRegionDiffNo.H"
#include "solidThermo.H"
#include "radiationModel.H"
#include "IOporosityModelList.H"
#include "IObasicSourceList.H"

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/EEqn.H
View File

@ -21,6 +21,8 @@
EEqn.solve();
sources.correct(he);
thermo.correct();
rad.correct();

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/UEqn.H
View File

@ -23,3 +23,5 @@
)*mesh.magSf()
)
);
sources.correct(U);

4
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
View File

@ -17,7 +17,7 @@
PtrList<dimensionedScalar> rhoMax(fluidRegions.size());
PtrList<dimensionedScalar> rhoMin(fluidRegions.size());
PtrList<IObasicSourceList> heatSources(fluidRegions.size());
PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
// Populate fluid field pointer lists
forAll(fluidRegions, i)
@ -194,7 +194,7 @@
);
Info<< " Adding sources\n" << endl;
heatSources.set
fluidSources.set
(
i,
new IObasicSourceList(fluidRegions[i])

2
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H
View File

@ -12,7 +12,7 @@
volScalarField& p = thermo.p();
const volScalarField& psi = thermo.psi();
IObasicSourceList& sources = heatSources[i];
IObasicSourceList& sources = fluidSources[i];
const dimensionedScalar initialMass
(

6
applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H
View File

@ -6,8 +6,14 @@
- fvm::laplacian(betav*alpha, h, "laplacian(alpha,h)")
+ sources(rho, h)
);
hEqn.relax();
sources.constrain(hEqn);
hEqn.solve();
sources.correct(h);
}
}

5
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/EEqn.H
View File

@ -22,8 +22,13 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve(mesh.solver(he.select(finalIter)));
sources.correct(he);
thermo.correct();
rad.correct();

5
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H
View File

@ -9,8 +9,7 @@
UEqn().relax();
// Add porous resistance
pZones.addResistance(UEqn());
sources.constrain(UEqn());
if (momentumPredictor)
{
@ -27,5 +26,7 @@
),
mesh.solver(U.select(finalIter))
);
sources.correct(U);
K = 0.5*magSqr(U);
}

12
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H
View File

@ -14,8 +14,7 @@
List<scalar> initialMassFluid(fluidRegions.size());
PtrList<IObasicSourceList> heatSources(fluidRegions.size());
PtrList<IOporosityModelList> porousZonesFluid(fluidRegions.size());
PtrList<IObasicSourceList> fluidSources(fluidRegions.size());
// Populate fluid field pointer lists
forAll(fluidRegions, i)
@ -192,16 +191,9 @@
);
Info<< " Adding sources\n" << endl;
heatSources.set
fluidSources.set
(
i,
new IObasicSourceList(fluidRegions[i])
);
Info<< " Adding porous zones\n" << endl;
porousZonesFluid.set
(
i,
new IOporosityModelList(fluidRegions[i])
);
}

4
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
View File

@ -20,9 +20,7 @@
radiation::radiationModel& rad = radiation[i];
IObasicSourceList& sources = heatSources[i];
const IOporosityModelList& pZones = porousZonesFluid[i];
IObasicSourceList& sources = fluidSources[i];
const dimensionedScalar initialMass
(

2
applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H
View File

@ -19,6 +19,8 @@ if (finalIter)
sources.constrain(hEqn());
hEqn().solve(mesh.solver(h.select(finalIter)));
sources.correct(h);
}
}

3
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
View File

@ -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
@ -47,6 +47,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
pimpleControl pimple(mesh);

2
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/UrelEqn.H
View File

@ -12,3 +12,5 @@
sources.constrain(UrelEqn());
solve(UrelEqn() == -fvc::grad(p) + sources(Urel));
sources.correct(Urel);

3
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
View File

@ -70,6 +70,3 @@ volVectorField U
),
Urel + SRF->U()
);
IObasicSourceList sources(mesh);

2
applications/solvers/incompressible/pimpleFoam/UEqn.H
View File

@ -18,4 +18,6 @@ volScalarField rAU(1.0/UEqn().A());
if (pimple.momentumPredictor())
{
solve(UEqn() == -fvc::grad(p));
sources.correct(U);
}

3
applications/solvers/incompressible/pimpleFoam/createFields.H
View File

@ -40,6 +40,3 @@ autoPtr<incompressible::turbulenceModel> turbulence
(
incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
IObasicSourceList sources(mesh);

2
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H
View File

@ -16,4 +16,6 @@ rAU = 1.0/UEqn().A();
if (pimple.momentumPredictor())
{
solve(UEqn() == -fvc::grad(p) + sources(U));
sources.correct(U);
}

3
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H
View File

@ -56,6 +56,3 @@
runTime.deltaT(),
zeroGradientFvPatchScalarField::typeName
);
IObasicSourceList sources(mesh);

3
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
View File

@ -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
@ -49,6 +49,7 @@ int main(int argc, char *argv[])
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
#include "createFields.H"
#include "createSources.H"
#include "readTimeControls.H"
pimpleControl pimple(mesh);

1
applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
View File

@ -50,6 +50,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
pimpleControl pimple(mesh);

2
applications/solvers/incompressible/potentialFreeSurfaceFoam/UEqn.H
View File

@ -13,4 +13,6 @@ sources.constrain(UEqn());
if (pimple.momentumPredictor())
{
solve(UEqn() == -fvc::grad(p_gh) + sources(U));
sources.correct(U);
}

3
applications/solvers/incompressible/potentialFreeSurfaceFoam/createFields.H
View File

@ -74,6 +74,3 @@
label p_ghRefCell = 0;
scalar p_ghRefValue = 0.0;
setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue);
IObasicSourceList sources(mesh);

3
applications/solvers/incompressible/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
View File

@ -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
@ -52,6 +52,7 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
View File

@ -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
@ -45,6 +45,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
simpleControl simple(mesh);

2
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/UrelEqn.H
View File

@ -14,3 +14,5 @@
sources.constrain(UrelEqn());
solve(UrelEqn() == -fvc::grad(p));
sources.correct(Urel);

7
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
View File

@ -52,9 +52,4 @@
);
Info<< "Creating SRF model\n" << endl;
autoPtr<SRF::SRFModel> SRF
(
SRF::SRFModel::New(Urel)
);
IObasicSourceList sources(mesh);
autoPtr<SRF::SRFModel> SRF(SRF::SRFModel::New(Urel));

2
applications/solvers/incompressible/simpleFoam/UEqn.H
View File

@ -13,3 +13,5 @@
sources.constrain(UEqn());
solve(UEqn() == -fvc::grad(p));
sources.correct(U);

2
applications/solvers/incompressible/simpleFoam/createFields.H
View File

@ -39,5 +39,3 @@
(
incompressible::RASModel::New(U, phi, laminarTransport)
);
IObasicSourceList sources(mesh);

10
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/UEqn.H
View File

@ -12,8 +12,6 @@
UEqn().relax();
sources.constrain(UEqn());
// Include the porous media resistance and solve the momentum equation
// either implicit in the tensorial resistance or transport using by
// including the spherical part of the resistance in the momentum diagonal
@ -28,6 +26,8 @@
trTU = inv(tTU());
trTU().rename("rAU");
sources.constrain(UEqn());
volVectorField gradp(fvc::grad(p));
for (int UCorr=0; UCorr<nUCorr; UCorr++)
@ -35,13 +35,19 @@
U = trTU() & (UEqn().H() - gradp);
}
U.correctBoundaryConditions();
sources.correct(U);
}
else
{
pZones.addResistance(UEqn());
sources.constrain(UEqn());
solve(UEqn() == -fvc::grad(p));
sources.correct(U);
trAU = 1.0/UEqn().A();
trAU().rename("rAU");
}

1
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
View File

@ -50,6 +50,7 @@ int main(int argc, char *argv[])
simpleControl simple(mesh);
#include "createFields.H"
#include "createSources.H"
#include "createZones.H"
#include "initContinuityErrs.H"

3
applications/solvers/incompressible/simpleFoam/simpleFoam.C
View File

@ -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,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
#include "createSources.H"
#include "initContinuityErrs.H"
simpleControl simple(mesh);

4
applications/solvers/lagrangian/coalChemistryFoam/EEqn.H
View File

@ -25,9 +25,13 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
radiation->correct();

2
applications/solvers/lagrangian/coalChemistryFoam/UEqn.H
View File

@ -17,5 +17,7 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

2
applications/solvers/lagrangian/coalChemistryFoam/YEqn.H
View File

@ -39,6 +39,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
YiEqn.solve(mesh.solver("Yi"));
sources.correct(Yi);
Yi.max(0.0);
Yt += Yi;
}

1
applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
View File

@ -55,6 +55,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "createClouds.H"
#include "createRadiationModel.H"
#include "initContinuityErrs.H"

3
applications/solvers/lagrangian/coalChemistryFoam/createFields.H
View File

@ -126,9 +126,6 @@
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
Info<< "\nConstructing sources" << endl;
IObasicSourceList sources(mesh);
volScalarField dQ
(
IOobject

4
applications/solvers/lagrangian/coalChemistryFoam/rhoEqn.H
View File

@ -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
@ -42,6 +42,8 @@ Description
sources.constrain(rhoEqn);
rhoEqn.solve();
sources.correct(rho);
}
// ************************************************************************* //

4
applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H
View File

@ -25,9 +25,13 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
radiation->correct();

2
applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H
View File

@ -26,5 +26,7 @@
)*mesh.magSf()
)
);
sources.correct(U);
K = 0.5*magSqr(U);
}

2
applications/solvers/lagrangian/reactingParcelFilmFoam/YEqn.H
View File

@ -40,6 +40,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
YEqn.solve(mesh.solver("Yi"));
sources.correct(Yi);
Yi.max(0.0);
Yt += Yi;
}

2
applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H
View File

@ -139,5 +139,3 @@
mesh,
dimensionedScalar("dQ", dimEnergy/dimTime, 0.0)
);
IObasicSourceList sources(mesh);

1
applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C
View File

@ -50,6 +50,7 @@ int main(int argc, char *argv[])
#include "createMesh.H"
#include "readGravitationalAcceleration.H"
#include "createFields.H"
#include "createSources.H"
#include "createClouds.H"
#include "createRadiationModel.H"
#include "createSurfaceFilmModel.H"

8
applications/solvers/lagrangian/reactingParcelFilmFoam/rhoEqn.H
View File

@ -30,7 +30,7 @@ Description
\*---------------------------------------------------------------------------*/
{
solve
fvScalarMatrix rhoEqn
(
fvm::ddt(rho)
+ fvc::div(phi)
@ -39,6 +39,12 @@ Description
+ surfaceFilm.Srho()
+ sources(rho)
);
sources.constrain(rhoEqn);
rhoEqn.solve();
sources.correct(rho);
}
// ************************************************************************* //

4
applications/solvers/lagrangian/reactingParcelFoam/EEqn.H
View File

@ -24,9 +24,13 @@
);
EEqn.relax();
sources.constrain(EEqn);
EEqn.solve();
sources.correct(he);
thermo.correct();
radiation->correct();

3
applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/LTSReactingParcelFoam.C
View File

@ -60,11 +60,10 @@ int main(int argc, char *argv[])
#include "readTimeControls.H"
#include "createFields.H"
#include "createSources.H"
#include "createRDeltaT.H"
#include "createRadiationModel.H"
#include "createClouds.H"
#include "createExplicitSources.H"
#include "createPorousZones.H"
#include "initContinuityErrs.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

5
applications/solvers/lagrangian/reactingParcelFoam/UEqn.H
View File

@ -1,6 +1,5 @@
fvVectorMatrix UEqn
(
//pZones.ddt(rho, U)
fvm::ddt(rho, U)
+ fvm::div(phi, U)
+ turbulence->divDevRhoReff(U)
@ -14,10 +13,10 @@
sources.constrain(UEqn);
pZones.addResistance(UEqn);
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

2
applications/solvers/lagrangian/reactingParcelFoam/YEqn.H
View File

@ -38,6 +38,8 @@ tmp<fv::convectionScheme<scalar> > mvConvection
YEqn.solve(mesh.solver("Yi"));
sources.correct(Yi);
Yi.max(0.0);
Yt += Yi;
}

2
applications/solvers/lagrangian/reactingParcelFoam/createExplicitSources.H
View File

@ -1,2 +0,0 @@
Info<< "Creating sources\n" << endl;
IObasicSourceList sources(mesh);

3
applications/solvers/lagrangian/reactingParcelFoam/createPorousZones.H
View File

@ -1,3 +0,0 @@
Info<< "Creating porous zones" << nl << endl;
IOporosityModelList pZones(mesh);

3
applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
View File

@ -64,8 +64,7 @@ int main(int argc, char *argv[])
#include "createFields.H"
#include "createRadiationModel.H"
#include "createClouds.H"
#include "createExplicitSources.H"
#include "createPorousZones.H"
#include "createSources.H"
#include "initContinuityErrs.H"
#include "readTimeControls.H"
#include "compressibleCourantNo.H"

2
applications/solvers/lagrangian/reactingParcelFoam/rhoEqn.H
View File

@ -43,6 +43,8 @@ Description
rhoEqn.solve();
sources.correct(rho);
Info<< "rho min/max = " << min(rho).value() << ", " << max(rho).value()
<< endl;
}

2
applications/solvers/lagrangian/sprayFoam/UEqn.H
View File

@ -16,5 +16,7 @@
if (pimple.momentumPredictor())
{
solve(UEqn == -fvc::grad(p));
sources.correct(U);
K = 0.5*magSqr(U);
}

Some files were not shown because too many files have changed in this diff Show More