diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index bf04c38388..e0394d3c7b 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -78,6 +78,8 @@ int main(int argc, char *argv[]) Info<< "Engine time = " << runTime.theta() << runTime.unit() << endl; + fvModels.preUpdateMesh(); + mesh.move(); #include "rhoEqn.H" diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 93dd6fd81b..e4f4e40482 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -6,7 +6,6 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ @@ -14,10 +13,6 @@ EXE_INC = \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude EXE_LIBS = \ @@ -35,9 +30,4 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lchemistryModel \ -lcombustionModels \ - -lregionModels \ - -lsurfaceFilmModels \ - -lsurfaceFilmDerivedFvPatchFields \ - -llagrangianParcel \ - -llagrangianParcelTurbulence \ -lODE diff --git a/applications/solvers/combustion/fireFoam/UEqn.H b/applications/solvers/combustion/fireFoam/UEqn.H index a2f3df232d..622ddbb130 100644 --- a/applications/solvers/combustion/fireFoam/UEqn.H +++ b/applications/solvers/combustion/fireFoam/UEqn.H @@ -6,8 +6,7 @@ + MRF.DDt(rho, U) + turbulence->divDevTau(U) == - parcels.SU(U) - + fvModels.source(rho, U) + fvModels.source(rho, U) ); UEqn.relax(); diff --git a/applications/solvers/combustion/fireFoam/YEEqn.H b/applications/solvers/combustion/fireFoam/YEEqn.H index 5cf0242f8a..0c0a772c80 100644 --- a/applications/solvers/combustion/fireFoam/YEEqn.H +++ b/applications/solvers/combustion/fireFoam/YEEqn.H @@ -23,9 +23,7 @@ tmp> mvConvection + mvConvection->fvmDiv(phi, Yi) + thermophysicalTransport->divj(Yi) == - parcels.SYi(i, Yi) - + surfaceFilm.Srho(i) - + combustion->R(Yi) + combustion->R(Yi) + fvModels.source(rho, Yi) ); @@ -60,8 +58,6 @@ tmp> mvConvection + thermophysicalTransport->divq(he) == combustion->Qdot() - + parcels.Sh(he) - + surfaceFilm.Sh() + fvModels.source(rho, he) ); diff --git a/applications/solvers/combustion/fireFoam/createClouds.H b/applications/solvers/combustion/fireFoam/createClouds.H deleted file mode 100644 index 702f1a4651..0000000000 --- a/applications/solvers/combustion/fireFoam/createClouds.H +++ /dev/null @@ -1,2 +0,0 @@ -Info<< "\nConstructing clouds" << endl; -parcelCloudList parcels(rho, U, g, thermo); diff --git a/applications/solvers/combustion/fireFoam/createFieldRefs.H b/applications/solvers/combustion/fireFoam/createFieldRefs.H index af15effbc2..6e1184a1fa 100644 --- a/applications/solvers/combustion/fireFoam/createFieldRefs.H +++ b/applications/solvers/combustion/fireFoam/createFieldRefs.H @@ -1,3 +1,2 @@ const volScalarField& psi = thermo.psi(); const volScalarField& T = thermo.T(); -regionModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm(); diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 954848f3fb..e718cdb218 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -97,23 +97,6 @@ forAll(Y, i) } fields.add(thermo.he()); -IOdictionary additionalControlsDict -( - IOobject - ( - "additionalControls", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) -); - -Switch solvePrimaryRegion -( - additionalControlsDict.lookup("solvePrimaryRegion") -); - Info<< "Creating field dpdt\n" << endl; volScalarField dpdt ( @@ -130,8 +113,5 @@ volScalarField dpdt Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); -#include "createClouds.H" -#include "createSurfaceFilmModel.H" #include "createFvModels.H" #include "createFvConstraints.H" -#include "checkRadiationModel.H" diff --git a/applications/solvers/combustion/fireFoam/createSurfaceFilmModel.H b/applications/solvers/combustion/fireFoam/createSurfaceFilmModel.H deleted file mode 100644 index 81995c09a5..0000000000 --- a/applications/solvers/combustion/fireFoam/createSurfaceFilmModel.H +++ /dev/null @@ -1,6 +0,0 @@ -Info<< "\nConstructing surface film model" << endl; - -autoPtr tsurfaceFilm -( - regionModels::surfaceFilmModel::New(mesh, g) -); diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index 9770d21c2f..38fa4a8b7a 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -25,16 +25,14 @@ Application fireFoam Description - Transient solver for fires and turbulent diffusion flames with reacting - particle clouds and surface film modelling. + Transient solver for fires and turbulent diffusion flames with optional + reacting particle clouds and surface film modelling via fvModels. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" #include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" -#include "parcelCloudList.H" -#include "surfaceFilmModel.H" #include "fluidReactionThermo.H" #include "combustionModel.H" #include "pimpleControl.H" @@ -75,21 +73,39 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; - parcels.evolve(); - - surfaceFilm.evolve(); - - if (solvePrimaryRegion) + // --- PIMPLE loop + while (pimple.loop()) { - #include "rhoEqn.H" - - // --- PIMPLE loop - while (pimple.loop()) + if (!pimple.flow()) { - fvModels.correct(); + if (pimple.models()) + { + fvModels.correct(); + } + + if (pimple.thermophysics()) + { + #include "YEEqn.H" + } + } + else + { + if (pimple.firstPimpleIter() && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } + + if (pimple.models()) + { + fvModels.correct(); + } #include "UEqn.H" - #include "YEEqn.H" + + if (pimple.thermophysics()) + { + #include "YEEqn.H" + } // --- Pressure corrector loop while (pimple.correct()) diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H index c6f0d3ce13..8b7a455d39 100644 --- a/applications/solvers/combustion/fireFoam/pEqn.H +++ b/applications/solvers/combustion/fireFoam/pEqn.H @@ -31,9 +31,7 @@ while (pimple.correctNonOrthogonal()) + fvc::div(phiHbyA) - fvm::laplacian(rhorAUf, p_rgh) == - parcels.Srho() - + surfaceFilm.Srho() - + fvModels.source(psi, p_rgh, rho.name()) + fvModels.source(psi, p_rgh, rho.name()) ); p_rghEqn.solve(); diff --git a/applications/solvers/combustion/fireFoam/rhoEqn.H b/applications/solvers/combustion/fireFoam/rhoEqn.H index 8124d200ba..34ba2d6bd1 100644 --- a/applications/solvers/combustion/fireFoam/rhoEqn.H +++ b/applications/solvers/combustion/fireFoam/rhoEqn.H @@ -35,9 +35,7 @@ Description fvm::ddt(rho) + fvc::div(phi) == - parcels.Srho(rho) - + surfaceFilm.Srho() - + fvModels.source(rho) + fvModels.source(rho) ); rhoEqn.solve(); diff --git a/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H b/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H index 8a88dd36ab..8b41b506d9 100644 --- a/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H +++ b/applications/solvers/combustion/fireFoam/setMultiRegionDeltaT.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,6 @@ if (adjustTimeStep) } const scalar TFactorFluid = maxCo/(CoNum + small); - const scalar TFactorFilm = maxCo/(surfaceFilm.CourantNumber() + small); const scalar dt0 = runTime.deltaTValue(); @@ -47,7 +46,7 @@ if (adjustTimeStep) ( min ( - dt0*min(min(TFactorFluid, TFactorFilm), 1.2), + dt0*min(TFactorFluid, 1.2), maxDeltaT ) ); diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index d1fe1ce4b6..452cf6b54f 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -10,11 +10,11 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ -lfluidThermophysicalModels \ @@ -27,10 +27,10 @@ EXE_LIBS = \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ -lfluidReactionThermophysicalTransportModels \ - -lfiniteVolume \ -ldynamicFvMesh \ -ltopoChangerFvMesh \ - -lmeshTools \ - -lsampling \ + -lfiniteVolume \ -lfvModels \ - -lfvConstraints + -lfvConstraints \ + -lmeshTools \ + -lsampling diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options index ea5b5f95bf..a7216c0f3d 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/Make/options @@ -1,10 +1,6 @@ EXE_INC = \ -I. \ -I$(FOAM_SOLVERS)/combustion/reactingFoam \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/finiteVolume/cfdTools \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ @@ -15,15 +11,14 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude - + -I$(LIB_SRC)/combustionModels/lnInclude \ + -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/finiteVolume/cfdTools \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lfiniteVolume \ - -lfvModels \ - -lfvConstraints \ - -lmeshTools \ - -lsampling \ -lmomentumTransportModels \ -lcompressibleMomentumTransportModels \ -lthermophysicalTransportModels \ @@ -33,4 +28,11 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ - -lcombustionModels + -lcombustionModels \ + -ldynamicFvMesh \ + -ltopoChangerFvMesh \ + -lfiniteVolume \ + -lfvModels \ + -lfvConstraints \ + -lmeshTools \ + -lsampling diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/UEqn.H b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/UEqn.H index f000c20a29..3795849fc1 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/UEqn.H +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/UEqn.H @@ -1,34 +1,36 @@ - MRF.correctBoundaryVelocity(U); +// Solve the Momentum equation - tmp tUEqn +MRF.correctBoundaryVelocity(U); + +tmp tUEqn +( + fvm::ddt(rho, U) + fvm::div(phi, U) + + MRF.DDt(rho, U) + + turbulence->divDevTau(U) + == + fvModels.source(rho, U) +); +fvVectorMatrix& UEqn = tUEqn.ref(); + +UEqn.relax(); + +fvConstraints.constrain(UEqn); + +if (pimple.momentumPredictor()) +{ + solve ( - fvm::ddt(rho, U) + fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) + UEqn == - fvModels.source(rho, U) - ); - fvVectorMatrix& UEqn = tUEqn.ref(); - - UEqn.relax(); - - fvConstraints.constrain(UEqn); - - if (pimple.momentumPredictor()) - { - solve + fvc::reconstruct ( - UEqn - == - fvc::reconstruct ( - ( - - ghf*fvc::snGrad(rho) - - fvc::snGrad(p_rgh) - )*mesh.magSf() - ) - ); + - ghf*fvc::snGrad(rho) + - fvc::snGrad(p_rgh) + )*mesh.magSf() + ) + ); - fvConstraints.constrain(U); - K = 0.5*magSqr(U); - } + fvConstraints.constrain(U); + K = 0.5*magSqr(U); +} diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C index 470b5dbfa7..4fbda271ef 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/buoyantReactingFoam.C @@ -25,12 +25,17 @@ Application buoyantReactingFoam Description - Solver for combustion with chemical reactions with enhanced buoyancy - treatment. + Transient solver for turbulent flow of compressible reacting fluids with + enhanced buoyancy treatment and optional mesh motion and mesh topology + changes. + + Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and + pseudo-transient simulations. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" +#include "dynamicFvMesh.H" #include "fluidReactionThermo.H" #include "combustionModel.H" #include "dynamicMomentumTransportModel.H" @@ -38,6 +43,7 @@ Description #include "multivariateScheme.H" #include "pimpleControl.H" #include "pressureReference.H" +#include "CorrectPhi.H" #include "fvModels.H" #include "fvConstraints.H" #include "localEulerDdtScheme.H" @@ -51,12 +57,12 @@ int main(int argc, char *argv[]) #include "setRootCaseLists.H" #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createTimeControls.H" + #include "createDynamicFvMesh.H" + #include "createDyMControls.H" #include "initContinuityErrs.H" #include "createFields.H" #include "createFieldRefs.H" + #include "createRhoUfIfPresent.H" turbulence->validate(); @@ -72,7 +78,20 @@ int main(int argc, char *argv[]) while (pimple.run(runTime)) { - #include "readTimeControls.H" + #include "readDyMControls.H" + + // Store divrhoU from the previous mesh so that it can be mapped + // and used in correctPhi to ensure the corrected phi has the + // same divergence + autoPtr divrhoU; + if (correctPhi) + { + divrhoU = new volScalarField + ( + "divrhoU", + fvc::div(fvc::absolute(phi, rho, U)) + ); + } if (LTS) { @@ -88,27 +107,86 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; - #include "rhoEqn.H" - // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - fvModels.correct(); - - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) + if (!pimple.flow()) { - #include "../../../heatTransfer/buoyantPimpleFoam/pEqn.H" + if (pimple.models()) + { + fvModels.correct(); + } + + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } } - - if (pimple.turbCorr()) + else { - turbulence->correct(); - thermophysicalTransport->correct(); + if (pimple.firstPimpleIter() || moveMeshOuterCorrectors) + { + // Store momentum to set rhoUf for introduced faces. + autoPtr rhoU; + if (rhoUf.valid()) + { + rhoU = new volVectorField("rhoU", rho*U); + } + + fvModels.preUpdateMesh(); + + // Do any mesh changes + mesh.update(); + + if (mesh.changing()) + { + gh = (g & mesh.C()) - ghRef; + ghf = (g & mesh.Cf()) - ghRef; + + MRF.update(); + + if (correctPhi) + { + #include "correctPhi.H" + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + } + + if (pimple.firstPimpleIter() && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } + + if (pimple.models()) + { + fvModels.correct(); + } + + #include "UEqn.H" + + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } + + // --- Pressure corrector loop + while (pimple.correct()) + { + #include "../../../heatTransfer/buoyantPimpleFoam/pEqn.H" + } + + if (pimple.turbCorr()) + { + turbulence->correct(); + thermophysicalTransport->correct(); + } } } diff --git a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H index f9a7eb40c0..12a635d97d 100644 --- a/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/buoyantReactingFoam/createFields.H @@ -65,10 +65,7 @@ thermophysicalTransport ); Info<< "Creating reaction model\n" << endl; -autoPtr reaction -( - combustionModel::New(thermo, turbulence()) -); +autoPtr reaction(combustionModel::New(thermo, turbulence())); #include "readGravitationalAcceleration.H" #include "readhRef.H" @@ -131,8 +128,3 @@ fields.add(thermo.he()); #include "createMRF.H" #include "createFvModels.H" #include "createFvConstraints.H" - - -// This solver does not support moving mesh but it uses the pressure equation -// of one which does, so we need a dummy face-momentum field -autoPtr rhoUf(nullptr); diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/files b/applications/solvers/combustion/reactingFoam/engineFoam/Make/files similarity index 100% rename from applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/files rename to applications/solvers/combustion/reactingFoam/engineFoam/Make/files diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options b/applications/solvers/combustion/reactingFoam/engineFoam/Make/options similarity index 76% rename from applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options rename to applications/solvers/combustion/reactingFoam/engineFoam/Make/options index e941446f61..d5272d715e 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/engineFoam/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I. \ -I.. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/finiteVolume/cfdTools \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ @@ -9,17 +10,12 @@ EXE_INC = \ -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/transportModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(LIB_SRC)/engine/lnInclude @@ -39,12 +35,6 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lchemistryModel \ - -lregionModels \ - -lsurfaceFilmModels \ - -lsurfaceFilmDerivedFvPatchFields \ - -llagrangian \ - -llagrangianParcel \ - -llagrangianParcelTurbulence \ -lODE \ -lcombustionModels \ -lengine diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C b/applications/solvers/combustion/reactingFoam/engineFoam/engineFoam.C similarity index 88% rename from applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C rename to applications/solvers/combustion/reactingFoam/engineFoam/engineFoam.C index 0be3ce9f88..f8c5bf8da8 100644 --- a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/engineFoam.C +++ b/applications/solvers/combustion/reactingFoam/engineFoam/engineFoam.C @@ -34,8 +34,6 @@ Description #include "engineMesh.H" #include "dynamicMomentumTransportModel.H" #include "fluidReactionThermophysicalTransportModel.H" -#include "parcelCloudList.H" -#include "surfaceFilmModel.H" #include "combustionModel.H" #include "fvModels.H" #include "fvConstraints.H" @@ -83,7 +81,7 @@ int main(int argc, char *argv[]) // and used in correctPhi to ensure the corrected phi has the // same divergence autoPtr divrhoU; - if (solvePrimaryRegion && correctPhi) + if (correctPhi) { divrhoU = new volScalarField ( @@ -99,7 +97,7 @@ int main(int argc, char *argv[]) else { #include "compressibleCourantNo.H" - #include "setMultiRegionDeltaT.H" + #include "setDeltaT.H" } runTime++; @@ -108,24 +106,23 @@ int main(int argc, char *argv[]) // Store momentum to set rhoUf for introduced faces. autoPtr rhoU; - if (solvePrimaryRegion && rhoUf.valid()) + if (rhoUf.valid()) { rhoU = new volVectorField("rhoU", rho*U); } - // Store the particle positions - clouds.storeGlobalPositions(); + fvModels.preUpdateMesh(); // Do any mesh changes mesh.move(); - if (solvePrimaryRegion && mesh.changing()) + if (mesh.changing()) { MRF.update(); if (correctPhi) { - #include "../../compressible/rhoPimpleFoam/correctPhi.H" + #include "../../../compressible/rhoPimpleFoam/correctPhi.H" } if (checkMeshCourantNo) @@ -134,16 +131,13 @@ int main(int argc, char *argv[]) } } - clouds.evolve(); - surfaceFilm.evolve(); - - if (solvePrimaryRegion && !pimple.simpleRho()) + if (!pimple.simpleRho()) { #include "rhoEqn.H" } // --- PIMPLE loop - while (solvePrimaryRegion && pimple.loop()) + while (pimple.loop()) { fvModels.correct(); @@ -154,7 +148,7 @@ int main(int argc, char *argv[]) // --- Pressure corrector loop while (pimple.correct()) { - #include "pEqn.H" + #include "../../../compressible/rhoPimpleFoam/pEqn.H" } if (pimple.turbCorr()) diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/logSummary.H b/applications/solvers/combustion/reactingFoam/engineFoam/logSummary.H similarity index 100% rename from applications/solvers/lagrangian/reactingParticleFoam/engineFoam/logSummary.H rename to applications/solvers/combustion/reactingFoam/engineFoam/logSummary.H diff --git a/applications/solvers/lagrangian/reactingParticleFoam/engineFoam/startSummary.H b/applications/solvers/combustion/reactingFoam/engineFoam/startSummary.H similarity index 100% rename from applications/solvers/lagrangian/reactingParticleFoam/engineFoam/startSummary.H rename to applications/solvers/combustion/reactingFoam/engineFoam/startSummary.H diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index d32acf5af9..50ab3fdded 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -25,7 +25,11 @@ Application reactingFoam Description - Solver for combustion with chemical reactions. + Transient solver for turbulent flow of compressible reacting fluids with + optional mesh motion and mesh topology changes. + + Uses the flexible PIMPLE (PISO-SIMPLE) solution for time-resolved and + pseudo-transient simulations. \*---------------------------------------------------------------------------*/ @@ -105,12 +109,18 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - fvModels.correct(); - - if (pimple.frozenFlow()) + if (!pimple.flow()) { - #include "YEqn.H" - #include "EEqn.H" + if (pimple.models()) + { + fvModels.correct(); + } + + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } } else { @@ -123,6 +133,8 @@ int main(int argc, char *argv[]) rhoU = new volVectorField("rhoU", rho*U); } + fvModels.preUpdateMesh(); + // Do any mesh changes mesh.update(); @@ -147,9 +159,18 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" } + if (pimple.models()) + { + fvModels.correct(); + } + #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" + + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } // --- Pressure corrector loop while (pimple.correct()) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 06d2f97bc2..b31f7135c9 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -116,6 +116,8 @@ int main(int argc, char *argv[]) rhoU = new volVectorField("rhoU", rho*U); } + fvModels.preUpdateMesh(); + // Do any mesh changes mesh.update(); diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index e45bcaa51b..4dbee77899 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -108,57 +108,81 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - if (pimple.firstPimpleIter() || moveMeshOuterCorrectors) + if (!pimple.flow()) { - // Store momentum to set rhoUf for introduced faces. - autoPtr rhoU; - if (rhoUf.valid()) + if (pimple.models()) { - rhoU = new volVectorField("rhoU", rho*U); + fvModels.correct(); } - // Do any mesh changes - mesh.update(); - - if (mesh.changing()) + if (pimple.thermophysics()) { - gh = (g & mesh.C()) - ghRef; - ghf = (g & mesh.Cf()) - ghRef; - - MRF.update(); - - if (correctPhi) - { - #include "correctPhi.H" - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } + #include "EEqn.H" } } - - if (pimple.firstPimpleIter() && !pimple.simpleRho()) + else { - #include "rhoEqn.H" - } + if (pimple.firstPimpleIter() || moveMeshOuterCorrectors) + { + // Store momentum to set rhoUf for introduced faces. + autoPtr rhoU; + if (rhoUf.valid()) + { + rhoU = new volVectorField("rhoU", rho*U); + } - fvModels.correct(); + fvModels.preUpdateMesh(); - #include "UEqn.H" - #include "EEqn.H" + // Do any mesh changes + mesh.update(); - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } + if (mesh.changing()) + { + gh = (g & mesh.C()) - ghRef; + ghf = (g & mesh.Cf()) - ghRef; - if (pimple.turbCorr()) - { - turbulence->correct(); - thermophysicalTransport->correct(); + MRF.update(); + + if (correctPhi) + { + #include "correctPhi.H" + } + + if (checkMeshCourantNo) + { + #include "meshCourantNo.H" + } + } + } + + if (pimple.firstPimpleIter() && !pimple.simpleRho()) + { + #include "rhoEqn.H" + } + + if (pimple.models()) + { + fvModels.correct(); + } + + #include "UEqn.H" + + if (pimple.thermophysics()) + { + #include "EEqn.H" + } + + // --- Pressure corrector loop + while (pimple.correct()) + { + #include "pEqn.H" + } + + if (pimple.turbCorr()) + { + turbulence->correct(); + thermophysicalTransport->correct(); + } } } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H index 163806b68c..8606702d9d 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/solveFluid.H @@ -1,9 +1,15 @@ -if (pimple.frozenFlow()) +if (!pimple.flow()) { - fvModels.correct(); + if (pimple.models()) + { + fvModels.correct(); + } - #include "YEqn.H" - #include "EEqn.H" + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } } else { @@ -12,11 +18,18 @@ else #include "rhoEqn.H" } - fvModels.correct(); + if (pimple.models()) + { + fvModels.correct(); + } #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" + + if (pimple.thermophysics()) + { + #include "YEqn.H" + #include "EEqn.H" + } // --- PISO loop while (pimple.correct()) diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 686a6c8979..b5fd548e49 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -93,6 +93,8 @@ int main(int argc, char *argv[]) { if (pimple.firstPimpleIter() || moveMeshOuterCorrectors) { + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H deleted file mode 100644 index f2ea515de7..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/EEqn.H +++ /dev/null @@ -1,44 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - fvm::ddt(rho, he) - + ( - mvConvection.valid() - ? mvConvection->fvmDiv(phi, he) - : fvm::div(phi, he) - ) - + fvc::ddt(rho, K) + fvc::div(phi, K) - + ( - he.name() == "e" - ? fvc::div - ( - fvc::absolute(phi/fvc::interpolate(rho), U), - p, - "div(phiv,p)" - ) - : -dpdt - ) - + thermophysicalTransport->divq(he) - == - rho*(U&g) - + clouds.Sh(he) - + surfaceFilm.Sh() - + combustion->Qdot() - + fvModels.source(rho, he) - ); - - EEqn.relax(); - - fvConstraints.constrain(EEqn); - - EEqn.solve(); - - fvConstraints.constrain(he); - - thermo.correct(); - - Info<< "T gas min/max = " << min(T).value() << ", " - << max(T).value() << endl; -} diff --git a/applications/solvers/lagrangian/reactingParticleFoam/Make/files b/applications/solvers/lagrangian/reactingParticleFoam/Make/files deleted file mode 100644 index 9d992cc1fc..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -reactingParticleFoam.C - -EXE = $(FOAM_APPBIN)/reactingParticleFoam diff --git a/applications/solvers/lagrangian/reactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/Make/options deleted file mode 100644 index 6e05589d1c..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/Make/options +++ /dev/null @@ -1,47 +0,0 @@ -EXE_INC = \ - -I. \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -lfvModels \ - -lfvConstraints \ - -lsampling \ - -lmeshTools \ - -ldynamicFvMesh \ - -lmomentumTransportModels \ - -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ - -lspecie \ - -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ - -lchemistryModel \ - -lregionModels \ - -lsurfaceFilmModels \ - -lsurfaceFilmDerivedFvPatchFields \ - -llagrangian \ - -llagrangianParcel \ - -llagrangianParcelTurbulence \ - -lODE \ - -lcombustionModels diff --git a/applications/solvers/lagrangian/reactingParticleFoam/UEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/UEqn.H deleted file mode 100644 index 679afdca38..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/UEqn.H +++ /dev/null @@ -1,24 +0,0 @@ - MRF.correctBoundaryVelocity(U); - - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) + fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) - == - rho()*g - + clouds.SU(U) - + fvModels.source(rho, U) - ); - - UEqn.relax(); - - fvConstraints.constrain(UEqn); - - if (pimple.momentumPredictor()) - { - solve(UEqn == -fvc::grad(p)); - - fvConstraints.constrain(U); - K = 0.5*magSqr(U); - } diff --git a/applications/solvers/lagrangian/reactingParticleFoam/YEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/YEqn.H deleted file mode 100644 index 8ecb32f73c..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/YEqn.H +++ /dev/null @@ -1,49 +0,0 @@ -tmp> mvConvection(nullptr); - -if (Y.size()) -{ - mvConvection = tmp> - ( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) - ); -} - -{ - combustion->correct(); - - forAll(Y, i) - { - if (composition.solve(i)) - { - volScalarField& Yi = Y[i]; - - fvScalarMatrix YEqn - ( - fvm::ddt(rho, Yi) - + mvConvection->fvmDiv(phi, Yi) - + thermophysicalTransport->divj(Yi) - == - clouds.SYi(i, Yi) - + fvModels.source(rho, Yi) - + combustion->R(Yi) - + surfaceFilm.Srho(i) - ); - - YEqn.relax(); - - fvConstraints.constrain(YEqn); - - YEqn.solve("Yi"); - - fvConstraints.constrain(Yi); - } - } - - composition.normalise(); -} diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files deleted file mode 100644 index 317e887d97..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -buoyantReactingParticleFoam.C - -EXE = $(FOAM_APPBIN)/buoyantReactingParticleFoam diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options deleted file mode 100644 index 4af6e07196..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/Make/options +++ /dev/null @@ -1,48 +0,0 @@ -EXE_INC = \ - -I. \ - -I.. \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude - -EXE_LIBS = \ - -lfiniteVolume \ - -lfvModels \ - -lfvConstraints \ - -lsampling \ - -lmeshTools \ - -ldynamicFvMesh \ - -lmomentumTransportModels \ - -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ - -lspecie \ - -lfluidThermophysicalModels \ - -lreactionThermophysicalModels \ - -lchemistryModel \ - -lregionModels \ - -lsurfaceFilmModels \ - -lsurfaceFilmDerivedFvPatchFields \ - -llagrangian \ - -llagrangianParcel \ - -llagrangianParcelTurbulence \ - -lODE \ - -lcombustionModels diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H deleted file mode 100644 index 2537b4bb96..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/UEqn.H +++ /dev/null @@ -1,34 +0,0 @@ - MRF.correctBoundaryVelocity(U); - - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) + fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) - == - clouds.SU(U) - + fvModels.source(rho, U) - ); - - UEqn.relax(); - - fvConstraints.constrain(UEqn); - - if (pimple.momentumPredictor()) - { - solve - ( - UEqn - == - fvc::reconstruct - ( - ( - - ghf*fvc::snGrad(rho) - - fvc::snGrad(p_rgh) - )*mesh.magSf() - ) - ); - - fvConstraints.constrain(U); - K = 0.5*magSqr(U); - } diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C deleted file mode 100644 index ad6f3b646d..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/buoyantReactingParticleFoam.C +++ /dev/null @@ -1,183 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - buoyantReactingParticleFoam - -Description - Transient solver for buoyant, compressible, turbulent flow with a particle - cloud and surface film modelling. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "dynamicMomentumTransportModel.H" -#include "fluidReactionThermophysicalTransportModel.H" -#include "parcelCloudList.H" -#include "surfaceFilmModel.H" -#include "combustionModel.H" -#include "fvModels.H" -#include "fvConstraints.H" -#include "pimpleControl.H" -#include "pressureReference.H" -#include "CorrectPhi.H" -#include "localEulerDdtScheme.H" -#include "fvcSmooth.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "createDyMControls.H" - #include "initContinuityErrs.H" - #include "createFields.H" - #include "createFieldRefs.H" - #include "createRhoUfIfPresent.H" - - turbulence->validate(); - - if (!LTS) - { - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - } - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (pimple.run(runTime)) - { - #include "readDyMControls.H" - - // Store divrhoU from the previous mesh so that it can be mapped - // and used in correctPhi to ensure the corrected phi has the - // same divergence - autoPtr divrhoU; - if (solvePrimaryRegion && correctPhi) - { - divrhoU = new volScalarField - ( - "divrhoU", - fvc::div(fvc::absolute(phi, rho, U)) - ); - } - - if (LTS) - { - #include "setRDeltaT.H" - } - else - { - #include "compressibleCourantNo.H" - #include "setMultiRegionDeltaT.H" - } - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // Store momentum to set rhoUf for introduced faces. - autoPtr rhoU; - if (solvePrimaryRegion && rhoUf.valid()) - { - rhoU = new volVectorField("rhoU", rho*U); - } - - // Store the particle positions - clouds.storeGlobalPositions(); - - // Do any mesh changes - mesh.update(); - - if (solvePrimaryRegion && mesh.changing()) - { - gh = (g & mesh.C()) - ghRef; - ghf = (g & mesh.Cf()) - ghRef; - - - MRF.update(); - - if (correctPhi) - { - #include "../../compressible/rhoPimpleFoam/correctPhi.H" - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } - } - - clouds.evolve(); - surfaceFilm.evolve(); - - if (solvePrimaryRegion && !pimple.simpleRho()) - { - #include "rhoEqn.H" - } - - // --- PIMPLE loop - while (solvePrimaryRegion && pimple.loop()) - { - fvModels.correct(); - - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - thermophysicalTransport->correct(); - } - } - - rho = thermo.rho(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H deleted file mode 100644 index fcd3e601b8..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/createFields.H +++ /dev/null @@ -1,129 +0,0 @@ -#include "createRDeltaT.H" - -Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(fluidReactionThermo::New(mesh)); -fluidReactionThermo& thermo = pThermo(); -thermo.validate(args.executable(), "h", "e"); - -basicSpecieMixture& composition = thermo.composition(); -PtrList& Y = composition.Y(); - -Info<< "Creating field rho\n" << endl; -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh - ), - thermo.rho() -); - -volScalarField& p = thermo.p(); - -Info<< "\nReading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "compressibleCreatePhi.H" - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - compressible::momentumTransportModel::New - ( - rho, - U, - phi, - thermo - ) -); - -Info<< "Creating thermophysical transport model\n" << endl; -autoPtr -thermophysicalTransport -( - fluidReactionThermophysicalTransportModel::New - ( - turbulence(), - thermo - ) -); - -Info<< "Creating combustion model\n" << endl; -autoPtr combustion -( - combustionModel::New(thermo, turbulence()) -); - -Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt -( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar(p.dimensions()/dimTime, 0) -); - -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); - -#include "readGravitationalAcceleration.H" -#include "readhRef.H" -#include "gh.H" - -volScalarField p_rgh -( - IOobject - ( - "p_rgh", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -// Force p_rgh to be consistent with p -p_rgh = p - rho*gh; - -pressureReference pressureReference -( - p, - p_rgh, - pimple.dict(), - thermo.incompressible() -); - -mesh.setFluxRequired(p_rgh.name()); - -multivariateSurfaceInterpolationScheme::fieldTable fields; - -forAll(Y, i) -{ - fields.add(Y[i]); -} -fields.add(thermo.he()); - -#include "createMRF.H" -#include "createClouds.H" -#include "createSurfaceFilmModel.H" -#include "createFvModels.H" -#include "createFvConstraints.H" -#include "checkRadiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H deleted file mode 100644 index 9e05a3682e..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/buoyantReactingParticleFoam/pEqn.H +++ /dev/null @@ -1,101 +0,0 @@ -if (!pimple.simpleRho()) -{ - rho = thermo.rho(); -} - -// Thermodynamic density needs to be updated by psi*d(p) after the -// pressure solution -const volScalarField psip0(psi*p); - -volScalarField rAU(1.0/UEqn.A()); -surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); - -surfaceScalarField phig(-rhorAUf*ghf*fvc::snGrad(rho)*mesh.magSf()); - -surfaceScalarField phiHbyA -( - "phiHbyA", - ( - fvc::interpolate(rho)*fvc::flux(HbyA) - + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi)) - ) - + phig -); - -MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - -// Update the pressure BCs to ensure flux consistency -constrainPressure(p_rgh, rho, U, phiHbyA, rhorAUf, MRF); - -fvScalarMatrix p_rghDDtEqn -( - fvc::ddt(rho) + psi*correction(fvm::ddt(p_rgh)) - + fvc::div(phiHbyA) - == - clouds.Srho() - + surfaceFilm.Srho() - + fvModels.source(psi, p_rgh, rho.name()) -); - -while (pimple.correctNonOrthogonal()) -{ - fvScalarMatrix p_rghEqn - ( - p_rghDDtEqn - - fvm::laplacian(rhorAUf, p_rgh) - ); - - p_rghEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA + p_rghEqn.flux(); - - // Explicitly relax pressure for momentum corrector - p_rgh.relax(); - - U = HbyA + rAU*fvc::reconstruct((p_rghEqn.flux() + phig)/rhorAUf); - U.correctBoundaryConditions(); - fvConstraints.constrain(U); - K = 0.5*magSqr(U); - } -} - -p = p_rgh + rho*gh; - -bool constrained = fvConstraints.constrain(p); - -if (constrained) -{ - p_rgh = p - rho*gh; -} - -// Thermodynamic density update -thermo.correctRho(psi*p - psip0); - -if (constrained) -{ - rho = thermo.rho(); -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -if (pimple.simpleRho()) -{ - rho = thermo.rho(); -} - -// Correct rhoUf if the mesh is moving -fvc::correctRhoUf(rhoUf, rho, U, phi); - -if (thermo.dpdt()) -{ - dpdt = fvc::ddt(p); - - if (mesh.moving()) - { - dpdt -= fvc::div(fvc::meshPhi(rho, U), p); - } -} diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H b/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H deleted file mode 100644 index 5376aaf445..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/createClouds.H +++ /dev/null @@ -1,2 +0,0 @@ -Info<< "\nConstructing clouds" << endl; -parcelCloudList clouds(rho, U, g, thermo); diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParticleFoam/createFieldRefs.H deleted file mode 100644 index 1e7b8954eb..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/createFieldRefs.H +++ /dev/null @@ -1,8 +0,0 @@ -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); -regionModels::surfaceFilmModel& surfaceFilm = tsurfaceFilm(); - -Switch solvePrimaryRegion -( - pimple.dict().lookupOrDefault("solvePrimaryRegion", true) -); diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createFields.H b/applications/solvers/lagrangian/reactingParticleFoam/createFields.H deleted file mode 100644 index f92845bf10..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/createFields.H +++ /dev/null @@ -1,110 +0,0 @@ -#include "createRDeltaT.H" - -Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(fluidReactionThermo::New(mesh)); -fluidReactionThermo& thermo = pThermo(); -thermo.validate(args.executable(), "h", "e"); - -basicSpecieMixture& composition = thermo.composition(); -PtrList& Y = composition.Y(); - -Info<< "Creating field rho\n" << endl; -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh - ), - thermo.rho() -); - -volScalarField& p = thermo.p(); - -Info<< "\nReading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "compressibleCreatePhi.H" - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - compressible::momentumTransportModel::New - ( - rho, - U, - phi, - thermo - ) -); - -Info<< "Creating thermophysical transport model\n" << endl; -autoPtr -thermophysicalTransport -( - fluidReactionThermophysicalTransportModel::New - ( - turbulence(), - thermo - ) -); - -Info<< "Creating combustion model\n" << endl; -autoPtr combustion -( - combustionModel::New(thermo, turbulence()) -); - -Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt -( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar(p.dimensions()/dimTime, 0) -); - -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); - -#include "readGravitationalAcceleration.H" - -pressureReference pressureReference -( - p, - pimple.dict(), - thermo.incompressible() -); - -mesh.setFluxRequired(p.name()); - -multivariateSurfaceInterpolationScheme::fieldTable fields; - -forAll(Y, i) -{ - fields.add(Y[i]); -} -fields.add(thermo.he()); - -#include "createMRF.H" -#include "createClouds.H" -#include "createSurfaceFilmModel.H" -#include "createFvModels.H" -#include "createFvConstraints.H" -#include "checkRadiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParticleFoam/createSurfaceFilmModel.H b/applications/solvers/lagrangian/reactingParticleFoam/createSurfaceFilmModel.H deleted file mode 100644 index 81995c09a5..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/createSurfaceFilmModel.H +++ /dev/null @@ -1,6 +0,0 @@ -Info<< "\nConstructing surface film model" << endl; - -autoPtr tsurfaceFilm -( - regionModels::surfaceFilmModel::New(mesh, g) -); diff --git a/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H deleted file mode 100644 index f251cae96a..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/pEqn.H +++ /dev/null @@ -1,90 +0,0 @@ -if (!pimple.simpleRho()) -{ - rho = thermo.rho(); -} - -// Thermodynamic density needs to be updated by psi*d(p) after the -// pressure solution -const volScalarField psip0(psi*p); - -volScalarField rAU(1.0/UEqn.A()); -surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); -surfaceScalarField phiHbyA -( - "phiHbyA", - ( - fvc::interpolate(rho)*fvc::flux(HbyA) - + MRF.zeroFilter(rhorAUf*fvc::ddtCorr(rho, U, phi, rhoUf)) - ) -); - -fvc::makeRelative(phiHbyA, rho, U); -MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - -// Update the pressure BCs to ensure flux consistency -constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); - -fvScalarMatrix pDDtEqn -( - fvc::ddt(rho) + psi*correction(fvm::ddt(p)) - + fvc::div(phiHbyA) - == - clouds.Srho() - + surfaceFilm.Srho() - + fvModels.source(psi, p, rho.name()) -); - -while (pimple.correctNonOrthogonal()) -{ - fvScalarMatrix pEqn - ( - pDDtEqn - - fvm::laplacian(rhorAUf, p) - ); - - pEqn.solve(); - - if (pimple.finalNonOrthogonalIter()) - { - phi = phiHbyA + pEqn.flux(); - } -} - -p.relax(); - -U = HbyA - rAU*fvc::grad(p); -U.correctBoundaryConditions(); -fvConstraints.constrain(U); -K = 0.5*magSqr(U); - -bool constrained = fvConstraints.constrain(p); - -// Thermodynamic density update -thermo.correctRho(psi*p - psip0); - -if (constrained) -{ - rho = thermo.rho(); -} - -#include "rhoEqn.H" -#include "compressibleContinuityErrs.H" - -if (pimple.simpleRho()) -{ - rho = thermo.rho(); -} - -// Correct rhoUf if the mesh is moving -fvc::correctRhoUf(rhoUf, rho, U, phi); - -if (thermo.dpdt()) -{ - dpdt = fvc::ddt(p); - - if (mesh.moving()) - { - dpdt -= fvc::div(fvc::meshPhi(rho, U), p); - } -} diff --git a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C b/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C deleted file mode 100644 index cec2704ff9..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/reactingParticleFoam.C +++ /dev/null @@ -1,179 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - reactingParticleFoam - -Description - Transient solver for compressible, turbulent flow with a particle cloud - and surface film modelling. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicFvMesh.H" -#include "dynamicMomentumTransportModel.H" -#include "fluidReactionThermophysicalTransportModel.H" -#include "parcelCloudList.H" -#include "surfaceFilmModel.H" -#include "combustionModel.H" -#include "fvModels.H" -#include "fvConstraints.H" -#include "pimpleControl.H" -#include "pressureReference.H" -#include "CorrectPhi.H" -#include "localEulerDdtScheme.H" -#include "fvcSmooth.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createDynamicFvMesh.H" - #include "createDyMControls.H" - #include "initContinuityErrs.H" - #include "createFields.H" - #include "createFieldRefs.H" - #include "createRhoUfIfPresent.H" - - turbulence->validate(); - - if (!LTS) - { - #include "compressibleCourantNo.H" - #include "setInitialDeltaT.H" - } - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (pimple.run(runTime)) - { - #include "readDyMControls.H" - - // Store divrhoU from the previous mesh so that it can be mapped - // and used in correctPhi to ensure the corrected phi has the - // same divergence - autoPtr divrhoU; - if (solvePrimaryRegion && correctPhi) - { - divrhoU = new volScalarField - ( - "divrhoU", - fvc::div(fvc::absolute(phi, rho, U)) - ); - } - - if (LTS) - { - #include "setRDeltaT.H" - } - else - { - #include "compressibleCourantNo.H" - #include "setMultiRegionDeltaT.H" - } - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - - // Store momentum to set rhoUf for introduced faces. - autoPtr rhoU; - if (solvePrimaryRegion && rhoUf.valid()) - { - rhoU = new volVectorField("rhoU", rho*U); - } - - // Store the particle positions - clouds.storeGlobalPositions(); - - // Do any mesh changes - mesh.update(); - - if (solvePrimaryRegion && mesh.changing()) - { - MRF.update(); - - if (correctPhi) - { - #include "../../compressible/rhoPimpleFoam/correctPhi.H" - } - - if (checkMeshCourantNo) - { - #include "meshCourantNo.H" - } - } - - clouds.evolve(); - surfaceFilm.evolve(); - - if (solvePrimaryRegion && !pimple.simpleRho()) - { - #include "rhoEqn.H" - } - - // --- PIMPLE loop - while (solvePrimaryRegion && pimple.loop()) - { - fvModels.correct(); - - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" - - // --- Pressure corrector loop - while (pimple.correct()) - { - #include "pEqn.H" - } - - if (pimple.turbCorr()) - { - turbulence->correct(); - thermophysicalTransport->correct(); - } - } - - rho = thermo.rho(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H b/applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H deleted file mode 100644 index 7d9b8049ee..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/rhoEqn.H +++ /dev/null @@ -1,48 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Global - rhoEqn - -Description - Solve the continuity for density. - -\*---------------------------------------------------------------------------*/ - -{ - fvScalarMatrix rhoEqn - ( - fvm::ddt(rho) - + fvc::div(phi) - == - clouds.Srho(rho) - + surfaceFilm.Srho() - + fvModels.source(rho) - ); - - rhoEqn.solve(); - - fvConstraints.constrain(rho); -} - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H b/applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H deleted file mode 100644 index 5c7e38848d..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/setMultiRegionDeltaT.H +++ /dev/null @@ -1,53 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Global - setMultiRegionDeltaT - -Description - Reset the timestep to maintain a constant maximum Courant numbers. - Reduction of time-step is immediate, but increase is damped to avoid - unstable oscillations. - -\*---------------------------------------------------------------------------*/ - -if (adjustTimeStep) -{ - const scalar maxDeltaTFact = - min(maxCo/(CoNum + small), maxCo/(surfaceFilm.CourantNumber() + small)); - const scalar deltaTFact = - min(min(maxDeltaTFact, 1.0 + 0.1*maxDeltaTFact), 1.2); - - runTime.setDeltaT - ( - min - ( - deltaTFact*runTime.deltaTValue(), - maxDeltaT - ) - ); - - Info<< "deltaT = " << runTime.deltaTValue() << endl; -} - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H deleted file mode 100644 index 9c8c8dd2a7..0000000000 --- a/applications/solvers/lagrangian/reactingParticleFoam/setRDeltaT.H +++ /dev/null @@ -1,134 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -{ - volScalarField& rDeltaT = trDeltaT.ref(); - - const dictionary& pimpleDict = pimple.dict(); - - // Maximum flow Courant number - scalar maxCo(pimpleDict.lookup("maxCo")); - - // Maximum time scale - scalar maxDeltaT(pimpleDict.lookupOrDefault("maxDeltaT", great)); - - // Smoothing parameter (0-1) when smoothing iterations > 0 - scalar rDeltaTSmoothingCoeff - ( - pimpleDict.lookupOrDefault("rDeltaTSmoothingCoeff", 0.1) - ); - - // Damping coefficient (1-0) - scalar rDeltaTDampingCoeff - ( - pimpleDict.lookupOrDefault("rDeltaTDampingCoeff", 0.2) - ); - - // Maximum change in cell temperature per iteration - // (relative to previous value) - scalar alphaTemp(pimpleDict.lookupOrDefault("alphaTemp", 0.05)); - - - Info<< "Time scales min/max:" << endl; - - // Cache old reciprocal time scale field - volScalarField rDeltaT0("rDeltaT0", rDeltaT); - - // Flow time scale - { - rDeltaT.ref() = - ( - fvc::surfaceSum(mag(phi))()() - /((2*maxCo)*mesh.V()*rho()) - ); - - // Limit the largest time scale - rDeltaT.max(1/maxDeltaT); - - Info<< " Flow = " - << gMin(1/rDeltaT.primitiveField()) << ", " - << gMax(1/rDeltaT.primitiveField()) << endl; - } - - // Reaction source time scale - { - volScalarField::Internal rDeltaTT - ( - mag - ( - clouds.hsTrans()/(mesh.V()*runTime.deltaT()) - + combustion->Qdot()() - ) - /( - alphaTemp - *rho() - *thermo.Cp()()() - *T() - ) - ); - - Info<< " Temperature = " - << gMin(1/(rDeltaTT.field() + vSmall)) << ", " - << gMax(1/(rDeltaTT.field() + vSmall)) << endl; - - rDeltaT.ref() = max - ( - rDeltaT(), - rDeltaTT - ); - } - - // Update the boundary values of the reciprocal time-step - rDeltaT.correctBoundaryConditions(); - - // Spatially smooth the time scale field - if (rDeltaTSmoothingCoeff < 1.0) - { - fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff); - } - - // Limit rate of change of time scale - // - reduce as much as required - // - only increase at a fraction of old time scale - if - ( - rDeltaTDampingCoeff < 1.0 - && runTime.timeIndex() > runTime.startTimeIndex() + 1 - ) - { - rDeltaT = max - ( - rDeltaT, - (scalar(1) - rDeltaTDampingCoeff)*rDeltaT0 - ); - } - - Info<< " Overall = " - << gMin(1/rDeltaT.primitiveField()) - << ", " << gMax(1/rDeltaT.primitiveField()) << endl; -} - - -// ************************************************************************* // diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H deleted file mode 100644 index 2ce35faa2f..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/EEqn.H +++ /dev/null @@ -1,31 +0,0 @@ -{ - volScalarField& he = thermo.he(); - - fvScalarMatrix EEqn - ( - mvConvection->fvmDiv(phi, he) - + ( - he.name() == "e" - ? fvc::div(phi, volScalarField("Ekp", 0.5*magSqr(U) + p/rho)) - : fvc::div(phi, volScalarField("K", 0.5*magSqr(U))) - ) - + thermophysicalTransport->divq(he) - == - rho*(U&g) - + clouds.Sh(he) - + combustion->Qdot() - + fvModels.source(rho, he) - ); - - EEqn.relax(); - - fvConstraints.constrain(EEqn); - - EEqn.solve(); - - fvConstraints.constrain(he); - thermo.correct(); - - Info<< "T gas min/max = " << min(T).value() << ", " - << max(T).value() << endl; -} diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files deleted file mode 100644 index 8d061ab3d0..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -simpleReactingParticleFoam.C - -EXE = $(FOAM_APPBIN)/simpleReactingParticleFoam diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options b/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options deleted file mode 100644 index 36c56c199d..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/Make/options +++ /dev/null @@ -1,46 +0,0 @@ -EXE_INC = \ - -I. \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/fluidReactionThermo/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/lagrangian/parcel/lnInclude \ - -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/ODE/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/combustionModels/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - - -EXE_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lmomentumTransportModels \ - -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ - -lfluidReactionThermophysicalTransportModels \ - -llagrangian \ - -llagrangianParcel \ - -llagrangianParcelTurbulence \ - -lspecie \ - -lfluidThermophysicalModels \ - -lthermophysicalProperties \ - -lreactionThermophysicalModels \ - -lchemistryModel \ - -lODE \ - -lregionModels \ - -lsurfaceFilmModels \ - -lcombustionModels \ - -lfvModels \ - -lfvConstraints \ - -lsampling diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H deleted file mode 100644 index 99547def36..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/UEqn.H +++ /dev/null @@ -1,21 +0,0 @@ - MRF.correctBoundaryVelocity(U); - - tmp tUEqn - ( - fvm::div(phi, U) - + MRF.DDt(rho, U) - + turbulence->divDevTau(U) - == - rho()*g - + clouds.SU(U) - + fvModels.source(rho, U) - ); - fvVectorMatrix& UEqn = tUEqn.ref(); - - UEqn.relax(); - - fvConstraints.constrain(UEqn); - - solve(UEqn == -fvc::grad(p)); - - fvConstraints.constrain(U); diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H deleted file mode 100644 index d797090d31..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/YEqn.H +++ /dev/null @@ -1,42 +0,0 @@ -tmp> mvConvection -( - fv::convectionScheme::New - ( - mesh, - fields, - phi, - mesh.divScheme("div(phi,Yi_h)") - ) -); - -{ - combustion->correct(); - - forAll(Y, i) - { - if (composition.solve(i)) - { - volScalarField& Yi = Y[i]; - - fvScalarMatrix YEqn - ( - mvConvection->fvmDiv(phi, Yi) - + thermophysicalTransport->divj(Yi) - == - clouds.SYi(i, Yi) - + combustion->R(Yi) - + fvModels.source(rho, Yi) - ); - - YEqn.relax(); - - fvConstraints.constrain(YEqn); - - YEqn.solve("Yi"); - - fvConstraints.constrain(Yi); - } - } - - composition.normalise(); -} diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H deleted file mode 100644 index 5376aaf445..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/createClouds.H +++ /dev/null @@ -1,2 +0,0 @@ -Info<< "\nConstructing clouds" << endl; -parcelCloudList clouds(rho, U, g, thermo); diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H deleted file mode 100644 index 6e1184a1fa..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFieldRefs.H +++ /dev/null @@ -1,2 +0,0 @@ -const volScalarField& psi = thermo.psi(); -const volScalarField& T = thermo.T(); diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H deleted file mode 100644 index ba6461ab38..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/createFields.H +++ /dev/null @@ -1,106 +0,0 @@ -#include "readGravitationalAcceleration.H" - -Info<< "Reading thermophysical properties\n" << endl; -autoPtr pThermo(fluidReactionThermo::New(mesh)); -fluidReactionThermo& thermo = pThermo(); -thermo.validate(args.executable(), "h", "e"); - -basicSpecieMixture& composition = thermo.composition(); -PtrList& Y = composition.Y(); - -volScalarField& p = thermo.p(); - -volScalarField rho -( - IOobject - ( - "rho", - runTime.timeName(), - mesh - ), - thermo.rho() -); - -Info<< "\nReading field U\n" << endl; -volVectorField U -( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh -); - -#include "compressibleCreatePhi.H" - -mesh.setFluxRequired(p.name()); - -dimensionedScalar rhoMax -( - dimensionedScalar::lookupOrDefault - ( - "rhoMax", - simple.dict(), - dimDensity, - great - ) -); - -dimensionedScalar rhoMin -( - dimensionedScalar::lookupOrDefault - ( - "rhoMin", - simple.dict(), - dimDensity, - 0 - ) -); - -Info<< "Creating turbulence model\n" << endl; -autoPtr turbulence -( - compressible::momentumTransportModel::New - ( - rho, - U, - phi, - thermo - ) -); - -Info<< "Creating thermophysical transport model\n" << endl; -autoPtr -thermophysicalTransport -( - fluidReactionThermophysicalTransportModel::New - ( - turbulence(), - thermo - ) -); - -Info<< "Creating combustion model\n" << endl; -autoPtr combustion -( - combustionModel::New(thermo, turbulence()) -); - -Info<< "Creating multi-variate interpolation scheme\n" << endl; -multivariateSurfaceInterpolationScheme::fieldTable fields; - -forAll(Y, i) -{ - fields.add(Y[i]); -} -fields.add(thermo.he()); - -#include "createMRF.H" -#include "createClouds.H" -#include "createFvModels.H" -#include "createFvConstraints.H" -#include "checkRadiationModel.H" diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H b/applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H deleted file mode 100644 index 6f8ef9b9a6..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/pEqn.H +++ /dev/null @@ -1,55 +0,0 @@ -// Thermodynamic density needs to be updated by psi*d(p) after the -// pressure solution -const volScalarField psip0(psi*p); - -volScalarField rAU(1.0/UEqn.A()); -surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); -volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); -tUEqn.clear(); -surfaceScalarField phiHbyA -( - "phiHbyA", - fvc::interpolate(rho)*fvc::flux(HbyA) -); - -MRF.makeRelative(fvc::interpolate(rho), phiHbyA); - -// Update the pressure BCs to ensure flux consistency -constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); - -while (simple.correctNonOrthogonal()) -{ - fvScalarMatrix pEqn - ( - fvc::div(phiHbyA) - - fvm::laplacian(rhorAUf, p) - == - clouds.Srho() - + fvModels.source(psi, p, rho.name()) - ); - - pEqn.solve(); - - if (simple.finalNonOrthogonalIter()) - { - phi = phiHbyA + pEqn.flux(); - } -} - -p.relax(); - -// Thermodynamic density update -thermo.correctRho(psi*p - psip0); - -#include "compressibleContinuityErrs.H" - -U = HbyA - rAU*fvc::grad(p); -U.correctBoundaryConditions(); -fvConstraints.constrain(U); - -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); - -Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl; diff --git a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C b/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C deleted file mode 100644 index ecda0d7e6f..0000000000 --- a/applications/solvers/lagrangian/simpleReactingParticleFoam/simpleReactingParticleFoam.C +++ /dev/null @@ -1,96 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2013-2021 OpenFOAM Foundation - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Application - simpleReactingParticleFoam - -Description - Steady state solver for compressible, turbulent flow with reacting, - multiphase particle clouds and optional sources/constraints. - -\*---------------------------------------------------------------------------*/ - -#include "fvCFD.H" -#include "dynamicMomentumTransportModel.H" -#include "fluidReactionThermophysicalTransportModel.H" -#include "parcelCloudList.H" -#include "fluidReactionThermo.H" -#include "combustionModel.H" -#include "IOporosityModelList.H" -#include "fvModels.H" -#include "fvConstraints.H" -#include "simpleControl.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -int main(int argc, char *argv[]) -{ - #include "postProcess.H" - - #include "setRootCaseLists.H" - #include "createTime.H" - #include "createMesh.H" - #include "createControl.H" - #include "createFields.H" - #include "createFieldRefs.H" - #include "initContinuityErrs.H" - - turbulence->validate(); - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - - Info<< "\nStarting time loop\n" << endl; - - while (simple.loop(runTime)) - { - Info<< "Time = " << runTime.timeName() << nl << endl; - - clouds.evolve(); - - fvModels.correct(); - - // --- Pressure-velocity SIMPLE corrector loop - { - #include "UEqn.H" - #include "YEqn.H" - #include "EEqn.H" - #include "pEqn.H" - } - - turbulence->correct(); - thermophysicalTransport->correct(); - - runTime.write(); - - Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" - << " ClockTime = " << runTime.elapsedClockTime() << " s" - << nl << endl; - } - - Info<< "End\n" << endl; - - return 0; -} - - -// ************************************************************************* // diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/Make/options index 5cfbddf468..b9460be68c 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFSurfaceFilm/Make/options @@ -18,6 +18,5 @@ LIB_LIBS = \ -linterfaceProperties \ -ltransportModels \ -lsurfaceFilmModels \ - -lsurfaceFilmDerivedFvPatchFields \ -lfiniteVolume \ -lmeshTools diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index ef1b784d67..93176e0bb1 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C @@ -115,6 +115,8 @@ int main(int argc, char *argv[]) ); } + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 86459e3336..747ef808a9 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -120,6 +120,8 @@ int main(int argc, char *argv[]) ); } + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index 9178d4e696..a6c40b3194 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -97,6 +97,8 @@ int main(int argc, char *argv[]) { if (pimple.firstPimpleIter() || moveMeshOuterCorrectors) { + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C index 12c1a83e49..38684b9a6d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -105,21 +105,27 @@ int main(int argc, char *argv[]) // --- Pressure-velocity PIMPLE corrector loop while (pimple.loop()) { - if (pimple.frozenFlow()) + if (!pimple.flow()) { - fvModels.correct(); - - fluid.solve(rAUs, rAUfs); - fluid.correct(); - fluid.correctContinuityError(); - - #include "YEqns.H" - #include "EEqns.H" - #include "pEqnComps.H" - - forAll(phases, phasei) + if (pimple.models()) { - phases[phasei].divU(-pEqnComps[phasei] & p_rgh); + fvModels.correct(); + } + + if (pimple.thermophysics()) + { + fluid.solve(rAUs, rAUfs); + fluid.correct(); + fluid.correctContinuityError(); + + #include "YEqns.H" + #include "EEqns.H" + #include "pEqnComps.H" + + forAll(phases, phasei) + { + phases[phasei].divU(-pEqnComps[phasei] & p_rgh); + } } } else @@ -147,6 +153,8 @@ int main(int argc, char *argv[]) ); } + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) @@ -174,24 +182,40 @@ int main(int argc, char *argv[]) } } - fvModels.correct(); + if (pimple.models()) + { + fvModels.correct(); + } fluid.solve(rAUs, rAUfs); fluid.correct(); fluid.correctContinuityError(); - #include "YEqns.H" + if (pimple.thermophysics()) + { + #include "YEqns.H" + } if (faceMomentum) { #include "pUf/UEqns.H" - #include "EEqns.H" + + if (pimple.thermophysics()) + { + #include "EEqns.H" + } + #include "pUf/pEqn.H" } else { #include "pU/UEqns.H" - #include "EEqns.H" + + if (pimple.thermophysics()) + { + #include "EEqns.H" + } + #include "pU/pEqn.H" } diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 5f9abc2b91..8d07ebe1e2 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -87,6 +87,8 @@ int main(int argc, char *argv[]) { scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime(); + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 2b5f14fd36..fe400c47cb 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -102,6 +102,8 @@ int main(int argc, char *argv[]) { scalar timeBeforeMeshUpdate = runTime.elapsedCpuTime(); + fvModels.preUpdateMesh(); + mesh.update(); if (mesh.changing()) diff --git a/bin/buoyantReactingParticleFoam b/bin/buoyantReactingParticleFoam new file mode 100755 index 0000000000..7ebcb47433 --- /dev/null +++ b/bin/buoyantReactingParticleFoam @@ -0,0 +1,66 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# buoyantReactingParticleFoam +# +# Description +# Script to inform the user that buoyantReactingParticleFoam has been +# replaced by the more general buoyantReactingFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The buoyantReactingParticleFoam solver has solver has been replaced by the more +general buoyantReactingFoam solver, which supports buoyant compressible reacting +flow coupled to multiple run-time-selectable lagrangian clouds and surface film +modelling. + +To run a buoyantReactingParticleFoam case in buoyantReactingFoam add the following entry +constant/fvModels: + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +to add support for Lagrangian clouds and/or + +surfaceFilm +{ + type surfaceFilm; + libs ("libsurfaceFilmModels.so"); +} + +to add support for surface film. + +See the following cases for examples converted from buoyantReactingParticleFoam: + + \$FOAM_TUTORIALS/combustion/buoyantReactingFoam/Lagrangian + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/coalChemistryFoam b/bin/coalChemistryFoam index 460b681eb7..644d867f88 100755 --- a/bin/coalChemistryFoam +++ b/bin/coalChemistryFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,14 +27,14 @@ # # Description # Script to inform the user that coalChemistryFoam has been replaced by the -# more general reactingParticleFoam solver. +# more general reactingFoam solver. # #------------------------------------------------------------------------------ cat << EOF The coalChemistryFoam solver has solver has been replaced by the more general -reactingParticleFoam solver, which supports compressible reacting flow coupled +reactingFoam solver, which supports compressible reacting flow coupled to multiple run-time-selectable lagrangian clouds and surface film modelling. To run with a single cloud rename the constant/*CloudProperties file to @@ -50,7 +50,7 @@ collidingCloud, etc ...). See the following case for an example converted from coalChemistryFoam: - \$FOAM_TUTORIALS/lagrangian/reactingParticleFoam/simplifiedSiwek + \$FOAM_TUTORIALS/lagrangian/reactingFoam/simplifiedSiwek EOF diff --git a/bin/reactingParcelFoam b/bin/reactingParcelFoam index fcce87f974..8c9a315380 100755 --- a/bin/reactingParcelFoam +++ b/bin/reactingParcelFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,17 +27,34 @@ # # Description # Script to inform the user that reactingParcelFoam has been replaced by the -# more general buoyantReactingParticleFoam solver. +# more general buoyantReactingFoam solver. # #------------------------------------------------------------------------------ cat << EOF The reactingParcelFoam solver has solver has been replaced by the more general -buoyantReactingParticleFoam solver, which supports buoyant compressible +buoyantReactingFoam solver, which supports buoyant compressible reacting flow coupled to multiple run-time-selectable lagrangian clouds and surface film modelling. +To run a reactingParcelFoam case in reactingFoam add the following entries in +constant/fvModels: + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +which add the acceleration due to gravity needed by Lagrangian clouds and the +clouds themselves. + To run with a single cloud rename the constant/*CloudProperties file to constant/cloudProperties. @@ -49,9 +66,9 @@ In addition, cloud properties files also now require a "type" entry to specify the type of cloud model used (e.g., thermoCloud, reactingMultiphaseCloud, collidingCloud, etc ...). -See the following case for an example converted from reactingParcelFoam: +See the following cases for examples converted from reactingParcelFoam: - \$FOAM_TUTORIALS/lagrangian/buoyantReactingParticleFoam/splashPanel + \$FOAM_TUTORIALS/combustion/buoyantReactingFoam/Lagrangian EOF diff --git a/bin/reactingParticleFoam b/bin/reactingParticleFoam new file mode 100755 index 0000000000..6f5266b6b4 --- /dev/null +++ b/bin/reactingParticleFoam @@ -0,0 +1,64 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# reactingParticleFoam +# +# Description +# Script to inform the user that reactingParticleFoam has been replaced +# by the more general reactingFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The reactingParticleFoam solver has solver has been replaced by the more +general reactingFoam solver, which supports buoyant compressible +reacting flow coupled to multiple run-time-selectable lagrangian clouds and +surface film modelling. + +To run a reactingParticleFoam case in reactingFoam add the following entries in +constant/fvModels: + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +which add the acceleration due to gravity needed by Lagrangian clouds and the +clouds themselves. + +See the following cases for examples converted from reactingParticleFoam: + + \$FOAM_TUTORIALS/combustion/reactingFoam/Lagrangian + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/simpleReactingParcelFoam b/bin/simpleReactingParcelFoam index 2d38b4b091..5f1aa18885 100755 --- a/bin/simpleReactingParcelFoam +++ b/bin/simpleReactingParcelFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,17 +27,34 @@ # # Description # Script to inform the user that simpleReactingParcelFoam has been replaced -# by the more general simpleReactingParticleFoam solver. +# by the more general reactingFoam solver. # #------------------------------------------------------------------------------ cat << EOF The simpleReactingParcelFoam solver has solver has been replaced by the more -general simpleReactingParticleFoam solver, which supports buoyant compressible +general reactingFoam solver, which supports buoyant compressible reacting flow coupled to multiple run-time-selectable lagrangian clouds and surface film modelling. +To run a simpleReactingParcelFoam case in reactingFoam add the following entries +in constant/fvModels: + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +which add the acceleration due to gravity needed by Lagrangian clouds and the +clouds themselves. + To run with a single cloud rename the constant/*CloudProperties file to constant/cloudProperties. @@ -51,7 +68,7 @@ collidingCloud, etc ...). See the following case for an example converted from simpleReactingParcelFoam: - \$FOAM_TUTORIALS/lagrangian/simpleReactingParticleFoam/verticalChannel + \$FOAM_TUTORIALS/reactingFoam/Lagrangian/verticalChannelSteady EOF diff --git a/bin/simpleReactingParticleFoam b/bin/simpleReactingParticleFoam new file mode 100755 index 0000000000..55d1ef039b --- /dev/null +++ b/bin/simpleReactingParticleFoam @@ -0,0 +1,64 @@ +#!/bin/sh +#------------------------------------------------------------------------------ +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | Website: https://openfoam.org +# \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# Script +# simpleReactingParticleFoam +# +# Description +# Script to inform the user that simpleReactingParticleFoam has been replaced +# by the more general reactingFoam solver. +# +#------------------------------------------------------------------------------ + +cat << EOF + +The simpleReactingParticleFoam solver has solver has been replaced by the more +general reactingFoam solver, which supports buoyant compressible +reacting flow coupled to multiple run-time-selectable lagrangian clouds and +surface film modelling. + +To run a simpleReactingParticleFoam case in reactingFoam add the following entries +in constant/fvModels: + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParticle.so"); +} + +which add the acceleration due to gravity needed by Lagrangian clouds and the +clouds themselves. + +See the following case for an example converted from simpleReactingParticleFoam: + + \$FOAM_TUTORIALS/reactingFoam/Lagrangian/verticalChannelSteady + +EOF + +#------------------------------------------------------------------------------ diff --git a/bin/sprayFoam b/bin/sprayFoam index 62971bb377..8bfdbe1835 100755 --- a/bin/sprayFoam +++ b/bin/sprayFoam @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2020 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2020-2021 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -27,14 +27,14 @@ # # Description # Script to inform the user that sprayFoam has been replaced by the -# more general reactingParticleFoam solver. +# more general reactingFoam solver. # #------------------------------------------------------------------------------ cat << EOF The sprayFoam solver has solver has been replaced by the more general -reactingParticleFoam solver, which supports compressible reacting flow coupled +reactingFoam solver, which supports compressible reacting flow coupled to multiple run-time-selectable lagrangian clouds and surface film modelling. To run with a single cloud rename the constant/*CloudProperties file to @@ -50,7 +50,7 @@ collidingCloud, etc ...). See the following case for an example converted from sprayFoam: - \$FOAM_TUTORIALS/lagrangian/reactingParticleFoam/aachenBomb + \$FOAM_TUTORIALS/lagrangian/reactingFoam/aachenBomb EOF diff --git a/etc/config.sh/bash_completion b/etc/config.sh/bash_completion index d89926472e..c174207c36 100644 --- a/etc/config.sh/bash_completion +++ b/etc/config.sh/bash_completion @@ -332,31 +332,6 @@ _buoyantReactingFoam_ () } complete -o filenames -o nospace -F _buoyantReactingFoam_ buoyantReactingFoam -_buoyantReactingParticleFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvModels -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - -case) - opts="" ; extra="-d" ;; - -fileHandler) - opts="uncollated collated masterUncollated" ; extra="" ;; - -hostRoots|-libs|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _buoyantReactingParticleFoam_ buoyantReactingParticleFoam - _buoyantSimpleFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" @@ -3022,31 +2997,6 @@ _reactingFoam_ () } complete -o filenames -o nospace -F _reactingFoam_ reactingFoam -_reactingParticleFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvModels -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - -case) - opts="" ; extra="-d" ;; - -fileHandler) - opts="uncollated collated masterUncollated" ; extra="" ;; - -hostRoots|-libs|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _reactingParticleFoam_ reactingParticleFoam - _reconstructPar_ () { local cur="${COMP_WORDS[COMP_CWORD]}" @@ -3669,31 +3619,6 @@ _simpleFoam_ () } complete -o filenames -o nospace -F _simpleFoam_ simpleFoam -_simpleReactingParticleFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="-case -doc -fileHandler -help -hostRoots -libs -listFunctionObjects -listFvModels -listMomentumTransportModels -listScalarBCs -listSwitches -listVectorBCs -noFunctionObjects -parallel -postProcess -roots -srcDoc" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - -case) - opts="" ; extra="-d" ;; - -fileHandler) - opts="uncollated collated masterUncollated" ; extra="" ;; - -hostRoots|-libs|-roots) - opts="" ; extra="" ;; - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _simpleReactingParticleFoam_ simpleReactingParticleFoam - _singleCellMesh_ () { local cur="${COMP_WORDS[COMP_CWORD]}" @@ -5745,25 +5670,6 @@ _paraFoam_ () } complete -o filenames -o nospace -F _paraFoam_ paraFoam -_reactingMultiphaseEulerFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _reactingMultiphaseEulerFoam_ reactingMultiphaseEulerFoam - _reactingParcelFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" @@ -5783,120 +5689,6 @@ _reactingParcelFoam_ () } complete -o filenames -o nospace -F _reactingParcelFoam_ reactingParcelFoam -_reactingTwoPhaseEulerFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _reactingTwoPhaseEulerFoam_ reactingTwoPhaseEulerFoam - -_rhoReactingBuoyantFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _rhoReactingBuoyantFoam_ rhoReactingBuoyantFoam - -_rhoReactingFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _rhoReactingFoam_ rhoReactingFoam - -_simpleReactingParcelFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _simpleReactingParcelFoam_ simpleReactingParcelFoam - -_sprayFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _sprayFoam_ sprayFoam - -_twoPhaseEulerFoam_ () -{ - local cur="${COMP_WORDS[COMP_CWORD]}" - local prev="${COMP_WORDS[COMP_CWORD-1]}" - local line=${COMP_LINE} - local used=$(echo "$line" | grep -oE "\-[a-zA-Z]+ ") - - opts="" - for o in $used ; do opts="${opts/$o/}" ; done - extra="" - - [ "$COMP_CWORD" = 1 ] || \ - case "$prev" in - *) ;; - esac - COMPREPLY=( $(compgen -W "${opts}" $extra -- ${cur}) ) -} -complete -o filenames -o nospace -F _twoPhaseEulerFoam_ twoPhaseEulerFoam - _uncoupledKinematicParcelFoam_ () { local cur="${COMP_WORDS[COMP_CWORD]}" diff --git a/src/Allwmake b/src/Allwmake index 8382f8fa09..b1eb0c0c15 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -42,14 +42,15 @@ wmake $targetType genericPatchFields wmake $targetType mesh/extrudeModel wmake $targetType dynamicMesh + +# Compile scotchDecomp, metisDecomp etc. +parallel/Allwmake $targetType $* + wmake $targetType dynamicFvMesh wmake $targetType topoChangerFvMesh wmake $targetType conversion wmake $targetType sampling -# Compile scotchDecomp, metisDecomp etc. -parallel/Allwmake $targetType $* - wmake $targetType ODE wmake $targetType randomProcesses diff --git a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H index bfa730a850..674c828e8f 100644 --- a/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H +++ b/src/MomentumTransportModels/momentumTransportModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,10 +29,10 @@ Description when using wall functions for rough walls, based on velocity, using Spalding's law to give a continuous nut profile to the wall (y+ = 0) - \f[ - y^+ = u^+ + \frac{1}{E} \left[exp(\kappa u^+) - 1 - \kappa u^+\, - - 0.5 (\kappa u^+)^2 - \frac{1}{6} (\kappa u^+)^3\right] - \f] + \f[ + y^+ = u^+ + \frac{1}{E} \left[exp(\kappa u^+) - 1 - \kappa u^+\, + - 0.5 (\kappa u^+)^2 - \frac{1}{6} (\kappa u^+)^3\right] + \f] where \vartable @@ -41,6 +41,12 @@ Description \kappa | Von Karman constant \endvartable + Reference: + \verbatim + Spalding, D. B., (1961). + A Single Formula for the "Law of the Wall". + Journal of Applied Mechanics, 28(3), 455-458 + \endverbatim Usage Example of the boundary condition specification: diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C b/src/finiteVolume/cfdTools/general/fvModels/fvModel.C index 0c5fb02ec2..03e2ab990d 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.C +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.C @@ -163,6 +163,10 @@ bool Foam::fvModel::read(const dictionary& dict) } +void Foam::fvModel::preUpdateMesh() +{} + + void Foam::fvModel::updateMesh(const mapPolyMesh& mpm) {} diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H index ccff486d02..eb617f01a9 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModel.H +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModel.H @@ -323,6 +323,9 @@ public: // Mesh changes + //- Prepare for mesh update + virtual void preUpdateMesh(); + //- Update for mesh changes virtual void updateMesh(const mapPolyMesh&); diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C index 6321dca810..014a5a62e4 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.C +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.C @@ -237,6 +237,17 @@ bool Foam::fvModels::addsSupToField(const word& fieldName) const } +void Foam::fvModels::preUpdateMesh() +{ + PtrListDictionary& modelList(*this); + + forAll(modelList, i) + { + modelList[i].preUpdateMesh(); + } +} + + void Foam::fvModels::updateMesh(const mapPolyMesh& mpm) { PtrListDictionary& modelList(*this); diff --git a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H index 94e4bf2d03..8e7a1a2577 100644 --- a/src/finiteVolume/cfdTools/general/fvModels/fvModels.H +++ b/src/finiteVolume/cfdTools/general/fvModels/fvModels.H @@ -240,6 +240,9 @@ public: // Mesh changes + //- Prepare for mesh update + virtual void preUpdateMesh(); + //- Update for mesh changes virtual void updateMesh(const mapPolyMesh&); diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.C b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.C index e01320a53b..1cdddb53d9 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.C +++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.C @@ -42,7 +42,9 @@ Foam::fluidSolutionControl::fluidSolutionControl ) : nonOrthogonalSolutionControl(mesh, algorithmName), - frozenFlow_(false), + models_(false), + thermophysics_(false), + flow_(false), momentumPredictor_(true), transonic_(false), consistent_(false) @@ -66,19 +68,9 @@ bool Foam::fluidSolutionControl::read() const dictionary& solutionDict = dict(); - frozenFlow_ = - solutionDict.lookupOrDefaultBackwardsCompatible - ( - {"frozenFlow", "solveFluid"}, - false - ); - - // If using the old keyword, then the logic is reversed - if (!solutionDict.found("frozenFlow") && solutionDict.found("solveFluid")) - { - frozenFlow_ = !frozenFlow_; - } - + models_ = solutionDict.lookupOrDefault("models", true); + thermophysics_ = solutionDict.lookupOrDefault("thermophysics", true); + flow_ = solutionDict.lookupOrDefault("flow", true); momentumPredictor_ = solutionDict.lookupOrDefault("momentumPredictor", true); transonic_ = solutionDict.lookupOrDefault("transonic", false); diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.H index 1eed9c8e19..59b2e28861 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.H +++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControl.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,8 +56,14 @@ protected: // Protected data - //- Flag to indicate not to solve for the flow - bool frozenFlow_; + //- Flag to indicate to solve for the optional models + bool models_; + + //- Flag to indicate to solve for the thermophysics + bool thermophysics_; + + //- Flag to indicate to solve for the flow + bool flow_; //- Flag to indicate to solve for momentum bool momentumPredictor_; @@ -97,8 +103,14 @@ public: // Access - //- Flag to indicate not to solve for the flow - inline bool frozenFlow() const; + //- Flag to indicate to solve for the options models + inline bool models() const; + + //- Flag to indicate to solve for the thermophysics + inline bool thermophysics() const; + + //- Flag to indicate to solve for the flow + inline bool flow() const; //- Flag to indicate to solve for momentum inline bool momentumPredictor() const; diff --git a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControlI.H b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControlI.H index ceb6d0501e..4bf241acf8 100644 --- a/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControlI.H +++ b/src/finiteVolume/cfdTools/general/solutionControl/solutionControl/fluidSolutionControl/fluidSolutionControlI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2018-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,9 +25,21 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -inline bool Foam::fluidSolutionControl::frozenFlow() const +inline bool Foam::fluidSolutionControl::models() const { - return frozenFlow_; + return models_; +} + + +inline bool Foam::fluidSolutionControl::thermophysics() const +{ + return thermophysics_; +} + + +inline bool Foam::fluidSolutionControl::flow() const +{ + return flow_; } diff --git a/src/lagrangian/parcel/Make/files b/src/lagrangian/parcel/Make/files index 097de52c9f..4b2c1f6ce8 100644 --- a/src/lagrangian/parcel/Make/files +++ b/src/lagrangian/parcel/Make/files @@ -116,4 +116,7 @@ clouds/Templates/MomentumCloud/cloudSolution/cloudSolution.C # averaging methods submodels/MPPIC/AveragingMethods/makeAveragingMethods.C +# fvModels +fvModels/clouds.C + LIB = $(FOAM_LIBBIN)/liblagrangianParcel diff --git a/src/lagrangian/parcel/fvModels/clouds.C b/src/lagrangian/parcel/fvModels/clouds.C new file mode 100644 index 0000000000..58f9b6118f --- /dev/null +++ b/src/lagrangian/parcel/fvModels/clouds.C @@ -0,0 +1,214 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "clouds.H" +#include "basicSpecieMixture.H" +#include "fvMatrix.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + +namespace Foam +{ + namespace fv + { + defineTypeNameAndDebug(clouds, 0); + + addToRunTimeSelectionTable + ( + fvModel, + clouds, + dictionary + ); + } +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::fv::clouds::clouds +( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh +) +: + fvModel(sourceName, modelType, dict, mesh), + carrierThermo_ + ( + mesh.lookupObject(basicThermo::dictName) + ), + clouds_ + ( + mesh.lookupObject("rho"), + mesh.lookupObject("U"), + mesh.lookupObject("g"), + carrierThermo_ + ), + curTimeIndex_(-1) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::wordList Foam::fv::clouds::addSupFields() const +{ + wordList fieldNames({"rho", "U", carrierThermo_.he().name()}); + + if (isA(carrierThermo_)) + { + const basicSpecieMixture& composition = + refCast(carrierThermo_); + + const PtrList& Y = composition.Y(); + + forAll(Y, i) + { + if (composition.solve(i)) + { + fieldNames.append(Y[i].name()); + } + } + } + + return fieldNames; +} + + +void Foam::fv::clouds::correct() +{ + if (curTimeIndex_ == mesh().time().timeIndex()) + { + return; + } + + clouds_.evolve(); + + curTimeIndex_ = mesh().time().timeIndex(); +} + + +void Foam::fv::clouds::addSup +( + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "rho") + { + eqn += clouds_.Srho(eqn.psi()); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +void Foam::fv::clouds::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "rho") + { + eqn += clouds_.Srho(eqn.psi()); + } + else if (fieldName == carrierThermo_.he().name()) + { + eqn += clouds_.Sh(eqn.psi()); + } + else if + ( + isA(carrierThermo_) + && refCast(carrierThermo_).contains + ( + eqn.psi().name() + ) + ) + { + eqn += clouds_.SYi + ( + refCast(carrierThermo_).index(eqn.psi()), + eqn.psi() + ); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +void Foam::fv::clouds::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "U") + { + eqn += clouds_.SU(eqn.psi()); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +void Foam::fv::clouds::preUpdateMesh() +{ + // Store the particle positions + clouds_.storeGlobalPositions(); +} + + +// ************************************************************************* // diff --git a/src/lagrangian/parcel/fvModels/clouds.H b/src/lagrangian/parcel/fvModels/clouds.H new file mode 100644 index 0000000000..b72ab32fb2 --- /dev/null +++ b/src/lagrangian/parcel/fvModels/clouds.H @@ -0,0 +1,163 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::fv::clouds + +Description + Lagrangian clouds fvModel + +Usage + Example usage: + \verbatim + clouds + { + type clouds; + } + \endverbatim + +SourceFiles + clouds.C + +\*---------------------------------------------------------------------------*/ + +#ifndef clouds_H +#define clouds_H + +#include "fvModel.H" +#include "fluidThermo.H" +#include "uniformDimensionedFields.H" +#include "parcelCloudList.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace fv +{ + +/*---------------------------------------------------------------------------*\ + Class clouds Declaration +\*---------------------------------------------------------------------------*/ + +class clouds +: + public fvModel +{ + // Private Data + + //- Reference to the carrier phase thermo + const fluidThermo& carrierThermo_; + + //- The Lagrangian cloud list + mutable parcelCloudList clouds_; + + //- Current time index (used for updating) + mutable label curTimeIndex_; + + +public: + + //- Runtime type information + TypeName("clouds"); + + + // Constructors + + //- Construct from explicit source name and mesh + clouds + ( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh + ); + + //- Disallow default bitwise copy construction + clouds + ( + const clouds& + ) = delete; + + + // Member Functions + + // Checks + + //- Return the list of fields for which the option adds source term + // to the transport equation + virtual wordList addSupFields() const; + + + // Correct + + //- Solve the Lagrangian clouds and update the sources + virtual void correct(); + + //- Prepare for mesh update + virtual void preUpdateMesh(); + + + // Add explicit and implicit contributions to compressible equation + + //- Add source to continuity equation + virtual void addSup + ( + fvMatrix& eqn, + const word& fieldName + ) const; + + //- Add source to pressure or enthalpy equation + virtual void addSup + ( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName + ) const; + + //- Add source to momentum equation + virtual void addSup + ( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName + ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const clouds&) = delete; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace fv +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake index e6c2241cee..5dc821bcf2 100755 --- a/src/regionModels/Allwmake +++ b/src/regionModels/Allwmake @@ -6,7 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType regionModel wmake $targetType surfaceFilmModels -wmake $targetType surfaceFilmModels/derivedFvPatchFields/wallFunctions wmake $targetType thermalBaffleModels #------------------------------------------------------------------------------ diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files index 4c30c4d92e..8ae73f301a 100644 --- a/src/regionModels/surfaceFilmModels/Make/files +++ b/src/regionModels/surfaceFilmModels/Make/files @@ -72,6 +72,9 @@ PATCHFIELDS=derivedFvPatchFields $(PATCHFIELDS)/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField.C $(PATCHFIELDS)/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C $(PATCHFIELDS)/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C +$(PATCHFIELDS)/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +$(PATCHFIELDS)/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C +fvModels/surfaceFilm.C LIB = $(FOAM_LIBBIN)/libsurfaceFilmModels diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index 04378c30fd..72d0932b09 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -5,6 +5,9 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ + -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ + -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -15,6 +18,9 @@ LIB_LIBS = \ -lthermophysicalProperties \ -lreactionThermophysicalModels \ -ldistributionModels \ + -lmomentumTransportModels \ + -lcompressibleMomentumTransportModels \ + -lthermophysicalTransportModels \ -lregionModels \ -lfiniteVolume \ -lmeshTools diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files deleted file mode 100644 index 01e50d24ac..0000000000 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files +++ /dev/null @@ -1,4 +0,0 @@ -alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C -nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C - -LIB = $(FOAM_LIBBIN)/libsurfaceFilmDerivedFvPatchFields diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options deleted file mode 100644 index 013b98dd87..0000000000 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options +++ /dev/null @@ -1,26 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/transportModels/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \ - -I$(LIB_SRC)/MomentumTransportModels/compressible/lnInclude \ - -I$(LIB_SRC)/ThermophysicalTransportModels/lnInclude \ - -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ - -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude\ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude - -LIB_LIBS = \ - -lfluidThermophysicalModels \ - -lspecie \ - -lthermophysicalProperties \ - -lreactionThermophysicalModels \ - -lmomentumTransportModels \ - -lcompressibleMomentumTransportModels \ - -lthermophysicalTransportModels \ - -lregionModels \ - -lsurfaceFilmModels \ - -lfiniteVolume \ - -lmeshTools diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.C b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.C new file mode 100644 index 0000000000..7673ac2268 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.C @@ -0,0 +1,207 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "surfaceFilm.H" +#include "basicSpecieMixture.H" +#include "fvMatrix.H" +#include "addToRunTimeSelectionTable.H" + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + +namespace Foam +{ + namespace fv + { + defineTypeNameAndDebug(surfaceFilm, 0); + + addToRunTimeSelectionTable + ( + fvModel, + surfaceFilm, + dictionary + ); + } +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::fv::surfaceFilm::surfaceFilm +( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh +) +: + fvModel(sourceName, modelType, dict, mesh), + primaryThermo_ + ( + mesh.lookupObject(basicThermo::dictName) + ), + surfaceFilm_ + ( + regionModels::surfaceFilmModel::New + ( + mesh, + mesh.lookupObject("g") + ) + ), + curTimeIndex_(-1) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::wordList Foam::fv::surfaceFilm::addSupFields() const +{ + wordList fieldNames({"rho", "U", primaryThermo_.he().name()}); + + if (isA(primaryThermo_)) + { + const basicSpecieMixture& composition = + refCast(primaryThermo_); + + const PtrList& Y = composition.Y(); + + forAll(Y, i) + { + if (composition.solve(i)) + { + fieldNames.append(Y[i].name()); + } + } + } + + return fieldNames; +} + + +void Foam::fv::surfaceFilm::correct() +{ + if (curTimeIndex_ == mesh().time().timeIndex()) + { + return; + } + + surfaceFilm_->evolve(); + + curTimeIndex_ = mesh().time().timeIndex(); +} + + +void Foam::fv::surfaceFilm::addSup +( + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "rho") + { + eqn += surfaceFilm_->Srho(); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +void Foam::fv::surfaceFilm::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "rho") + { + eqn += surfaceFilm_->Srho(); + } + else if (fieldName == primaryThermo_.he().name()) + { + eqn += surfaceFilm_->Sh(); + } + else if + ( + isA(primaryThermo_) + && refCast(primaryThermo_).contains + ( + eqn.psi().name() + ) + ) + { + eqn += surfaceFilm_->SYi + ( + refCast(primaryThermo_).index(eqn.psi()) + ); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +void Foam::fv::surfaceFilm::addSup +( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName +) const +{ + if (debug) + { + Info<< type() << ": applying source to " << eqn.psi().name() << endl; + } + + if (fieldName == "U") + { + eqn += surfaceFilm_->SU(); + } + else + { + FatalErrorInFunction + << "Support for field " << fieldName << " is not implemented" + << exit(FatalError); + } +} + + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.H b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.H new file mode 100644 index 0000000000..ce77822eb6 --- /dev/null +++ b/src/regionModels/surfaceFilmModels/fvModels/surfaceFilm.H @@ -0,0 +1,160 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2021 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::fv::surfaceFilm + +Description + surfaceFilm fvModel + +Usage + Example usage: + \verbatim + surfaceFilm + { + type surfaceFilm; + } + \endverbatim + +SourceFiles + surfaceFilm.C + +\*---------------------------------------------------------------------------*/ + +#ifndef surfaceFilm_H +#define surfaceFilm_H + +#include "fvModel.H" +#include "fluidThermo.H" +#include "uniformDimensionedFields.H" +#include "surfaceFilmModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace fv +{ + +/*---------------------------------------------------------------------------*\ + Class surfaceFilm Declaration +\*---------------------------------------------------------------------------*/ + +class surfaceFilm +: + public fvModel +{ + // Private Data + + //- Reference to the primary region thermo + const fluidThermo& primaryThermo_; + + //- The surfaceFilmModel pointer + autoPtr surfaceFilm_; + + //- Current time index (used for updating) + mutable label curTimeIndex_; + + +public: + + //- Runtime type information + TypeName("surfaceFilm"); + + + // Constructors + + //- Construct from explicit source name and mesh + surfaceFilm + ( + const word& sourceName, + const word& modelType, + const dictionary& dict, + const fvMesh& mesh + ); + + //- Disallow default bitwise copy construction + surfaceFilm + ( + const surfaceFilm& + ) = delete; + + + // Member Functions + + // Checks + + //- Return the list of fields for which the option adds source term + // to the transport equation + virtual wordList addSupFields() const; + + + // Correct + + //- Solve the Lagrangian surfaceFilm and update the sources + virtual void correct(); + + + // Add explicit and implicit contributions to compressible equation + + //- Add source to continuity equation + virtual void addSup + ( + fvMatrix& eqn, + const word& fieldName + ) const; + + //- Add source to pressure or enthalpy equation + virtual void addSup + ( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName + ) const; + + //- Add source to momentum equation + virtual void addSup + ( + const volScalarField& rho, + fvMatrix& eqn, + const word& fieldName + ) const; + + + // Member Operators + + //- Disallow default bitwise assignment + void operator=(const surfaceFilm&) = delete; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace fv +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index 60d45cdffd..3d540f4274 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -1067,14 +1067,14 @@ tmp kinematicSingleLayer::Srho() const } -tmp kinematicSingleLayer::Srho +tmp kinematicSingleLayer::SYi ( const label i ) const { return volScalarField::Internal::New ( - IOobject::modelName("Srho(" + Foam::name(i) + ")", typeName), + IOobject::modelName("SY(" + Foam::name(i) + ")", typeName), primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H index 04db1f2fdc..5542789adf 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.H @@ -482,7 +482,7 @@ public: virtual tmp Srho() const; //- Return mass source for specie i - Eulerian phase only - virtual tmp Srho + virtual tmp SYi ( const label i ) const; diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C index af0fdd5d0b..597eb224d1 100644 --- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.C +++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.C @@ -81,11 +81,11 @@ tmp noFilm::Srho() const } -tmp noFilm::Srho(const label i) const +tmp noFilm::SYi(const label i) const { return volScalarField::Internal::New ( - "noFilm::Srho(" + Foam::name(i) + ")", + "noFilm::SY(" + Foam::name(i) + ")", mesh_, dimensionedScalar(dimMass/dimVolume/dimTime, 0) ); diff --git a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H index 2d64c36f82..c956ec23a0 100644 --- a/src/regionModels/surfaceFilmModels/noFilm/noFilm.H +++ b/src/regionModels/surfaceFilmModels/noFilm/noFilm.H @@ -100,7 +100,7 @@ public: virtual tmp Srho() const; //- Return mass source for specie i - Eulerian phase only - virtual tmp Srho + virtual tmp SYi ( const label i ) const; diff --git a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H index 7b6bb1e048..c3e9672308 100644 --- a/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H +++ b/src/regionModels/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel.H @@ -119,7 +119,7 @@ public: virtual tmp Srho() const = 0; //- Return mass source for specie i - Eulerian phase only - virtual tmp Srho + virtual tmp SYi ( const label i ) const = 0; diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C index e4b655dc01..2bc9c5e834 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C @@ -581,7 +581,7 @@ void thermoSingleLayer::info() } -tmp thermoSingleLayer::Srho +tmp thermoSingleLayer::SYi ( const label i ) const @@ -596,11 +596,11 @@ tmp thermoSingleLayer::Srho const label vapId = primarySpecieThermo.species()[liquidThermo.name()]; - tmp tSrho + tmp tSYi ( volScalarField::Internal::New ( - IOobject::modelName("Srho(" + Foam::name(i) + ")", typeName), + IOobject::modelName("SY(" + Foam::name(i) + ")", typeName), primaryMesh(), dimensionedScalar(dimMass/dimVolume/dimTime, 0) ) @@ -608,7 +608,7 @@ tmp thermoSingleLayer::Srho if (vapId == i) { - scalarField& Srho = tSrho.ref(); + scalarField& SYi = tSYi.ref(); const scalarField& V = primaryMesh().V(); const scalar dt = time().deltaTValue(); @@ -627,12 +627,12 @@ tmp thermoSingleLayer::Srho forAll(patchMass, j) { - Srho[cells[j]] += patchMass[j]/(V[cells[j]]*dt); + SYi[cells[j]] += patchMass[j]/(V[cells[j]]*dt); } } } - return tSrho; + return tSYi; } diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H index a737f3df30..a1963ee3fd 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.H @@ -303,7 +303,7 @@ public: // Mapped into primary region //- Return mass source for specie i - Eulerian phase only - virtual tmp Srho + virtual tmp SYi ( const label i ) const; diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/H2O b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/H2O similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/H2O rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/H2O diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/N2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/N2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/N2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/N2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/O2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/O2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/O2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/O2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/p b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/p similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/p rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/p diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/p_rgh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/p_rgh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/p_rgh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/p_rgh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/delta b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/delta similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/0/wallFilmRegion/delta rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/0/wallFilmRegion/delta diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allclean b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allclean similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allclean rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allclean diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allmesh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allmesh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allmesh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allmesh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allrun b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allrun similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/Allrun rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/Allrun diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/cloudProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/cloudProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/combustionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/combustionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/combustionProperties diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/fvModels b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/fvModels new file mode 100644 index 0000000000..473196281f --- /dev/null +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/fvModels @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +surfaceFilm +{ + type surfaceFilm; + libs ("libsurfaceFilmModels.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/g b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/g similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/g rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/g diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/momentumTransport b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/momentumTransport rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/momentumTransport diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/parcelInjectionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/parcelInjectionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/parcelInjectionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/parcelInjectionProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/speciesThermo b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/speciesThermo rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/speciesThermo diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/surfaceFilmProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/surfaceFilmProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/surfaceFilmProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/surfaceFilmProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/wallFilmRegion/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/wallFilmRegion/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/constant/wallFilmRegion/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/constant/wallFilmRegion/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/blockMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/blockMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/blockMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/controlDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/controlDict similarity index 96% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/controlDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/controlDict index c95ab8c7f0..03e07be76d 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/controlDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantReactingParticleFoam; +application buoyantReactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/createPatchDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/createPatchDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/createPatchDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/createPatchDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/decomposeParDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/decomposeParDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/decomposeParDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/extrudeToRegionMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/extrudeToRegionMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/extrudeToRegionMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/extrudeToRegionMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/topoSetDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/topoSetDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/wallFilmRegion/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/wallFilmRegion/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/wallFilmRegion/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/wallFilmRegion/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/wallFilmRegion/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/cylinder/system/wallFilmRegion/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/cylinder/system/wallFilmRegion/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/H2O b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/H2O similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/H2O rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/H2O diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/N2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/N2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/N2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/N2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/O2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/O2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/O2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/O2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/alphat b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/alphat similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/alphat rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/alphat diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/epsilon b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/epsilon similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/epsilon rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/epsilon diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/htcConv b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/htcConv similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/htcConv rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/htcConv diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/k b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/k similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/k rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/k diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/nut b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/nut similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/nut rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/nut diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/p b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/p similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/p rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/p diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/p_rgh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/p_rgh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/p_rgh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/p_rgh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/delta b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/delta similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/0/wallFilmRegion/delta rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/0/wallFilmRegion/delta diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allclean b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allclean similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allclean rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allclean diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allmesh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allmesh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allmesh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allmesh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allrun b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allrun similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allrun rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allrun diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allrun-parallel b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allrun-parallel similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/Allrun-parallel rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/Allrun-parallel diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/cloudProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/cloudProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/combustionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/combustionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/combustionProperties diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/fvModels b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/fvModels new file mode 100644 index 0000000000..473196281f --- /dev/null +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/fvModels @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +surfaceFilm +{ + type surfaceFilm; + libs ("libsurfaceFilmModels.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/g b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/g similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/g rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/g diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/momentumTransport b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/momentumTransport rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/momentumTransport diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/speciesThermo b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/speciesThermo rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/speciesThermo diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/surfaceFilmProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/surfaceFilmProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/surfaceFilmProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/wallFilmRegion/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/wallFilmRegion/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/constant/wallFilmRegion/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/constant/wallFilmRegion/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/createObstacle.setSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/createObstacle.setSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/createObstacle.setSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/createObstacle.setSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/createWallFilmZone.setSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/createWallFilmZone.setSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/createWallFilmZone.setSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/createWallFilmZone.setSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/patchify.setSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/patchify.setSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/patchify.setSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/patchify.setSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/patchifyObstacles b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/patchifyObstacles similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/patchifyObstacles rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/patchifyObstacles diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/blockMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/blockMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/blockMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/controlDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/controlDict similarity index 91% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/controlDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/controlDict index c7bf190c2e..0386a3f88e 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/controlDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantReactingParticleFoam; +application buoyantReactingFoam; startFrom startTime; @@ -33,7 +33,7 @@ writeInterval 0.1; purgeWrite 0; -writeFormat ascii; // binary; +writeFormat binary; writePrecision 10; @@ -51,5 +51,6 @@ maxCo 0.2; maxDeltaT 0.002; +libs ("libsurfaceFilmModels.so"); // ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/decomposeParDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/decomposeParDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/decomposeParDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/extrudeToRegionMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/extrudeToRegionMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/extrudeToRegionMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/extrudeToRegionMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/topoSetDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/topoSetDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/decomposeParDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/decomposeParDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/decomposeParDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/decomposeParDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/hotBoxes/system/wallFilmRegion/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/hotBoxes/system/wallFilmRegion/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/H2O b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/H2O similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/H2O rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/H2O diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/N2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/N2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/N2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/N2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/O2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/O2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/O2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/O2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/p b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/p similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/p rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/p diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/p_rgh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/p_rgh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/p_rgh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/p_rgh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/delta b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/delta similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/0/wallFilmRegion/delta rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/0/wallFilmRegion/delta diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allclean b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allclean similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allclean rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allclean diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allmesh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allmesh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allmesh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allrun b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allrun similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/Allrun rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/Allrun diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/combustionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/combustionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/combustionProperties diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/fvModels similarity index 86% rename from tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/fvModels index 8000925363..b811e2bb59 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire2D/constant/additionalControls +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/fvModels @@ -11,10 +11,14 @@ FoamFile format ascii; class dictionary; location "constant"; - object additionalControls; + object fvModels; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -solvePrimaryRegion true; +surfaceFilm +{ + type surfaceFilm; + libs ("libsurfaceFilmModels.so"); +} // ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/g b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/g similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/g rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/g diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/momentumTransport b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/momentumTransport rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/momentumTransport diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/speciesThermo b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/speciesThermo rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/speciesThermo diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/surfaceFilmProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/surfaceFilmProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/surfaceFilmProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/surfaceFilmProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/wallFilmRegion/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/wallFilmRegion/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/wallFilmRegion/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/constant/wallFilmRegion/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/createWallFilmRegionPatches.setSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/createWallFilmRegionPatches.setSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/createWallFilmRegionPatches.setSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/createWallFilmRegionPatches.setSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/blockMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/blockMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/blockMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/controlDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/controlDict similarity index 96% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/controlDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/controlDict index 1f2f18dc66..a82d8f4c1c 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/controlDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantReactingParticleFoam; +application buoyantReactingFoam; startFrom startTime; diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/createPatchDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/createPatchDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/createPatchDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/createPatchDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/decomposeParDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/decomposeParDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/decomposeParDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/extrudeToRegionMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/extrudeToRegionMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/extrudeToRegionMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/extrudeToRegionMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/fvSolution similarity index 94% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/fvSolution index f9ba5db8cc..3639bf21a7 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/fvSolution +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/fvSolution @@ -67,7 +67,7 @@ solvers relTol 0; } - "(Yi|O2|N2|H2O)" + "(Yi|O2|N2|H2O).*" { $hFinal; } @@ -75,10 +75,13 @@ solvers PIMPLE { + models yes; + thermophysics no; + flow no; + nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; - solvePrimaryRegion no; } relaxationFactors diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion.topoSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion.topoSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion.topoSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/createPatchDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/createPatchDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/createPatchDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/createPatchDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/system/wallFilmRegion/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/system/wallFilmRegion/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/wallFilmRegion.setSet b/tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/wallFilmRegion.setSet similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/wallFilmRegion.setSet rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/rivuletPanel/wallFilmRegion.setSet diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/H2O b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/H2O similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/H2O rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/H2O diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/N2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/N2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/N2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/N2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/O2 b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/O2 similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/O2 rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/O2 diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/p b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/p similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/p rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/p diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/p_rgh b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/p_rgh similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/p_rgh rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/p_rgh diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/T b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/T similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/T rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/T diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/U b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/U similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/U rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/U diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/delta b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/delta similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/0/wallFilm/delta rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/0/wallFilm/delta diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/Allclean b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/Allclean similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/Allclean rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/Allclean diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/Allrun b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/Allrun similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/Allrun rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/Allrun diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/cloudProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/cloudProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/cloudProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/combustionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/combustionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/combustionProperties diff --git a/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/fvModels b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/fvModels new file mode 100644 index 0000000000..473196281f --- /dev/null +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/fvModels @@ -0,0 +1,30 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +surfaceFilm +{ + type surfaceFilm; + libs ("libsurfaceFilmModels.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/g b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/g similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/g rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/g diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/momentumTransport b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/momentumTransport rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/momentumTransport diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/parcelInjectionProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/parcelInjectionProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/parcelInjectionProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/parcelInjectionProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/speciesThermo b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/speciesThermo rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/speciesThermo diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/surfaceFilmProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/surfaceFilmProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/surfaceFilmProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/surfaceFilmProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/wallFilm/thermophysicalProperties b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/wallFilm/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/constant/wallFilm/thermophysicalProperties rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/constant/wallFilm/thermophysicalProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/blockMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/blockMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/blockMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/controlDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/controlDict similarity index 96% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/controlDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/controlDict index 663dfa7222..9ac5bcb291 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/controlDict +++ b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application buoyantReactingParticleFoam; +application buoyantReactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/createPatchDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/createPatchDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/createPatchDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/createPatchDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/decomposeParDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/decomposeParDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/decomposeParDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/extrudeToRegionMeshDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/extrudeToRegionMeshDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/extrudeToRegionMeshDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/extrudeToRegionMeshDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/fvSolution diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/topoSetDict b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/topoSetDict rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/topoSetDict diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/wallFilm/fvSchemes b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/wallFilm/fvSchemes similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/wallFilm/fvSchemes rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/wallFilm/fvSchemes diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/wallFilm/fvSolution b/tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/wallFilm/fvSolution similarity index 100% rename from tutorials/lagrangian/buoyantReactingParticleFoam/splashPanel/system/wallFilm/fvSolution rename to tutorials/combustion/buoyantReactingFoam/Lagrangian/splashPanel/system/wallFilm/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/N2 b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/N2 rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/N2 diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/O2 b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/O2 rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/O2 diff --git a/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/Qdot b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/Qdot new file mode 100644 index 0000000000..047a3da41f --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/Qdot @@ -0,0 +1,32 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class volScalarField; + location "0"; + object Qdot; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -3 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + walls + { + type calculated; + value uniform 0; + } +} + + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/T b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/U b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/U rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/Ydefault b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/Ydefault similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/Ydefault rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/Ydefault diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/epsilon b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/epsilon similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/epsilon rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/epsilon diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/k b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/p b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/Allclean b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/Allclean similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/Allclean rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/Allclean diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/Allrun diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/chem.inp b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/chem.inp similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/chem.inp rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/chem.inp diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/therm.dat b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/therm.dat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/therm.dat rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/therm.dat diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/transportProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/transportProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/chemkin/transportProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/chemkin/transportProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/chemistryProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/chemistryProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/cloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/combustionProperties diff --git a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/parcelInjectionProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/fvModels similarity index 79% rename from tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/parcelInjectionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/fvModels index 363c6054c0..e660dd8bef 100644 --- a/tutorials/lagrangian/buoyantReactingParticleFoam/rivuletPanel/constant/parcelInjectionProperties +++ b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/fvModels @@ -11,13 +11,19 @@ FoamFile format ascii; class dictionary; location "constant"; - object scalarListList; + object fvModels; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN) -( - (0.050 0.025 0.09) (0 0 -5) 0.001 1000 0.002 300 4200 (1) -); +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/controlDict similarity index 96% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/controlDict index 8172aad418..4c6a81739a 100644 --- a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom startTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/aachenBomb/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/aachenBomb/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/CH4 b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/CH4 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/CH4 rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/CH4 diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/CO2 b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/CO2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/CO2 rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/CO2 diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/N2 b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/N2 rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/N2 diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/O2 b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/O2 rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/O2 diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/T b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/U b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/U rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/p b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/rho b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/rho similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/0/rho rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/0/rho diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/chemistryProperties b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/chemistryProperties rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/chemistryProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/combustionProperties diff --git a/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/fvModels new file mode 100644 index 0000000000..e660dd8bef --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/fvModels @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/reactions b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/reactions similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/reactions rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/reactions diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/thermo.compressibleGas similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/thermo.compressibleGas rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/thermo.compressibleGas diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/controlDict similarity index 96% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/controlDict index e60a885dfc..4c75069b1a 100644 --- a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom startTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/counterFlowFlame2DLTS/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/counterFlowFlame2DLTS/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/G b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/G similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/G rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/G diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/N2 b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/N2 rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/N2 diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/O2 b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/O2 rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/O2 diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/T b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/U b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/U rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/epsilon b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/epsilon similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/epsilon rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/epsilon diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/k b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0/p b/tutorials/combustion/reactingFoam/Lagrangian/filter/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/filter/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/filter/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/filter/Allrun diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/cloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/combustionProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/fvModels similarity index 93% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/fvModels index d6e455e00e..d64c79b566 100644 --- a/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels +++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/fvModels @@ -15,6 +15,17 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + filter1 { type explicitPorositySource; @@ -43,7 +54,6 @@ filter1 } } - massSource { type massSource; @@ -74,5 +84,4 @@ massSource } } - // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/parcelInjectionProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/parcelInjectionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/parcelInjectionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/parcelInjectionProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/particleTrackProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/particleTrackProperties rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/particleTrackProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/speciesThermo diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/filter/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/filter/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/controlDict similarity index 96% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/controlDict index 1c9fc5b30e..f97e265d81 100644 --- a/tutorials/lagrangian/reactingParticleFoam/filter/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom startTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/createBafflesDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/createBafflesDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/createBafflesDict rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/createBafflesDict diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/decomposeParDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/decomposeParDict rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/decomposeParDict diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/system/topoSetDict rename to tutorials/combustion/reactingFoam/Lagrangian/filter/system/topoSetDict diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/G b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/G similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/G rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/G diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/T b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/U b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/U rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/air b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/air similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/air rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/air diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/p b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/README b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/README similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/README rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/README diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/cloudPositions b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudPositions similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/cloudPositions rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudPositions diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/cloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/combustionProperties diff --git a/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/fvModels new file mode 100644 index 0000000000..e660dd8bef --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/fvModels @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/speciesThermo diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/controlDict similarity index 96% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/controlDict index c40637527c..3e183229b7 100644 --- a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom startTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/probesDict b/tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/probesDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/parcelInBox/system/probesDict rename to tutorials/combustion/reactingFoam/Lagrangian/parcelInBox/system/probesDict diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CH4 b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CH4 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CH4 rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CH4 diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CO b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CO similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CO rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CO diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CO2 b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CO2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/CO2 rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/CO2 diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/G b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/G similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/G rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/G diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/H2 b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/H2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/H2 rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/H2 diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/N2 b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/N2 rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/N2 diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/O2 b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/O2 rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/O2 diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/T b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/U b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/U rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/epsilon b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/epsilon similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/epsilon rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/epsilon diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/k b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/p.orig b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/p.orig similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/0/p.orig rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/0/p.orig diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/Allrun diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/chemistryProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/chemistryProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/chemistryProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/clouds b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/clouds similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/clouds rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/clouds diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/coalCloudPositions b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudPositions similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/coalCloudPositions rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudPositions diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/coalCloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/coalCloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/coalCloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/combustionProperties diff --git a/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/fvModels new file mode 100644 index 0000000000..fba1447084 --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/fvModels @@ -0,0 +1,35 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); +} + +radiation +{ + type radiation; + libs ("libradiationModels.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudPositions b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudPositions similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudPositions rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudPositions diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/limestoneCloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/limestoneCloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/radiationProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/radiationProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/radiationProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/reactions b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/reactions similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/reactions rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/reactions diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/speciesThermo diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/fvModels similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/constant/fvModels rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/fvModels diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/controlDict similarity index 96% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/controlDict index 6ba2bf63aa..5cf3cf4d75 100644 --- a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/decomposeParDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/decomposeParDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/decomposeParDict rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/decomposeParDict diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvConstraints b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvConstraints similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvConstraints rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvConstraints diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/topoSetDict b/tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/simplifiedSiwek/system/topoSetDict rename to tutorials/combustion/reactingFoam/Lagrangian/simplifiedSiwek/system/topoSetDict diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/T b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/U.orig b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/U.orig similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/U.orig rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/U.orig diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/air b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/air similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/air rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/air diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/k b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/omega b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/omega similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/omega rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/omega diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/p b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/Allrun diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/cloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/combustionProperties diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/fvModels new file mode 100644 index 0000000000..943702cc83 --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/fvModels @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/particleTrackProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/particleTrackProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/particleTrackProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/speciesThermo diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/controlDict similarity index 97% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/controlDict index d442fe49cb..0c2d715ee7 100644 --- a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvConstraints b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvConstraints similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvConstraints rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvConstraints diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannel/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannel/system/fvSolution diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/T b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/U.orig b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/U.orig similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/U.orig rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/U.orig diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/air b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/air similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/air rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/air diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/k b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/omega b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/omega similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/omega rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/omega diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/p b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/Allrun similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/Allrun diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/cloudProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/combustionProperties diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/fvModels new file mode 100644 index 0000000000..943702cc83 --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/fvModels @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/g similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/g diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/momentumTransport diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/particleTrackDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/particleTrackDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/particleTrackDict diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/speciesThermo diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/blockMeshDict diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/controlDict similarity index 97% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/controlDict index 3a1c5516e6..793ddf7917 100644 --- a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application reactingParticleFoam; +application reactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvConstraints b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvConstraints similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvConstraints rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvConstraints diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSchemes diff --git a/tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSolution similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/verticalChannelLTS/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelLTS/system/fvSolution diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/H2O b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/H2O similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/H2O rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/H2O diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/T b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/T similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/T rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/T diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/U.orig b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/U.orig similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/U.orig rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/U.orig diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/air b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/air similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/air rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/air diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/alphat b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/alphat similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/alphat rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/alphat diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/k b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/k similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/k rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/k diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/nut b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/nut similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/nut rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/nut diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/omega b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/omega similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/omega rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/omega diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/p b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/p similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/0/p rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/0/p diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/Allrun b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/Allrun similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/Allrun rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/Allrun diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/cloudProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/cloudProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/cloudProperties diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/combustionProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/combustionProperties similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/combustionProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/combustionProperties diff --git a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvConstraints similarity index 84% rename from tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvConstraints index 8000925363..8f8c695970 100644 --- a/tutorials/combustion/fireFoam/LES/smallPoolFire3D/constant/additionalControls +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvConstraints @@ -10,11 +10,16 @@ FoamFile version 2.0; format ascii; class dictionary; - location "constant"; - object additionalControls; + object fvConstraints; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -solvePrimaryRegion true; +limitp +{ + type limitPressure; + + minFactor 0.1; + maxFactor 1.5; +} // ************************************************************************* // diff --git a/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvModels b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvModels new file mode 100644 index 0000000000..943702cc83 --- /dev/null +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/fvModels @@ -0,0 +1,29 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Version: dev + \\/ M anipulation | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object fvModels; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +buoyancyForce +{ + type buoyancyForce; +} + +clouds +{ + type clouds; + libs ("liblagrangianParcel.so" "liblagrangianParcelTurbulence.so"); +} + +// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/g b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/g similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/g rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/g diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/momentumTransport b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/momentumTransport similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/momentumTransport rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/momentumTransport diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/particleTrackDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/particleTrackDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/particleTrackDict diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/speciesThermo b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/speciesThermo similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/speciesThermo rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/speciesThermo diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/constant/thermophysicalProperties rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/blockMeshDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/blockMeshDict similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/blockMeshDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/blockMeshDict diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/controlDict b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/controlDict similarity index 97% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/controlDict rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/controlDict index 5eb0318fcf..e537c47e30 100644 --- a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/controlDict +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application simpleReactingParticleFoam; +application reactingFoam; startFrom latestTime; diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/fvSchemes b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/fvSchemes rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/fvSchemes diff --git a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/fvSolution b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/fvSolution similarity index 92% rename from tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/fvSolution rename to tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/fvSolution index f16acd1355..7830694f0e 100644 --- a/tutorials/lagrangian/simpleReactingParticleFoam/verticalChannel/system/fvSolution +++ b/tutorials/combustion/reactingFoam/Lagrangian/verticalChannelSteady/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - p + "p.*" { solver GAMG; @@ -36,7 +36,7 @@ solvers $p; } - "(U|Yi|h|k|omega)" + "(U|Yi|h|k|omega).*" { solver smoothSolver; smoother GaussSeidel; @@ -51,12 +51,10 @@ potentialFlow nNonOrthogonalCorrectors 5; } -SIMPLE +PIMPLE { - nCorrectors 2; + nCorrectors 1; nNonOrthogonalCorrectors 0; - rhoMin 0.1; - rhoMax 1.5; } relaxationFactors @@ -66,6 +64,7 @@ relaxationFactors p 0.3; rho 1; } + equations { U 0.7;