From f29916e208707020be83101ace16e8ed9fa419f6 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 20 Aug 2012 10:15:14 +0100 Subject: [PATCH 01/14] STYLE: corrected typos in header file comments --- .../pyrolysisModels/pyrolysisModel/pyrolysisModel.H | 4 ++-- src/regionModels/regionModel/regionModel/regionModel.H | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H index 7e4d0f4cc6..57d8caa3c4 100644 --- a/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H +++ b/src/regionModels/pyrolysisModels/pyrolysisModel/pyrolysisModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -161,7 +161,7 @@ public: // Selectors - //- Return a reference to the selected pyrolysis film model + //- Return a reference to the selected pyrolysis model static autoPtr New(const fvMesh& mesh); //- Return a reference to a named selected pyrolysis model diff --git a/src/regionModels/regionModel/regionModel/regionModel.H b/src/regionModels/regionModel/regionModel/regionModel.H index b65b3a23c7..6fbad3d372 100644 --- a/src/regionModels/regionModel/regionModel/regionModel.H +++ b/src/regionModels/regionModel/regionModel/regionModel.H @@ -262,7 +262,7 @@ public: //- Evolve the region virtual void evolveRegion(); - //- Evolve the film + //- Evolve the region virtual void evolve(); From e5e05867abb5375ebda4b5c741aecc293644a365 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 21 Aug 2012 10:56:54 +0100 Subject: [PATCH 02/14] ENH: primitiveMesh: handle faces with all coincident points --- .../primitiveMeshFaceCentresAndAreas.C | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C index 3d35250608..8de9076603 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C +++ b/src/OpenFOAM/meshes/primitiveMesh/primitiveMeshFaceCentresAndAreas.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -118,8 +118,19 @@ void Foam::primitiveMesh::makeFaceCentresAndAreas sumAc += a*c; } - fCtrs[facei] = (1.0/3.0)*sumAc/(sumA + VSMALL); - fAreas[facei] = 0.5*sumN; + + if (sumA < ROOTVSMALL) + { + // Sum of area too small. No chance of reliably calculating + // centroid so fallback to average. + fCtrs[facei] = fCentre; + fAreas[facei] = 0.5*sumN; + } + else + { + fCtrs[facei] = (1.0/3.0)*sumAc/sumA; + fAreas[facei] = 0.5*sumN; + } } } } From 9ded46a9b842470891ffd9c5a40f63796fb80697 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 21 Aug 2012 15:34:16 +0100 Subject: [PATCH 03/14] ENH: applyBoundaryLayer: generalise to turbulenceModel --- .../preProcessing/applyBoundaryLayer/createFields.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H index d401808244..d74cadc9bc 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H +++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,9 +41,9 @@ License singlePhaseTransportModel laminarTransport(U, phi); - autoPtr turbulence + autoPtr turbulence ( - incompressible::RASModel::New(U, phi, laminarTransport) + incompressible::turbulenceModel::New(U, phi, laminarTransport) ); Info<< "Calculating wall distance field" << endl; From 96b7e97207ab0205faeab592743370fe7aad15ba Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 21 Aug 2012 15:38:03 +0100 Subject: [PATCH 04/14] ENH: applyBoundaryLayer: use actual names --- .../preProcessing/applyBoundaryLayer/applyBoundaryLayer.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 828ba5d9c7..d19ea04210 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) if (args.optionFound("writenut")) { - Info<< "Writing nut" << endl; + Info<< "Writing " << nut.name() << nl << endl; nut.write(); } @@ -127,7 +127,7 @@ int main(int argc, char *argv[]) k = sqr(nut/(ck0*min(y, ybl))); k.correctBoundaryConditions(); - Info<< "Writing k\n" << endl; + Info<< "Writing " << k.name() << nl << endl; k.write(); @@ -138,7 +138,7 @@ int main(int argc, char *argv[]) epsilon = ce0*k*sqrt(k)/min(y, ybl); epsilon.correctBoundaryConditions(); - Info<< "Writing epsilon\n" << endl; + Info<< "Writing " << epsilon.name() << nl << endl; epsilon.write(); From d2538b78eadb0b4feb775ed78f13b3b164406c53 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 16:29:27 +0100 Subject: [PATCH 05/14] ENH: Added particle virtual mass force --- .../VirtualMass/VirtualMassForce.C | 119 ++++++++++++++ .../VirtualMass/VirtualMassForce.H | 149 ++++++++++++++++++ .../VirtualMass/VirtualMassForceI.H | 48 ++++++ 3 files changed, 316 insertions(+) create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C new file mode 100644 index 0000000000..ffb2e78754 --- /dev/null +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C @@ -0,0 +1,119 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 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 "VirtualMassForce.H" +#include "fvcDdt.H" +#include "fvcGrad.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::VirtualMassForce::VirtualMassForce +( + CloudType& owner, + const fvMesh& mesh, + const dictionary& dict +) +: + ParticleForce(owner, mesh, dict, typeName, true), + UName_(this->coeffs().template lookupOrDefault("U", "U")), + Cvm_(readScalar(this->coeffs().lookup("Cvm"))), + DUcDtPtr_(NULL) +{} + + +template +Foam::VirtualMassForce::VirtualMassForce +( + const VirtualMassForce& vmf +) +: + ParticleForce(vmf), + UName_(vmf.UName_), + Cvm_(vmf.Cvm_), + DUcDtPtr_(NULL) +{} + + +// * * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // + +template +Foam::VirtualMassForce::~VirtualMassForce() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +void Foam::VirtualMassForce::cacheFields(const bool store) +{ + if (store && !DUcDtPtr_) + { + const volVectorField& Uc = this->mesh().template + lookupObject(UName_); + + DUcDtPtr_ = new volVectorField(fvc::ddt(Uc) + (Uc & fvc::grad(Uc))); + } + else + { + if (DUcDtPtr_) + { + delete DUcDtPtr_; + DUcDtPtr_ = NULL; + } + } +} + + +template +Foam::forceSuSp Foam::VirtualMassForce::calcCoupled +( + const typename CloudType::parcelType& p, + const scalar dt, + const scalar mass, + const scalar Re, + const scalar muc +) const +{ + forceSuSp value(vector::zero, 0.0); + + value.Su() = mass*p.rhoc()/p.rho()*Cvm_*DUcDt()[p.cell()]; + + return value; +} + + +template +Foam::scalar Foam::VirtualMassForce::massAdd +( + const typename CloudType::parcelType& p, + const scalar mass +) const +{ + return mass*p.rhoc()/p.rho()*Cvm_; +} + + +// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H new file mode 100644 index 0000000000..96f385cce1 --- /dev/null +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H @@ -0,0 +1,149 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 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::VirtualMassForce + +Description + Calculates particle virtual mass force + +SourceFiles + VirtualMassForceI.H + VirtualMassForce.C + +\*---------------------------------------------------------------------------*/ + +#ifndef VirtualMassForce_H +#define VirtualMassForce_H + +#include "ParticleForce.H" +#include "volFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class VirtualMassForce Declaration +\*---------------------------------------------------------------------------*/ + +template +class VirtualMassForce +: + public ParticleForce +{ + // Private data + + //- Name of velocity field + const word UName_; + + //- Virtual mass coefficient - typically 0.5 + scalar Cvm_; + + //- Rate of change of carrier phase velocity + volVectorField* DUcDtPtr_; + + +public: + + //- Runtime type information + TypeName("virtualMass"); + + + // Constructors + + //- Construct from mesh + VirtualMassForce + ( + CloudType& owner, + const fvMesh& mesh, + const dictionary& dict + ); + + //- Construct copy + VirtualMassForce(const VirtualMassForce& pgf); + + //- Construct and return a clone + virtual autoPtr > clone() const + { + return autoPtr > + ( + new VirtualMassForce(*this) + ); + } + + + //- Destructor + virtual ~VirtualMassForce(); + + + // Member Functions + + // Access + + //- Return the rate of change of carrier phase velocity + inline const volVectorField& DUcDt() const; + + + // Evaluation + + //- Cache fields + virtual void cacheFields(const bool store); + + //- Calculate the non-coupled force + virtual forceSuSp calcCoupled + ( + const typename CloudType::parcelType& p, + const scalar dt, + const scalar mass, + const scalar Re, + const scalar muc + ) const; + + //- Return the added mass + virtual scalar massAdd + ( + const typename CloudType::parcelType& p, + const scalar mass + ) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "VirtualMassForceI.H" + +#ifdef NoRepository + #include "VirtualMassForce.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H new file mode 100644 index 0000000000..9d0562ce34 --- /dev/null +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H @@ -0,0 +1,48 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 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 . + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +template +const Foam::volVectorField& Foam::VirtualMassForce::DUcDt() const +{ + if (DUcDtPtr_) + { + return *DUcDtPtr_; + } + else + { + FatalErrorIn + ( + "const volVectorField& VirtualMassForce::DUcDt()" + "const" + ) << "DUcDt field not allocated" << abort(FatalError); + + return *reinterpret_cast(0); + } +} + + +// ************************************************************************* // From f91eb52ec9b4700e76771b3d9b190d1b53fc928b Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 16:30:01 +0100 Subject: [PATCH 06/14] STYLE: minor code formatting --- .../intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 1bc817a4c1..eb3a3fc11c 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -336,7 +336,6 @@ void Foam::ReactingCloud::evolve() } - template void Foam::ReactingCloud::autoMap(const mapPolyMesh& mapper) { From 45a5899043a97cce5c3279527aad877c78b4c19a Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 16:30:37 +0100 Subject: [PATCH 07/14] ENH: added virtual mass force selection to parcel types --- .../intermediate/parcels/include/makeParcelForces.H | 6 ++++-- .../intermediate/parcels/include/makeThermoParcelForces.H | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H index 81e1658000..7658900598 100644 --- a/src/lagrangian/intermediate/parcels/include/makeParcelForces.H +++ b/src/lagrangian/intermediate/parcels/include/makeParcelForces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,6 +36,7 @@ License #include "ParamagneticForce.H" #include "PressureGradientForce.H" #include "SRFForce.H" +#include "VirtualMassForce.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -48,7 +49,8 @@ License makeParticleForceModelType(NonInertialFrameForce, CloudType); \ makeParticleForceModelType(ParamagneticForce, CloudType); \ makeParticleForceModelType(PressureGradientForce, CloudType); \ - makeParticleForceModelType(SRFForce, CloudType); + makeParticleForceModelType(SRFForce, CloudType); \ + makeParticleForceModelType(VirtualMassForce, CloudType); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H index f71ad43d5e..dff1f464a1 100644 --- a/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H +++ b/src/lagrangian/intermediate/parcels/include/makeThermoParcelForces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,6 +37,7 @@ License #include "ParamagneticForce.H" #include "PressureGradientForce.H" #include "SRFForce.H" +#include "VirtualMassForce.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -50,7 +51,8 @@ License makeParticleForceModelType(NonInertialFrameForce, CloudType); \ makeParticleForceModelType(ParamagneticForce, CloudType); \ makeParticleForceModelType(PressureGradientForce, CloudType); \ - makeParticleForceModelType(SRFForce, CloudType); + makeParticleForceModelType(SRFForce, CloudType); \ + makeParticleForceModelType(VirtualMassForce, CloudType); // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From e406ee04e90478901db3c9a89128b7e4bd338d5d Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 16:31:24 +0100 Subject: [PATCH 08/14] ENH: Added 'added mass' hook to particle forces --- .../ParticleForceList/ParticleForceList.C | 19 ++++++++++++++++++- .../ParticleForceList/ParticleForceList.H | 7 +++++++ .../ParticleForce/ParticleForce.C | 14 ++++++++++++-- .../ParticleForce/ParticleForce.H | 11 +++++++++-- 4 files changed, 46 insertions(+), 5 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C index c4ad6aa5d7..04016823b4 100644 --- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C +++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -180,4 +180,21 @@ Foam::forceSuSp Foam::ParticleForceList::calcNonCoupled } +template +Foam::scalar Foam::ParticleForceList::massEff +( + const typename CloudType::parcelType& p, + const scalar mass +) const +{ + scalar massEff = mass; + forAll(*this, i) + { + massEff += this->operator[](i).massAdd(p, mass); + } + + return massEff; +} + + // ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H index 5eda11a0f5..fe5f561268 100644 --- a/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H +++ b/src/lagrangian/intermediate/submodels/ForceTypes/ParticleForceList/ParticleForceList.H @@ -130,6 +130,13 @@ public: const scalar Re, const scalar muc ) const; + + //- Return the effective mass + virtual scalar massEff + ( + const typename CloudType::parcelType& p, + const scalar mass + ) const; }; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C index fc4ba1314b..7adbb47ebd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,6 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - template Foam::ParticleForce::ParticleForce ( @@ -120,6 +119,17 @@ Foam::forceSuSp Foam::ParticleForce::calcNonCoupled } +template +Foam::scalar Foam::ParticleForce::massAdd +( + const typename CloudType::parcelType& p, + const scalar mass +) const +{ + return 0.0; +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #include "ParticleForceNew.C" diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H index c5a6cf01d7..a72abc3217 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/ParticleForce/ParticleForce.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class ParticleForce Declaration + Class ParticleForce Declaration \*---------------------------------------------------------------------------*/ template @@ -169,6 +169,13 @@ public: const scalar Re, const scalar muc ) const; + + //- Return the added mass + virtual scalar massAdd + ( + const typename CloudType::parcelType& p, + const scalar mass + ) const; }; From a4167018cb3bf98a72c5dc17cd5e1ff6217bd45e Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 16:31:56 +0100 Subject: [PATCH 09/14] ENH: Updated particle velocity integration procedure --- .../parcels/Templates/KinematicParcel/KinematicParcel.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index 8fa42ac0ec..58217adbf5 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -169,14 +169,15 @@ const Foam::vector Foam::KinematicParcel::calcVelocity const forceSuSp Fcp = forces.calcCoupled(p, dt, mass, Re, mu); const forceSuSp Fncp = forces.calcNonCoupled(p, dt, mass, Re, mu); const forceSuSp Feff = Fcp + Fncp; + const scalar massEff = forces.massEff(p, mass); // New particle velocity //~~~~~~~~~~~~~~~~~~~~~~ // Update velocity - treat as 3-D - const vector abp = (Feff.Sp()*Uc_ + (Feff.Su() + Su))/mass; - const scalar bp = Feff.Sp()/mass; + const vector abp = (Feff.Sp()*Uc_ + (Feff.Su() + Su))/massEff; + const scalar bp = Feff.Sp()/massEff; Spu = dt*Feff.Sp(); From 473c5d51109236013c0c9afc1415d943f51c58c3 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 17:37:46 +0100 Subject: [PATCH 10/14] ENH: Updated particle virtual mass force to interpolate DucDt --- .../VirtualMass/VirtualMassForce.C | 28 ++++++++++++++++--- .../VirtualMass/VirtualMassForce.H | 7 +++++ .../VirtualMass/VirtualMassForceI.H | 18 ++++++++++++ 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C index ffb2e78754..3dca602dd4 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.C @@ -40,7 +40,8 @@ Foam::VirtualMassForce::VirtualMassForce ParticleForce(owner, mesh, dict, typeName, true), UName_(this->coeffs().template lookupOrDefault("U", "U")), Cvm_(readScalar(this->coeffs().lookup("Cvm"))), - DUcDtPtr_(NULL) + DUcDtPtr_(NULL), + DUcDtInterpPtr_(NULL) {} @@ -53,7 +54,8 @@ Foam::VirtualMassForce::VirtualMassForce ParticleForce(vmf), UName_(vmf.UName_), Cvm_(vmf.Cvm_), - DUcDtPtr_(NULL) + DUcDtPtr_(NULL), + DUcDtInterpPtr_(NULL) {} @@ -74,10 +76,25 @@ void Foam::VirtualMassForce::cacheFields(const bool store) const volVectorField& Uc = this->mesh().template lookupObject(UName_); - DUcDtPtr_ = new volVectorField(fvc::ddt(Uc) + (Uc & fvc::grad(Uc))); + DUcDtPtr_ = new volVectorField + ( + "DUcDt", + fvc::ddt(Uc) + (Uc & fvc::grad(Uc)) + ); + + DUcDtInterpPtr_.reset + ( + interpolation::New + ( + this->owner().solution().interpolationSchemes(), + *DUcDtPtr_ + ).ptr() + ); } else { + DUcDtInterpPtr_.clear(); + if (DUcDtPtr_) { delete DUcDtPtr_; @@ -99,7 +116,10 @@ Foam::forceSuSp Foam::VirtualMassForce::calcCoupled { forceSuSp value(vector::zero, 0.0); - value.Su() = mass*p.rhoc()/p.rho()*Cvm_*DUcDt()[p.cell()]; + vector DUcDt = + DUcDtInterp().interpolate(p.position(), p.currentTetIndices()); + + value.Su() = mass*p.rhoc()/p.rho()*Cvm_*DUcDt; return value; } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H index 96f385cce1..c5277ec696 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForce.H @@ -38,6 +38,7 @@ SourceFiles #include "ParticleForce.H" #include "volFields.H" +#include "interpolation.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -64,6 +65,9 @@ class VirtualMassForce //- Rate of change of carrier phase velocity volVectorField* DUcDtPtr_; + //- Rate of change of carrier phase velocity interpolator + autoPtr > DUcDtInterpPtr_; + public: @@ -105,6 +109,9 @@ public: //- Return the rate of change of carrier phase velocity inline const volVectorField& DUcDt() const; + //- Return the rate of change of carrier phase velocity interpolator + inline const interpolation& DUcDtInterp() const; + // Evaluation diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H index 9d0562ce34..e156c58d14 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/VirtualMass/VirtualMassForceI.H @@ -45,4 +45,22 @@ const Foam::volVectorField& Foam::VirtualMassForce::DUcDt() const } +template +inline const Foam::interpolation& +Foam::VirtualMassForce::DUcDtInterp() const +{ + if (!DUcDtInterpPtr_.valid()) + { + FatalErrorIn + ( + "inline const Foam::interpolation&" + "Foam::VirtualMassForce::DUcDtInterp() const" + ) << "Carrier pahase DUcDt interpolation object not set" + << abort(FatalError); + } + + return DUcDtInterpPtr_(); +} + + // ************************************************************************* // From 01c5f5136f5dd2fa463a32a55d7852dcf2e30cbc Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 17:47:14 +0100 Subject: [PATCH 11/14] ENH: Added TMax to thermo parcel constant properties --- .../Templates/ReactingParcel/ReactingParcel.H | 1 + .../Templates/ReactingParcel/ReactingParcelI.H | 2 ++ .../parcels/Templates/ThermoParcel/ThermoParcel.H | 7 +++++++ .../parcels/Templates/ThermoParcel/ThermoParcelI.H | 14 ++++++++++++++ 4 files changed, 24 insertions(+) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 230a4c1cd3..0bb8f3704e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -115,6 +115,7 @@ public: const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 04b85b99dc..c3f1872606 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -85,6 +85,7 @@ inline Foam::ReactingParcel::constantProperties::constantProperties const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -105,6 +106,7 @@ inline Foam::ReactingParcel::constantProperties::constantProperties poissonsRatio, T0, TMin, + TMax, Cp0, epsilon0, f0, diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index e7b5a14a49..232b45d471 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -82,6 +82,9 @@ public: //- Minimum temperature [K] scalar TMin_; + //- Maximum temperature [K] + scalar TMax_; + //- Particle specific heat capacity [J/(kg.K)] scalar Cp0_; @@ -123,6 +126,7 @@ public: const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -140,6 +144,9 @@ public: //- Return const access to minimum temperature [K] inline scalar TMin() const; + //- Return const access to maximum temperature [K] + inline scalar TMax() const; + //- Return const access to the particle specific heat capacity // [J/(kg.K)] inline scalar Cp0() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index e5c7e349c5..952a7a5bbe 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -31,6 +31,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties() ParcelType::constantProperties(), T0_(0.0), TMin_(0.0), + TMax_(VGREAT), Cp0_(0.0), epsilon0_(0.0), f0_(0.0), @@ -47,6 +48,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ParcelType::constantProperties(cp), T0_(cp.T0_), TMin_(cp.TMin_), + TMax_(cp.TMax_), Cp0_(cp.Cp0_), epsilon0_(cp.epsilon0_), f0_(cp.f0_), @@ -64,6 +66,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ParcelType::constantProperties(parentDict, readFields), T0_(0.0), TMin_(0.0), + TMax_(VGREAT), Cp0_(0.0), epsilon0_(0.0), f0_(0.0), @@ -73,6 +76,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties { this->dict().lookup("T0") >> T0_; this->dict().lookup("TMin") >> TMin_; + this->dict().lookup("TMax") >> TMax_; this->dict().lookup("Cp0") >> Cp0_; this->dict().lookup("epsilon0") >> epsilon0_; this->dict().lookup("f0") >> f0_; @@ -92,6 +96,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -109,6 +114,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ), T0_(T0), TMin_(TMin), + TMax_(TMax), Cp0_(Cp0), epsilon0_(epsilon0), f0_(f0), @@ -195,6 +201,14 @@ Foam::ThermoParcel::constantProperties::TMin() const } +template +inline Foam::scalar +Foam::ThermoParcel::constantProperties::TMax() const +{ + return TMax_; +} + + template inline Foam::scalar Foam::ThermoParcel::constantProperties::Cp0() const From f60ae60fe12697008af3ac82b728a9becaa8d63f Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 17:49:15 +0100 Subject: [PATCH 12/14] ENH: limited parcel max temperature to TMax --- .../parcels/Templates/ThermoParcel/ThermoParcel.C | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index cb9b714204..7baa54c1eb 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -324,7 +324,16 @@ Foam::scalar Foam::ThermoParcel::calcHeatTransfer IntegrationScheme::integrationResult Tres = td.cloud().TIntegrator().integrate(T_, dt, ap*bp, bp); - scalar Tnew = max(Tres.value(), td.cloud().constProps().TMin()); + scalar Tnew = + min + ( + max + ( + Tres.value(), + td.cloud().constProps().TMin() + ), + td.cloud().constProps().TMax() + ); Sph = dt*htc*As; From bd6052efe7dcde4632476c02f8e2b58a087f5f5f Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 18:08:19 +0100 Subject: [PATCH 13/14] ENH: provided some defaults for parcel constant property parameters --- .../KinematicParcel/KinematicParcelI.H | 24 ++++++++++++++----- .../ReactingParcel/ReactingParcelI.H | 8 +++++-- .../Templates/ThermoParcel/ThermoParcelI.H | 15 ++++++++---- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index ba48774d69..4e4e0bf7be 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -67,19 +67,31 @@ inline Foam::KinematicParcel::constantProperties::constantProperties ) : dict_(parentDict.subOrEmptyDict("constantProperties")), - parcelTypeId_(-1), - rhoMin_(0.0), + parcelTypeId_(1), + rhoMin_(1e-15), rho0_(0.0), - minParticleMass_(0.0), + minParticleMass_(1e-15), youngsModulus_(0.0), poissonsRatio_(0.0) { if (readFields) { - dict_.lookup("parcelTypeId") >> parcelTypeId_; - dict_.lookup("rhoMin") >> rhoMin_; + if (dict_.readIfPresent("parcelTypeId", parcelTypeId_)) + { + Info<< " employing parcel parcelTypeId of " << parcelTypeId_ + << endl; + } + if (dict_.readIfPresent("rhoMin", rhoMin_)) + { + Info<< " employing parcel rhoMin of " << rhoMin_ << endl; + } + if (dict_.readIfPresent("minParticleMass", minParticleMass_)) + { + Info<< " employing parcel minParticleMass of " + << minParticleMass_ << endl; + } + dict_.lookup("rho0") >> rho0_; - dict_.lookup("minParticleMass") >> minParticleMass_; dict_.lookup("youngsModulus") >> youngsModulus_; dict_.lookup("poissonsRatio") >> poissonsRatio_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index c3f1872606..e6c140973f 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -59,14 +59,18 @@ inline Foam::ReactingParcel::constantProperties::constantProperties ) : ParcelType::constantProperties(parentDict, readFields), - pMin_(0.0), + pMin_(1000.0), constantVolume_(false), Tvap_(0.0), Tbp_(0.0) { if (readFields) { - this->dict().lookup("pMin") >> pMin_; + if (this->dict().readIfPresent("pMin", pMin_)) + { + Info<< " employing parcel pMin of " << pMin_ << endl; + } + this->dict().lookup("constantVolume") >> constantVolume_; this->dict().lookup("Tvap") >> Tvap_; this->dict().lookup("Tbp") >> Tbp_; diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index 952a7a5bbe..85f7a0c3d5 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -65,8 +65,8 @@ inline Foam::ThermoParcel::constantProperties::constantProperties : ParcelType::constantProperties(parentDict, readFields), T0_(0.0), - TMin_(0.0), - TMax_(VGREAT), + TMin_(200), + TMax_(5000), Cp0_(0.0), epsilon0_(0.0), f0_(0.0), @@ -74,9 +74,16 @@ inline Foam::ThermoParcel::constantProperties::constantProperties { if (readFields) { + if (this->dict().readIfPresent("TMin", TMin_)) + { + Info<< " employing parcel TMin of " << TMin_ << endl; + } + if (this->dict().readIfPresent("TMax", TMax_)) + { + Info<< " employing parcel TMax of " << TMax_ << endl; + } + this->dict().lookup("T0") >> T0_; - this->dict().lookup("TMin") >> TMin_; - this->dict().lookup("TMax") >> TMax_; this->dict().lookup("Cp0") >> Cp0_; this->dict().lookup("epsilon0") >> epsilon0_; this->dict().lookup("f0") >> f0_; From e7a238dc3a515faceb3b653b86f295b9f15f2745 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 21 Aug 2012 18:13:44 +0100 Subject: [PATCH 14/14] ENH: Cleaned-up lagrangian tutorial cloud input properties dictionaries --- .../constant/reactingCloud1Properties | 7 ------- .../les/smallPoolFire2D/constant/reactingCloud1Properties | 7 ------- .../les/smallPoolFire3D/constant/reactingCloud1Properties | 7 ------- .../verticalChannel/constant/reactingCloud1Properties | 7 ------- .../simplifiedSiwek/constant/coalCloud1Properties | 7 ------- .../simplifiedSiwek/constant/limestoneCloud1Properties | 4 ---- .../hopperEmptying/constant/kinematicCloudProperties | 5 ----- .../hopperInitialState/constant/kinematicCloudProperties | 5 ----- .../filter/constant/reactingCloud1Properties | 7 ------- .../parcelInBox/constant/reactingCloud1Properties | 7 ------- .../verticalChannel/constant/reactingCloud1Properties | 7 ------- .../cylinder/constant/reactingCloud1Properties | 7 ------- .../hotBoxes/constant/reactingCloud1Properties | 7 ------- .../splashPanel/constant/reactingCloud1Properties | 7 ------- .../evaporationTest/constant/reactingCloud1Properties | 7 ------- .../sprayFoam/aachenBomb/constant/sprayCloudProperties | 7 ------- 16 files changed, 105 deletions(-) diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties index f1fec22f39..91b20eee70 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties index f1fec22f39..91b20eee70 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties index f1fec22f39..91b20eee70 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index c155594c01..5c93f36555 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -60,13 +60,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 350; Cp0 4100; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 8f07ac40e7..fc5042f2c1 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index f149873427..29cfd8d563 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -53,10 +53,6 @@ constantProperties { parcelTypeId 2; - rhoMin 1e-15; - TMin 200; - minParticleMass 1e-15; - rho0 2500; T0 300; Cp0 900; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties index 3ea1510347..3601470655 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperEmptying/constant/kinematicCloudProperties @@ -45,11 +45,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - minParticleMass 1e-15; - rho0 964; youngsModulus 6e8; poissonsRatio 0.35; diff --git a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties index fac715eceb..fbd8c9f174 100644 --- a/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/kinematicCloudProperties @@ -37,11 +37,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - minParticleMass 1e-15; - rho0 964; youngsModulus 6e8; poissonsRatio 0.35; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 36af7910eb..613b407de1 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4100; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index c2fb9a550b..10bb7ccc33 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 350; Cp0 4100; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index c05dc6a728..aac578722d 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 350; Cp0 4100; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties index 4b520415a0..875e31a59c 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index adef8f34d4..78f4e7bb5d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties index 6c2f59c4b4..6704aad914 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties @@ -53,13 +53,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 778983882a..79ede769ec 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 300; Cp0 4187; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties index 9dee39da64..f46abc6258 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties @@ -54,13 +54,6 @@ solution constantProperties { - parcelTypeId 1; - - rhoMin 1e-15; - TMin 200; - pMin 1000; - minParticleMass 1e-15; - rho0 1000; T0 320; Cp0 4187;