diff --git a/applications/solvers/cfdemSolverRhoSimple/Make/files b/applications/solvers/cfdemSolverRhoSimple/Make/files deleted file mode 100644 index d9db0744..00000000 --- a/applications/solvers/cfdemSolverRhoSimple/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -cfdemSolverRhoSimple.C - -EXE=$(CFDEM_APP_DIR)/cfdemSolverRhoSimple diff --git a/applications/solvers/cfdemSolverRhoSimple/EEqn.H b/applications/solvers/cfdemSolverRhoSteadyPimple/EEqn.H similarity index 100% rename from applications/solvers/cfdemSolverRhoSimple/EEqn.H rename to applications/solvers/cfdemSolverRhoSteadyPimple/EEqn.H diff --git a/applications/solvers/cfdemSolverRhoSteadyPimple/Make/files b/applications/solvers/cfdemSolverRhoSteadyPimple/Make/files new file mode 100644 index 00000000..36bb9c95 --- /dev/null +++ b/applications/solvers/cfdemSolverRhoSteadyPimple/Make/files @@ -0,0 +1,3 @@ +cfdemSolverRhoSteadyPimple.C + +EXE=$(CFDEM_APP_DIR)/cfdemSolverRhoSteadyPimple diff --git a/applications/solvers/cfdemSolverRhoSimple/Make/options b/applications/solvers/cfdemSolverRhoSteadyPimple/Make/options similarity index 100% rename from applications/solvers/cfdemSolverRhoSimple/Make/options rename to applications/solvers/cfdemSolverRhoSteadyPimple/Make/options diff --git a/applications/solvers/cfdemSolverRhoSimple/UEqn.H b/applications/solvers/cfdemSolverRhoSteadyPimple/UEqn.H similarity index 100% rename from applications/solvers/cfdemSolverRhoSimple/UEqn.H rename to applications/solvers/cfdemSolverRhoSteadyPimple/UEqn.H diff --git a/applications/solvers/cfdemSolverRhoSimple/cfdemSolverRhoSimple.C b/applications/solvers/cfdemSolverRhoSteadyPimple/cfdemSolverRhoSteadyPimple.C similarity index 78% rename from applications/solvers/cfdemSolverRhoSimple/cfdemSolverRhoSimple.C rename to applications/solvers/cfdemSolverRhoSteadyPimple/cfdemSolverRhoSteadyPimple.C index 4e1821fc..d86c4706 100644 --- a/applications/solvers/cfdemSolverRhoSimple/cfdemSolverRhoSimple.C +++ b/applications/solvers/cfdemSolverRhoSteadyPimple/cfdemSolverRhoSteadyPimple.C @@ -31,11 +31,12 @@ Description #include "psiThermo.H" #include "turbulentFluidThermoModel.H" #include "bound.H" -#include "simpleControl.H" +#include "pimpleControl.H" #include "fvOptions.H" #include "localEulerDdtScheme.H" #include "fvcSmooth.H" + #include "cfdemCloudEnergy.H" #include "implicitCouple.H" #include "clockModel.H" @@ -68,13 +69,21 @@ int main(int argc, char *argv[]) #include "checkModelType.H" turbulence->validate(); + // #include "compressibleCourantNo.H" + // #include "setInitialDeltaT.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; - while (simple.loop()) + while (runTime.run()) { + #include "readTimeControls.H" + #include "compressibleCourantNo.H" + #include "setDeltaT.H" + + runTime++; + particleCloud.clockM().start(1,"Global"); Info<< "Time = " << runTime.timeName() << nl << endl; @@ -103,23 +112,38 @@ int main(int argc, char *argv[]) particleCloud.clockM().stop("Coupling"); particleCloud.clockM().start(26,"Flow"); - volScalarField rhoeps("rhoeps",rho*voidfraction); - // Pressure-velocity SIMPLE corrector - - #include "UEqn.H" + while (pimple.loop()) + { + // if needed, perform drag update here + if (pimple.nCorrPIMPLE() <= 1) + { + #include "rhoEqn.H" + } - // besides this pEqn, OF offers a "simple consistent"-option - #include "pEqn.H" - rhoeps=rho*voidfraction; + // --- Pressure-velocity PIMPLE corrector loop - #include "EEqn.H" + #include "UEqn.H" + #include "EEqn.H" - turbulence->correct(); + // --- Pressure corrector loop + while (pimple.correct()) + { + // besides this pEqn, OF offers a "pimple consistent"-option + #include "pEqn.H" + rhoeps=rho*voidfraction; + } - particleCloud.clockM().start(32,"postFlow"); - if(hasEvolved) particleCloud.postFlow(); + if (pimple.turbCorr()) + { + turbulence->correct(); + } + } + particleCloud.clockM().stop("Flow"); + + particleCloud.clockM().start(31,"postFlow"); + particleCloud.postFlow(); particleCloud.clockM().stop("postFlow"); runTime.write(); @@ -129,7 +153,7 @@ int main(int argc, char *argv[]) << " ClockTime = " << runTime.elapsedClockTime() << " s" << nl << endl; - particleCloud.clockM().stop("Flow"); + particleCloud.clockM().stop("Global"); } diff --git a/applications/solvers/cfdemSolverRhoSimple/createFieldRefs.H b/applications/solvers/cfdemSolverRhoSteadyPimple/createFieldRefs.H similarity index 100% rename from applications/solvers/cfdemSolverRhoSimple/createFieldRefs.H rename to applications/solvers/cfdemSolverRhoSteadyPimple/createFieldRefs.H diff --git a/applications/solvers/cfdemSolverRhoSimple/createFields.H b/applications/solvers/cfdemSolverRhoSteadyPimple/createFields.H similarity index 97% rename from applications/solvers/cfdemSolverRhoSimple/createFields.H rename to applications/solvers/cfdemSolverRhoSteadyPimple/createFields.H index a9225229..2219870f 100644 --- a/applications/solvers/cfdemSolverRhoSimple/createFields.H +++ b/applications/solvers/cfdemSolverRhoSteadyPimple/createFields.H @@ -158,7 +158,7 @@ Info<< "Reading thermophysical properties\n" << endl; dimensionedScalar::lookupOrDefault ( "rhoMax", - simple.dict(), + pimple.dict(), dimDensity, GREAT ) @@ -169,7 +169,7 @@ Info<< "Reading thermophysical properties\n" << endl; dimensionedScalar::lookupOrDefault ( "rhoMin", - simple.dict(), + pimple.dict(), dimDensity, 0 ) @@ -189,7 +189,7 @@ Info<< "Reading thermophysical properties\n" << endl; label pRefCell = 0; scalar pRefValue = 0.0; - setRefCell(p, simple.dict(), pRefCell, pRefValue); + setRefCell(p, pimple.dict(), pRefCell, pRefValue); mesh.setFluxRequired(p.name()); diff --git a/applications/solvers/cfdemSolverRhoSimple/pEqn.H b/applications/solvers/cfdemSolverRhoSteadyPimple/pEqn.H similarity index 92% rename from applications/solvers/cfdemSolverRhoSimple/pEqn.H rename to applications/solvers/cfdemSolverRhoSteadyPimple/pEqn.H index 5b2dbcbd..3d38cc82 100644 --- a/applications/solvers/cfdemSolverRhoSimple/pEqn.H +++ b/applications/solvers/cfdemSolverRhoSteadyPimple/pEqn.H @@ -14,7 +14,7 @@ volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); surfaceScalarField phiUs("phiUs", fvc::interpolate(rhoeps*rAU*Ksl*Us)& mesh.Sf()); -if (simple.transonic()) +if (pimple.transonic()) { // transonic version not implemented yet } @@ -34,7 +34,7 @@ else // Update the pressure BCs to ensure flux consistency constrainPressure(p, rhoeps, U, phi, rhorAUf); - while (simple.correctNonOrthogonal()) + while (pimple.correctNonOrthogonal()) { // Pressure corrector fvScalarMatrix pEqn @@ -49,7 +49,7 @@ else pEqn.solve(); - if (simple.finalNonOrthogonalIter()) + if (pimple.finalNonOrthogonalIter()) { phi += pEqn.flux(); } @@ -78,4 +78,4 @@ else U.correctBoundaryConditions(); fvOptions.correct(U); -K = 0.5*magSqr(U); \ No newline at end of file +K = 0.5*magSqr(U); diff --git a/etc/solver-list.txt b/etc/solver-list.txt index f849a120..825ce9ab 100644 --- a/etc/solver-list.txt +++ b/etc/solver-list.txt @@ -7,6 +7,6 @@ cfdemSolverRhoPimple/dir cfdemSolverPisoMS/dir cfdemSolverPiso/dir cfdemSolverRhoPimple/dir -cfdemSolverRhoSimple/dir +cfdemSolverRhoSteadyPimple/dir cfdemSolverIB/dir cfdemSolverPisoScalar/dir