From 402ce6c834f91045f1d5ee8aee64f3b8c36cc05c Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 18 Dec 2014 12:25:19 +0000 Subject: [PATCH] Renamed minParticleMass -> minParcelMass Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1288 --- .../Templates/KinematicParcel/KinematicParcel.H | 6 +++--- .../Templates/KinematicParcel/KinematicParcelI.H | 12 ++++++------ .../ReactingMultiphaseParcel.C | 4 ++-- .../Templates/ReactingParcel/ReactingParcel.C | 2 +- .../parcels/Templates/SprayParcel/SprayParcel.H | 4 ++-- .../parcels/Templates/SprayParcel/SprayParcelI.H | 6 +++--- .../ORourkeCollision/ORourkeCollision.C | 4 ++-- .../Goldschmidt/constant/kinematicCloudProperties | 2 +- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 2f42d4c02e..6b6f258287 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -105,8 +105,8 @@ public: //- Particle density [kg/m3] (constant) demandDrivenEntry rho0_; - //- Minimum particle mass [kg] - demandDrivenEntry minParticleMass_; + //- Minimum parcel mass [kg] + demandDrivenEntry minParcelMass_; public: @@ -138,7 +138,7 @@ public: inline scalar rho0() const; //- Return const access to the minimum particle mass - inline scalar minParticleMass() const; + inline scalar minParcelMass() const; }; diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index 061b2d0911..2f998dd3a1 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Foam::KinematicParcel::constantProperties::constantProperties() parcelTypeId_(dict_, -1), rhoMin_(dict_, 0.0), rho0_(dict_, 0.0), - minParticleMass_(dict_, 0.0) + minParcelMass_(dict_, 0.0) {} @@ -51,7 +51,7 @@ inline Foam::KinematicParcel::constantProperties::constantProperties parcelTypeId_(cp.parcelTypeId_), rhoMin_(cp.rhoMin_), rho0_(cp.rho0_), - minParticleMass_(cp.minParticleMass_) + minParcelMass_(cp.minParcelMass_) {} @@ -65,7 +65,7 @@ inline Foam::KinematicParcel::constantProperties::constantProperties parcelTypeId_(dict_, "parcelTypeId", -1), rhoMin_(dict_, "rhoMin", 1e-15), rho0_(dict_, "rho0"), - minParticleMass_(dict_, "minParticleMass", 1e-15) + minParcelMass_(dict_, "minParcelMass", 1e-15) {} @@ -165,9 +165,9 @@ Foam::KinematicParcel::constantProperties::rho0() const template inline Foam::scalar -Foam::KinematicParcel::constantProperties::minParticleMass() const +Foam::KinematicParcel::constantProperties::minParcelMass() const { - return minParticleMass_.value(); + return minParcelMass_.value(); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 31d6059c50..847964c3e0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -341,7 +341,7 @@ void Foam::ReactingMultiphaseParcel::calc } // Remove the particle when mass falls below minimum threshold - if (np0*mass1 < td.cloud().constProps().minParticleMass()) + if (np0*mass1 < td.cloud().constProps().minParcelMass()) { td.keepParticle = false; diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 8ae6f5fe09..d8f37f8a9a 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -514,7 +514,7 @@ void Foam::ReactingParcel::calc } // Remove the particle when mass falls below minimum threshold - if (np0*mass1 < td.cloud().constProps().minParticleMass()) + if (np0*mass1 < td.cloud().constProps().minParcelMass()) { td.keepParticle = false; diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H index 8b411e2c47..ebd03f6693 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H +++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ public: const label parcelTypeId, const scalar rhoMin, const scalar rho0, - const scalar minParticleMass, + const scalar minParcelMass, const scalar youngsModulus, const scalar poissonsRatio, const scalar T0, diff --git a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H index 1e08f093d4..788b56b032 100644 --- a/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H +++ b/src/lagrangian/spray/parcels/Templates/SprayParcel/SprayParcelI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ inline Foam::SprayParcel::constantProperties::constantProperties const label parcelTypeId, const scalar rhoMin, const scalar rho0, - const scalar minParticleMass, + const scalar minParcelMass, const scalar youngsModulus, const scalar poissonsRatio, const scalar T0, @@ -85,7 +85,7 @@ inline Foam::SprayParcel::constantProperties::constantProperties parcelTypeId, rhoMin, rho0, - minParticleMass, + minParcelMass, youngsModulus, poissonsRatio, T0, diff --git a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C index 258dd588a3..36105b57da 100644 --- a/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C +++ b/src/lagrangian/spray/submodels/StochasticCollision/ORourkeCollision/ORourkeCollision.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ void Foam::ORourkeCollision::collide(const scalar dt) parcelType& p = iter(); scalar mass = p.nParticle()*p.mass(); - if (mass < this->owner().constProps().minParticleMass()) + if (mass < this->owner().constProps().minParcelMass()) { this->owner().deleteParticle(p); } diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties index 4e8ba75f24..9e40fa2de1 100644 --- a/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties +++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/constant/kinematicCloudProperties @@ -48,7 +48,7 @@ constantProperties parcelTypeId 1; rhoMin 1e-15; - minParticleMass 1e-15; + minParcelMass 1e-15; rho0 2526; youngsModulus 1e8;