From 3dfbbdbfe90da23a400d72939d50bda530474fde Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sat, 10 Aug 2019 16:29:08 +0100 Subject: [PATCH] Patch for some misc. typos and inconsistencies Resolves patch request https://bugs.openfoam.org/view.php?id=3325 Patch contributed by Timo Niemi, VTT. --- .../diameterModels/diameterModel/diameterModel.H | 2 +- .../diameterModels/diameterModel/diameterModel.H | 4 ++-- .../twoPhaseSystem/phaseModel/phaseModel.H | 6 +++--- .../distributionModel/distributionModel.H | 9 ++------- .../parcels/Templates/ReactingParcel/ReactingParcel.C | 4 +--- 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H index 0c66e1359e..c0c89fbd5a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/diameterModels/diameterModel/diameterModel.H @@ -25,7 +25,7 @@ Class Foam::diameterModel Description - A2stract base-class for dispersed-phase particle diameter models. + Abstract base-class for dispersed-phase particle diameter models. SourceFiles diameterModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H index f447cec10d..c0c89fbd5a 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::diameterModel Description - A2stract base-class for dispersed-phase particle diameter models. + Abstract base-class for dispersed-phase particle diameter models. SourceFiles diameterModel.C diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H index f0d29018b6..ea6b606c5f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/phaseModel/phaseModel.H @@ -208,14 +208,14 @@ public: return thermo_->alpha(patchi); } - //- Thermal diffusivity for temperature of mixture [W/m/K] + //- Thermal diffusivity for temperature of mixture + // for patch [W/m/K] tmp kappa(const label patchi) const { return thermo_->kappa(patchi); } - //- Thermal diffusivity for temperature of mixture - // for patch [W/m/K] + //- Thermal diffusivity for temperature of mixture [W/m/K] tmp kappa() const { return thermo_->kappa(); diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H index b93e1f2b9a..0b830b1a41 100644 --- a/src/lagrangian/distributionModels/distributionModel/distributionModel.H +++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,11 +39,6 @@ Description - Mass-based Rosin-Rammler - uniform - The distributionModel is tabulated in equidistant nPoints, in an interval. - These values are integrated to obtain the cumulated distribution model, - which is then used to change the distribution from unifrom to - the actual distributionModel. - SourceFiles distributionModel.C distributionModelNew.C @@ -146,7 +141,7 @@ public: //- Return the maximum value virtual scalar maxValue() const = 0; - //- Return the maximum value + //- Return the mean value virtual scalar meanValue() const = 0; }; diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 9c7657bbd8..738a513e43 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2019 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -80,8 +80,6 @@ void Foam::ReactingParcel::calcPhaseChange const scalar Tdash = min(T, TMax); const scalar Tsdash = min(Ts, TMax); - scalarField hmm(dMassPC); - // Calculate mass transfer due to phase change phaseChange.calculate (