diff --git a/applications/solvers/cfdemSolverPimple/UEqn.H b/applications/solvers/cfdemSolverPimple/UEqn.H index 5d615d86..ee28494a 100644 --- a/applications/solvers/cfdemSolverPimple/UEqn.H +++ b/applications/solvers/cfdemSolverPimple/UEqn.H @@ -3,7 +3,7 @@ particleCloud.otherForces(fOther); tmp tUEqn ( fvm::ddt(voidfraction,U) - fvm::Sp(fvc::ddt(voidfraction),U) - + fvm::div(phi,U) - fvm::Sp(fvc::div(phi),U) + + fvm::div(phi,U) - fvm::Sp(fvc::div(phi),U) - fOther/rho == fvOptions(U) @@ -24,7 +24,7 @@ surfaceScalarField voidfractionf = fvc::interpolate(voidfraction); surfaceScalarField phicForces ( - fvc::interpolate(rUA*(Ksl*Us)/rho) & mesh.Sf() + fvc::interpolate(rUA*(Ksl*Us)/rho) & mesh.Sf() ); if (pimple.momentumPredictor() && (modelType=="B" || modelType=="Bfull")) diff --git a/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C b/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C index 91572c5d..2afc59ca 100644 --- a/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C +++ b/applications/solvers/cfdemSolverPimple/cfdemSolverPimple.C @@ -32,6 +32,7 @@ Description Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. The code is an evolution of the solver pimpleFoam in OpenFOAM(R) 6.0, where additional functionality for CFD-DEM coupling is added. + \*---------------------------------------------------------------------------*/ #include "fvCFD.H" @@ -104,7 +105,7 @@ int main(int argc, char *argv[]) while (pimple.loop()) { // Momentum predictor - #include "UEqn.H" + #include "UEqn.H" // --- Inner PIMPLE loop @@ -123,7 +124,7 @@ int main(int argc, char *argv[]) } runTime.write(); - + Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; diff --git a/applications/solvers/cfdemSolverPimple/createFields.H b/applications/solvers/cfdemSolverPimple/createFields.H index e8df010a..4d3fd024 100644 --- a/applications/solvers/cfdemSolverPimple/createFields.H +++ b/applications/solvers/cfdemSolverPimple/createFields.H @@ -1,7 +1,7 @@ //=============================== // Fluid Fields -//=============================== - +//=============================== + Info<< "Reading field p\n" << endl; volScalarField p ( @@ -110,34 +110,34 @@ #ifndef createPhi_H #define createPhi_H -Info<< "Reading/calculating face flux field phi\n" << endl; -surfaceScalarField phi -( - IOobject + Info<< "Reading/calculating face flux field phi\n" << endl; + surfaceScalarField phi ( - "phi", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - linearInterpolate(U*voidfraction) & mesh.Sf() -); + IOobject + ( + "phi", + runTime.timeName(), + mesh, + IOobject::READ_IF_PRESENT, + IOobject::AUTO_WRITE + ), + linearInterpolate(U*voidfraction) & mesh.Sf() + ); #endif - Info<< "Generating interstitial flux field phiByVoidfraction (this is the INTERSTITIAL field!)\n" << endl; - surfaceScalarField phiByVoidfraction - ( - IOobject - ( - "phiByVoidfraction", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - linearInterpolate(U) & mesh.Sf() - ); + Info<< "Generating interstitial(!) flux field phiByVoidfraction\n" << endl; + surfaceScalarField phiByVoidfraction + ( + IOobject + ( + "phiByVoidfraction", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + linearInterpolate(U) & mesh.Sf() + ); label pRefCell = 0;