diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/steadyReactingParcelFoam.C b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C similarity index 78% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/steadyReactingParcelFoam.C rename to applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C index a6aa1290a3..1160760bb6 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/steadyReactingParcelFoam.C +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/LTSReactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,17 +22,13 @@ License along with OpenFOAM. If not, see . Application - porousExplicitSourceReactingParcelFoam + LTSReactingParcelFoam Description - Transient PISO solver for compressible, laminar or turbulent flow with - reacting multiphase Lagrangian parcels for porous media, including explicit - sources for mass, momentum and energy - - The solver includes: - - reacting multiphase parcel cloud - - porous media - - mass, momentum and energy sources + Local time stepping (LTS) solver for steady, compressible, laminar or + turbulent reacting and non-reacting flow with multiphase Lagrangian + parcels and porous media, including explicit sources for mass, momentum + and energy Note: ddtPhiCorr not used here when porous zones are active - not well defined for porous calculations @@ -75,7 +71,7 @@ int main(int argc, char *argv[]) while (runTime.run()) { - #include "readSIMPLEControls.H" + #include "readPISOControls.H" #include "readChemistryProperties.H" #include "readAdditionalSolutionControls.H" #include "readTimeControls.H" @@ -84,26 +80,24 @@ int main(int argc, char *argv[]) Info<< "Time = " << runTime.timeName() << nl << endl; - p.storePrevIter(); + parcels.evolve(); - // --- Pressure-velocity corrector + #include "chemistry.H" + #include "timeScales.H" + + #include "rhoEqn.H" + #include "UEqn.H" + #include "YEqn.H" + #include "hsEqn.H" + + // --- PISO loop + for (int corr=0; corrcorrect(); } + turbulence->correct(); + if (runTime.write()) { chemistry.dQ()().write(); diff --git a/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/files b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/files new file mode 100644 index 0000000000..1efa8dad41 --- /dev/null +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/files @@ -0,0 +1,3 @@ +LTSReactingParcelFoam.C + +EXE = $(FOAM_APPBIN)/LTSReactingParcelFoam diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options rename to applications/solvers/lagrangian/LTSReactingParcelFoam/Make/options diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/UEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/UEqn.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/UEqn.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/YEqn.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/YEqn.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/chemistry.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/chemistry.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/chemistry.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/chemistry.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/createClouds.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createClouds.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/createClouds.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/createClouds.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/createExplicitSources.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/createExplicitSources.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/createExplicitSources.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H similarity index 96% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/createFields.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H index 68734ab9a7..5ca55b84f6 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H @@ -73,12 +73,12 @@ dimensionedScalar rhoMax ( - mesh.solutionDict().subDict("SIMPLE").lookup("rhoMax") + mesh.solutionDict().subDict("PISO").lookup("rhoMax") ); dimensionedScalar rhoMin ( - mesh.solutionDict().subDict("SIMPLE").lookup("rhoMin") + mesh.solutionDict().subDict("PISO").lookup("rhoMin") ); Info<< "Creating turbulence model\n" << endl; diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/createPorousZones.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/createPorousZones.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/createPorousZones.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/createPorousZones.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/hsEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/hsEqn.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H similarity index 95% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H index c9c4890b01..fccb98c8cb 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H @@ -48,9 +48,6 @@ } } - // Explicitly relax pressure for momentum corrector - p.relax(); - Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl; // Second part of thermodynamic density update diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/readAdditionalSolutionControls.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/readAdditionalSolutionControls.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/readAdditionalSolutionControls.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/readAdditionalSolutionControls.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/readChemistryProperties.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/readChemistryProperties.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/readChemistryProperties.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/readChemistryProperties.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/readTimeControls.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H similarity index 97% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/readTimeControls.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H index 0ab2be096e..420eb70c7b 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/readTimeControls.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/readTimeControls.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/rhoEqn.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H similarity index 95% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/rhoEqn.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H index e42db72399..f8f1d15ab7 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/rhoEqn.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/rhoEqn.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/setPressureWork.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H similarity index 100% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/setPressureWork.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H similarity index 99% rename from applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H rename to applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H index 0e26fcdac1..b44271ab8c 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/timeScales.H +++ b/applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/files b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/files deleted file mode 100644 index a64e1ee786..0000000000 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -steadyReactingParcelFoam.C - -EXE = $(FOAM_APPBIN)/steadyReactingParcelFoam diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C index fb237b0d04..be7539c6f3 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C +++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "Analytical.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,9 +58,9 @@ template typename Foam::IntegrationScheme::integrationResult Foam::Analytical::integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const { @@ -69,9 +68,18 @@ Foam::Analytical::integrate const scalar expTerm = exp(min(50, -beta*dt)); - retValue.average() = - alpha + (phi - alpha)*(1 - expTerm)/(beta*dt + ROOTVSMALL); - retValue.value() = alpha + (phi - alpha)*expTerm; + if (beta > ROOTVSMALL) + { + const Type alpha = alphaBeta/beta; + retValue.average() = alpha + (phi - alpha)*(1 - expTerm)/(beta*dt); + retValue.value() = alpha + (phi - alpha)*expTerm; + } + else + { + retValue.average() = phi; + retValue.value() = phi; + } + return retValue; } diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H index 15697136b2..5eca4f17a8 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H +++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H @@ -81,9 +81,9 @@ public: //- Perform the integration virtual typename IntegrationScheme::integrationResult integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const; }; diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C index 8e7e1aea2b..0ba07fb2af 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C +++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "Euler.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -59,14 +58,14 @@ template typename Foam::IntegrationScheme::integrationResult Foam::Euler::integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const { typename IntegrationScheme::integrationResult retValue; - retValue.value() = (phi + beta*dt*alpha)/(1.0 + beta*dt); + retValue.value() = (phi + alphaBeta*dt)/(1.0 + beta*dt); retValue.average() = 0.5*(phi + retValue.value()); return retValue; diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H index 1140713b13..3737d6e902 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H +++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H @@ -78,9 +78,9 @@ public: //- Perform the integration virtual typename IntegrationScheme::integrationResult integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const; }; diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C index a91e45d90e..a8ea549fce 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.C @@ -60,9 +60,9 @@ template typename Foam::IntegrationScheme::integrationResult Foam::IntegrationScheme::integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const { @@ -71,9 +71,9 @@ Foam::IntegrationScheme::integrate "Foam::IntegrationScheme::integrationResult" "Foam::IntegrationScheme::integrate" "(" - "const Type, " + "const Type&, " "const scalar, " - "const Type, " + "const Type&, " "const scalar" ") const" ); diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H index 93726d261f..941185dcd9 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H @@ -183,9 +183,9 @@ public: //- Perform the Integration virtual integrationResult integrate ( - const Type phi, + const Type& phi, const scalar dt, - const Type alpha, + const Type& alphaBeta, const scalar beta ) const; }; diff --git a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C index 925468ad61..10f7f5c1e8 100644 --- a/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/CollidingCloud/CollidingCloud.C @@ -114,11 +114,11 @@ Foam::CollidingCloud::CollidingCloud if (this->solution().active()) { setModels(); - } - if (readFields) - { - parcelType::readFields(*this); + if (readFields) + { + parcelType::readFields(*this); + } } } diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 4275cf78f8..3e49d29cd5 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -360,11 +360,11 @@ Foam::KinematicCloud::KinematicCloud if (solution_.active()) { setModels(); - } - if (readFields) - { - parcelType::readFields(*this); + if (readFields) + { + parcelType::readFields(*this); + } } if (solution_.resetSourcesOnStartup()) @@ -504,7 +504,7 @@ void Foam::KinematicCloud::checkParcelProperties parcel.rho() = constProps_.rho0(); } - const scalar carrierDt = this->db().time().deltaTValue(); + const scalar carrierDt = solution_.deltaT(); parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt; parcel.typeId() = constProps_.parcelTypeId(); } diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 1c465fc450..eb1f66e85a 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -117,6 +117,11 @@ Foam::ReactingCloud::ReactingCloud if (this->solution().active()) { setModels(); + + if (readFields) + { + parcelType::readFields(*this, this->composition()); + } } // Set storage for mass source fields and initialise to zero @@ -142,11 +147,6 @@ Foam::ReactingCloud::ReactingCloud ); } - if (readFields) - { - parcelType::readFields(*this, this->composition()); - } - if (this->solution().resetSourcesOnStartup()) { resetSourceTerms(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index 89374ecb48..0290eacb7c 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -94,11 +94,11 @@ Foam::ReactingMultiphaseCloud::ReactingMultiphaseCloud if (this->solution().active()) { setModels(); - } - if (readFields) - { - parcelType::readFields(*this, this->composition()); + if (readFields) + { + parcelType::readFields(*this, this->composition()); + } } if (this->solution().resetSourcesOnStartup()) diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index d2ce89b5c4..2dbe453580 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -135,11 +135,11 @@ Foam::ThermoCloud::ThermoCloud if (this->solution().active()) { setModels(); - } - if (readFields) - { - parcelType::readFields(*this); + if (readFields) + { + parcelType::readFields(*this); + } } if (this->solution().resetSourcesOnStartup()) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index 58390134b3..0a3e05d200 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -192,21 +192,20 @@ const Foam::vector Foam::KinematicParcel::calcVelocity const parcelType& p = static_cast(*this); const forceSuSp Fcp = forces.calcCoupled(p, dt, mass, Re, mu); const forceSuSp Fncp = forces.calcNonCoupled(p, dt, mass, Re, mu); - forceSuSp Feff = Fcp + Fncp; - Feff.Sp() += ROOTVSMALL; + const forceSuSp Feff = Fcp + Fncp; // New particle velocity //~~~~~~~~~~~~~~~~~~~~~~ // Update velocity - treat as 3-D - const vector ap = Uc_ + (Feff.Su() + Su)/Feff.Sp(); + const vector abp = (Feff.Sp()*Uc_ + (Feff.Su() + Su))/mass; const scalar bp = Feff.Sp()/mass; - Spu = Feff.Sp(); + Spu = Feff.Sp()*dt/td.cloud().solution().deltaT(); IntegrationScheme::integrationResult Ures = - td.cloud().UIntegrator().integrate(U, dt, ap, bp); + td.cloud().UIntegrator().integrate(U, dt, abp, bp); vector Unew = Ures.value(); diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index 622ef85fcf..9df054c2d0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -333,13 +333,13 @@ Foam::scalar Foam::ThermoParcel::calcHeatTransfer // Integrate to find the new parcel temperature IntegrationScheme::integrationResult Tres = - td.cloud().TIntegrator().integrate(T, dt, ap, bp); + td.cloud().TIntegrator().integrate(T, dt, ap*bp, bp); scalar Tnew = max(Tres.value(), td.cloud().constProps().TMin()); dhsTrans += dt*htc*As*(0.5*(T + Tnew) - Tc_); - Cuh = bp; + Cuh = bp*dt/td.cloud().solution().deltaT(); return Tnew; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C index 94b5a3d91b..5bf1c140c3 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C @@ -520,7 +520,7 @@ void Foam::InjectionModel::inject(TrackData& td) } const scalar time = this->owner().db().time().value(); - const scalar carrierDt = this->owner().db().time().deltaTValue(); + const scalar carrierDt = this->owner().solution().deltaT(); const polyMesh& mesh = this->owner().mesh(); // Prepare for next time step diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C index e2e1c67d24..3236774c18 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C @@ -290,7 +290,7 @@ void Foam::PatchInteractionModel::patchData } else { - Up = (Cf - Cf00)/mesh.time().deltaTValue(); + Up = (Cf - Cf00)/this->owner().solution().deltaT(); } if (mag(dn) > SMALL) @@ -312,7 +312,9 @@ void Foam::PatchInteractionModel::patchData // magOmega = sin(angle between unit normals) // Normalise omega vector by magOmega, then multiply by // angle/dt to give the correct angular velocity vector. - omega *= Foam::asin(magOmega)/(magOmega*mesh.time().deltaTValue()); + omega *= + Foam::asin(magOmega) + /(magOmega*this->owner().solution().deltaT()); // Project position onto face and calculate this position // relative to the face centre. diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/CH4 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CH4 similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/CH4 rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CH4 diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/CO2 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CO2 similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/CO2 rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/CO2 diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/H2O b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/H2O similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/H2O rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/H2O diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/N2 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/N2 rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/N2 diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/O2 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/O2 rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/O2 diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/T b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/T similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/T rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/T diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/U b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/U similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/U rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/U diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/alphat b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/alphat similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/alphat rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/alphat diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/epsilon b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/epsilon similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/epsilon rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/epsilon diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/k b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/k similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/k rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/k diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/mut b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/mut similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/mut rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/mut diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/p b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/p similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/p rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/p diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/rho b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/rho similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/0/rho rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/0/rho diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/Allrun b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun similarity index 82% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/Allrun rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun index 4263158119..ce144f896a 100755 --- a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/Allrun +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/Allrun @@ -8,4 +8,4 @@ cd ${0%/*} || exit 1 # run from this directory runApplication blockMesh # run the solver -runApplication steadyReactingParcelFoam +runApplication LTSReactingParcelFoam diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/RASProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/RASProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/RASProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/chemistryProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/energySourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/g b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/g rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/g diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/massSourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/momentumSourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/blockMeshDict diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/polyMesh/boundary diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/radiationProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/reactions b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactions similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/reactions rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/reactions diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermo.icoPoly8 diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/constant/turbulenceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/controlDict b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict similarity index 96% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/controlDict rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict index 9cb7a51bef..2d1233ffbe 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/controlDict +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/controlDict @@ -51,4 +51,8 @@ maxCo 0.5; maxDeltaT 1; +alphaTauSpecie 1e10; + +alphaTauTemp 0.005; + // ************************************************************************* // diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/fvSchemes rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution similarity index 97% rename from tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/fvSolution rename to tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution index 14096cac1e..799d7c9376 100755 --- a/tutorials/lagrangian/steadyReactingParcelFoam/counterFlowFlame2D/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution @@ -53,8 +53,9 @@ solvers } } -SIMPLE +PISO { + nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes; rhoMin rhoMin [1 -3 0 0 0] 0.1; @@ -68,10 +69,5 @@ additional solveSpecies true; } -relaxationFactors -{ - p 0.3; -} - // ************************************************************************* // diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/H2O b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/H2O similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/H2O rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/H2O diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/T b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/T similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/T rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/T diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/U b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/U similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/U rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/U diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/air b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/air similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/air rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/air diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/alphat b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/alphat similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/alphat rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/alphat diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/k b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/k rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/k diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/mut b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/mut similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/mut rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/mut diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/omega rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/omega diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/p b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/p similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0.org/p rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0.org/p diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/H2O similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/H2O rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/H2O diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/T similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/T rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/T diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/U similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/U rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/U diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/air similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/air rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/air diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/alphat b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/alphat similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/alphat rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/alphat diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/k rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/k diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/mut b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/mut similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/mut rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/mut diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/omega rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/omega diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/p similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/0/p rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/0/p diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/Allclean rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allclean diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/Allrun b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun similarity index 87% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/Allrun rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun index ab18f7f797..192c30fd62 100755 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/Allrun +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/Allrun @@ -8,6 +8,6 @@ cd ${0%/*} || exit 1 # run from this directory runApplication blockMesh # run the solver -runApplication steadyReactingParcelFoam +runApplication LTSReactingParcelFoam # ----------------------------------------------------------------- end-of-file diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/RASProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/RASProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/RASProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/chemistryProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/chemistryProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/chemistryProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/energySourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/energySourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/energySourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/g b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/g similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/g rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/g diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/massSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/massSourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/massSourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/momentumSourceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/momentumSourceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/momentumSourceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/particleTrackDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/particleTrackDict similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/particleTrackDict rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/particleTrackDict diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/blockMeshDict diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/polyMesh/boundary b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/boundary similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/polyMesh/boundary rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/polyMesh/boundary diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/porousZones b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/porousZones similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/porousZones rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/porousZones diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/radiationProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/radiationProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/radiationProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/radiationProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactions b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactions similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactions rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactions diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermo.incompressiblePoly diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/thermophysicalProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/thermophysicalProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/thermophysicalProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/turbulenceProperties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/turbulenceProperties rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/turbulenceProperties diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/controlDict rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/controlDict diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes similarity index 100% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/fvSchemes rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution similarity index 97% rename from tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/fvSolution rename to tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution index 25043f8651..1d4e95dae0 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/system/fvSolution +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution @@ -61,19 +61,15 @@ solvers }; } -SIMPLE +PISO { + nCorrectors 2; nNonOrthogonalCorrectors 0; // 10; momentumPredictor yes; rhoMin rhoMin [ 1 -3 0 0 0 ] 0; // 0.5; rhoMax rhoMax [ 1 -3 0 0 0 ] 100; // 1.5; } -relaxationFactors -{ - p 0.3; -} - additional { eWork true;