exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean-up

Browse source
This commit is contained in:
Hrvoje Jasak 2011-05-27 11:37:39 +01:00
parent be69d6f0bb
commit ed5f5d070e
5 changed files with 30 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/solvers/compressible/rhoPisoFoam/rhoPisoFoam.C
View file

@ -68,7 +68,7 @@ int main(int argc, char *argv[])
#include "UEqn.H" #include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=1; corr<=nCorr; corr++) for (int corr = 1; corr <= nCorr; corr++)
{ {
#include "hEqn.H" #include "hEqn.H"
#include "pEqn.H" #include "pEqn.H"

2
applications/solvers/multiphase/bubbleFoam/bubbleFoam.C
View file

@ -65,7 +65,7 @@ int main(int argc, char *argv[])
// --- PISO loop // --- PISO loop
for (int corr=0; corr<nCorr; corr++) for (int corr = 0; corr < nCorr; corr++)
{ {
# include "pEqn.H" # include "pEqn.H"

8
applications/solvers/multiphase/bubbleFoam/pEqn.H
View file

@ -32,9 +32,13 @@
phi = alphaf*phia + betaf*phib; phi = alphaf*phia + betaf*phib;
surfaceScalarField Dp("(rho*(1|A(U)))", alphaf*rUaAf/rhoa + betaf*rUbAf/rhob); surfaceScalarField Dp
(
"(rho*(1|A(U)))",
alphaf*rUaAf/rhoa + betaf*rUbAf/rhob
);
for(int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) for(int nonOrth = 0; nonOrth <= nNonOrthCorr; nonOrth++)
{ {
fvScalarMatrix pEqn fvScalarMatrix pEqn
( (

42
applications/solvers/multiphase/interMixingFoam/interMixingFoam.C
View file

@ -42,17 +42,17 @@ Description
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#include "setRootCase.H" # include "setRootCase.H"
#include "createTime.H" # include "createTime.H"
#include "createMesh.H" # include "createMesh.H"
#include "readGravitationalAcceleration.H" # include "readGravitationalAcceleration.H"
#include "readPISOControls.H" # include "readPISOControls.H"
#include "initContinuityErrs.H" # include "initContinuityErrs.H"
#include "createFields.H" # include "createFields.H"
#include "readTimeControls.H" # include "readTimeControls.H"
#include "CourantNo.H" # include "CourantNo.H"
#include "setInitialDeltaT.H" # include "setInitialDeltaT.H"
#include "correctPhi.H" # include "correctPhi.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -60,10 +60,10 @@ int main(int argc, char *argv[])
while (runTime.run()) while (runTime.run())
{ {
#include "readPISOControls.H" # include "readPISOControls.H"
#include "readTimeControls.H" # include "readTimeControls.H"
#include "CourantNo.H" # include "CourantNo.H"
#include "setDeltaT.H" # include "setDeltaT.H"
runTime++; runTime++;
@ -71,18 +71,18 @@ int main(int argc, char *argv[])
threePhaseProperties.correct(); threePhaseProperties.correct();
#include "alphaEqnsSubCycle.H" # include "alphaEqnsSubCycle.H"
#define twoPhaseProperties threePhaseProperties # define twoPhaseProperties threePhaseProperties
#include "UEqn.H" # include "UEqn.H"
// --- PISO loop // --- PISO loop
for (int corr=0; corr<nCorr; corr++) for (int corr = 0; corr < nCorr; corr++)
{ {
#include "pEqn.H" # include "pEqn.H"
} }
#include "continuityErrs.H" # include "continuityErrs.H"
turbulence->correct(); turbulence->correct();