From 66df3369dcd58559049f6aa45a739993a5ab4a89 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Thu, 17 May 2018 09:04:00 +0100 Subject: [PATCH 01/10] BUG: ConeInjection - corrected number of parcels injected for multiple injector positions --- .../InjectionModel/ConeInjection/ConeInjection.C | 8 ++++---- .../hotBoxes/constant/reactingCloud1Properties | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index 6651a9573f..7daf1cab7d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -198,12 +198,12 @@ Foam::label Foam::ConeInjection::parcelsToInject { const scalar targetVolume = flowRateProfile_.integrate(0, time1); + const scalar volumeFraction = targetVolume/this->volumeTotal_; + const label targetParcels = - parcelsPerInjector_*targetVolume/this->volumeTotal_; + ceil(positionAxis_.size()*parcelsPerInjector_*volumeFraction); - const label nToInject = targetParcels - nInjected_; - - return positionAxis_.size()*nToInject; + return targetParcels - nInjected_; } else { diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties index 593d1c3cc3..0e2ce3631a 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties @@ -85,7 +85,6 @@ subModels massTotal 10; parcelsPerInjector 20000; - parcelsPerSecond 500; parcelBasisType mass; flowRateProfile constant 0.1; Umag constant 3.0; From 85ecb009d753d9a8d8e8ae5b6b82c3291bfd5250 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Fri, 18 May 2018 09:57:12 +0100 Subject: [PATCH 02/10] TUT: Updated input value --- .../hotBoxes/constant/reactingCloud1Properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties index 0e2ce3631a..07dd23e052 100644 --- a/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/hotBoxes/constant/reactingCloud1Properties @@ -86,7 +86,7 @@ subModels massTotal 10; parcelsPerInjector 20000; parcelBasisType mass; - flowRateProfile constant 0.1; + flowRateProfile constant 1; Umag constant 3.0; thetaInner constant 0; thetaOuter constant 45; From ffe8048e04b8115607faf4b207a82cd0562ba6fa Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 29 May 2018 15:10:19 +0100 Subject: [PATCH 03/10] BUG: COxidationIntrinicRate - corrected eta. See #842 --- .../COxidationIntrinsicRate/COxidationIntrinsicRate.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C index 1a260dac90..77435d66b4 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationIntrinsicRate/COxidationIntrinsicRate.C @@ -180,7 +180,7 @@ Foam::scalar Foam::COxidationIntrinsicRate::calculate max(0.5*d*sqrt(Sb_*rhop*Ag_*ki*ppO2/(De*rhoO2)), ROOTVSMALL); // Effectiveness factor [] - const scalar eta = max(3.0*sqr(phi)*(phi/tanh(phi) - 1.0), 0.0); + const scalar eta = max(3.0/sqr(phi)*(phi/tanh(phi) - 1.0), 0.0); // Chemical rate [kmol/m2/s] const scalar R = eta*d/6.0*rhop*Ag_*ki; From e747024c34df5baf217d21e19ea4e0713cb48b6c Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Tue, 29 May 2018 15:28:44 +0100 Subject: [PATCH 04/10] BUG: Corrected header documentation - see #831 --- ...idityTemperatureCoupledMixedFvPatchScalarField.H | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H index 3c0de53027..dee4aa5fdf 100644 --- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.H @@ -32,7 +32,7 @@ Description This boundary condition can operate in four modes: - \c constantMass: thermal inertia only - - requires \c rho, \c thickness and \cp + - requires \c rho, \c thickness and \c p - \c condensation: condensation only - when the wall temperature (Tw) is below the dew temperature (Tdew) condesation takes place and the resulting condensed mass is stored @@ -60,21 +60,26 @@ Description The mass transfer correlation used is: - \f[ h_m = D_{ab} \frac{Sc}{L} \f] + \f[ h_m = D_{ab} \frac{Sh}{L} \f] where: \vartable D_{ab} | mass vapour difussivity L | characteristic length - Sc | Schmidt number + Sh | Sherwood number \endvartable - The Schmidt number is calculated using: + The Sherwood number is calculated using: \f{eqnarray*}{ 0.664 Re^\frac{1}{2} Sc^\frac{1}{3} & Re < 5.0E+05 \\ 0.037 Re^\frac{4}{5} Sc^\frac{1}{3} & Re > 5.0E+05 \f} + where: + \vartable + Re | Reynolds number + Sc | Schmidt number + \endvartable NOTE: - The correlation used to calculate Tdew is for water vapour. From fe21322939c164867be32161b0867ea16310f1c2 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Wed, 30 May 2018 14:05:53 +0100 Subject: [PATCH 05/10] BUG: Corrected ConeNozzleInjection injected posisions in parallel operation. See #840 --- .../InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C index 6ac062ee57..36a638c3b6 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C @@ -186,7 +186,7 @@ Foam::ConeNozzleInjection::ConeNozzleInjection while(magTangent < SMALL) { - vector v = rndGen.sample01(); + vector v = rndGen.globalSample01(); tangent = v - (v & direction_)*direction_; magTangent = mag(tangent); @@ -323,7 +323,7 @@ void Foam::ConeNozzleInjection::setPositionAndCell { Random& rndGen = this->owner().rndGen(); - scalar beta = mathematical::twoPi*rndGen.sample01(); + scalar beta = mathematical::twoPi*rndGen.globalSample01(); normal_ = tanVec1_*cos(beta) + tanVec2_*sin(beta); switch (injectionMethod_) From eeb725715d5a5794a15f328d20773f1326eea66f Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 29 May 2018 10:26:22 +0100 Subject: [PATCH 06/10] BUG: decomposeParDict: ignores mesh region. Fixes #848. --- src/parallel/decompose/decompose/decompositionModel.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/parallel/decompose/decompose/decompositionModel.C b/src/parallel/decompose/decompose/decompositionModel.C index 8f156c64b5..b2c948c919 100644 --- a/src/parallel/decompose/decompose/decompositionModel.C +++ b/src/parallel/decompose/decompose/decompositionModel.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2018 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -58,7 +58,7 @@ Foam::decompositionModel::decompositionModel "decomposeParDict", mesh.time().system(), mesh.local(), - mesh.db(), + mesh.thisDb(), IOobject::MUST_READ, IOobject::NO_WRITE, false, //io.registerObject(), @@ -92,7 +92,7 @@ Foam::decompositionModel::decompositionModel "decomposeParDict", mesh.time().system(), mesh.local(), - mesh.db(), + mesh.thisDb(), (dict.size() ? IOobject::NO_READ : IOobject::MUST_READ), IOobject::NO_WRITE, false, //io.registerObject(), From 4bafb6fd54ecc65ca3423a88b6e222348303fa20 Mon Sep 17 00:00:00 2001 From: Andrew Heather Date: Wed, 13 Jun 2018 10:52:08 +0100 Subject: [PATCH 07/10] COMP: Added include file to enable derived code extensions --- .../eddyDissipationModelBase/eddyDissipationModelBase.H | 6 ++++++ .../singleStepCombustion/singleStepCombustion.H | 1 + 2 files changed, 7 insertions(+) diff --git a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H index 6803551d85..15adb8a81b 100644 --- a/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H +++ b/src/combustionModels/eddyDissipationModelBase/eddyDissipationModelBase.H @@ -100,6 +100,12 @@ public: //- Calculate time scale virtual tmp timeScale() = 0; + //- Return the CEDC coefficient + scalar CEDC() const + { + return CEDC_; + } + // I-O diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.H b/src/combustionModels/singleStepCombustion/singleStepCombustion.H index b7c5cb5c56..a8c73ebabc 100644 --- a/src/combustionModels/singleStepCombustion/singleStepCombustion.H +++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.H @@ -39,6 +39,7 @@ SourceFiles #define singleStepCombustion_H #include "singleStepReactingMixture.H" +#include "fvScalarMatrix.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From 51c48fa9c9efe2a2e27e870bc7c79fb36f400a2b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 13 Jun 2018 12:38:13 +0200 Subject: [PATCH 08/10] BUG: non-uniform distribution for Random::position