diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.C b/src/lagrangian/intermediate/submodels/SubModelBase.C index 527342d174..5f8b988276 100644 --- a/src/lagrangian/intermediate/submodels/SubModelBase.C +++ b/src/lagrangian/intermediate/submodels/SubModelBase.C @@ -90,6 +90,21 @@ const Foam::dictionary& Foam::SubModelBase::coeffDict() const } +template +bool Foam::SubModelBase::defaultCoeffs(const bool printMsg) const +{ + bool def = coeffDict_.lookupOrDefault("defaultCoeffs", false); + if (printMsg && def) + { + Info<< incrIndent; + Info<< indent << "Employing default coefficients" << endl; + Info<< decrIndent; + } + + return def; +} + + template CloudType& Foam::SubModelBase::owner() { @@ -105,7 +120,7 @@ bool Foam::SubModelBase::active() const template -void Foam::SubModelBase::cacheFields(const bool) +void Foam::SubModelBase::cacheFields(const bool) { // do nothing } diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.H b/src/lagrangian/intermediate/submodels/SubModelBase.H index d5cc8a53bd..c94947e80f 100644 --- a/src/lagrangian/intermediate/submodels/SubModelBase.H +++ b/src/lagrangian/intermediate/submodels/SubModelBase.H @@ -63,11 +63,10 @@ protected: //- Reference to the cloud dictionary const dictionary& dict_; - //- Reference to the coefficients dictionary + //- Coefficients dictionary const dictionary& coeffDict_; - public: // Constructors @@ -108,6 +107,9 @@ public: //- Return const access to the coefficients dictionary const dictionary& coeffDict() const; + //- Returns true if defaultCoeffs is true and outputs on printMsg + bool defaultCoeffs(const bool printMsg) const; + //- Return the model 'active' status - default active = true virtual bool active() const; diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C index 1ba28effe1..ce9eb40916 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C +++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C @@ -35,24 +35,24 @@ Foam::ETAB::ETAB ) : BreakupModel(dict, owner, typeName), - Cmu_(this->coeffDict().template lookupOrDefault("Cmu", 10.0)), - Comega_(this->coeffDict().template lookupOrDefault("Comega", 8.0)), - k1_(this->coeffDict().template lookupOrDefault("k1", 0.2)), - k2_(this->coeffDict().template lookupOrDefault("k2", 0.2)), - WeCrit_ -( - this->coeffDict().template lookupOrDefault("WeCrit", 12.0) -), - WeTransition_ - ( - this->coeffDict().template lookupOrDefault - ( - "WeTransition", - 100.0 - ) - ), + Cmu_(10.0), + Comega_(8.0), + k1_(0.2), + k2_(0.2), + WeCrit_(12.0), + WeTransition_(100.0), AWe_(0.0) { + if (!this->defaultCoeffs(true)) + { + this->coeffDict().lookup("Cmu") >> Cmu_; + this->coeffDict().lookup("Comega") >> Comega_; + this->coeffDict().lookup("k1") >> k1_; + this->coeffDict().lookup("k2") >> k2_; + this->coeffDict().lookup("WeCrit") >> WeCrit_; + this->coeffDict().lookup("WeTransition") >> WeTransition_; + } + scalar k21 = k2_/k1_; AWe_ = (k21*sqrt(WeTransition_) - 1.0)/pow4(WeTransition_); diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C index a3a6cdd2f9..65ba5498ce 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C +++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C @@ -35,9 +35,15 @@ Foam::PilchErdman::PilchErdman ) : BreakupModel(dict, owner, typeName), - B1_(this->coeffDict().template lookupOrDefault("B1", 0.375)), - B2_(this->coeffDict().template lookupOrDefault("B2", 0.236)) -{} + B1_(0.375), + B2_(0.236) +{ + if (!this->defaultCoeffs(true)) + { + this->coeffDict().lookup("B1") >> B1_; + this->coeffDict().lookup("B2") >> B2_; + } +} template diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C index 1ff7327986..c9cb30ff2b 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C +++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C @@ -35,11 +35,19 @@ Foam::ReitzDiwakar::ReitzDiwakar ) : BreakupModel(dict, owner, typeName), - Cbag_(this->coeffDict().template lookupOrDefault("Cbag", 6.0)), - Cb_(this->coeffDict().template lookupOrDefault("Cb", 0.785)), - Cstrip_(this->coeffDict().template lookupOrDefault("Cstrip", 0.5)), - Cs_(this->coeffDict().template lookupOrDefault("Cs", 10.0)) -{} + Cbag_(6.0), + Cb_(0.785), + Cstrip_(0.5), + Cs_(10.0) +{ + if (!this->defaultCoeffs(true)) + { + this->coeffDict().lookup("Cbag") >> Cbag_; + this->coeffDict().lookup("Cb") >> Cb_; + this->coeffDict().lookup("Cstrip") >> Cstrip_; + this->coeffDict().lookup("Cs") >> Cs_; + } +} template diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C index 0e8835c75c..e0bc8b3721 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C +++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C @@ -35,20 +35,23 @@ Foam::ReitzKHRT::ReitzKHRT ) : BreakupModel(dict, owner, typeName), - b0_(this->coeffDict().template lookupOrDefault("B0", 0.61)), - b1_(this->coeffDict().template lookupOrDefault("B1", 40.0)), - cTau_(this->coeffDict().template lookupOrDefault("Ctau", 1.0)), - cRT_(this->coeffDict().template lookupOrDefault("CRT", 0.1)), - msLimit_ - ( - this->coeffDict().template lookupOrDefault - ( - "msLimit", - 0.03 - ) - ), - weberLimit_(readScalar(this->coeffDict().lookup("WeberLimit"))) -{} + b0_(0.61), + b1_(40.0), + cTau_(1.0), + cRT_(0.1), + msLimit_(0.03), + weberLimit_(6.0) +{ + if (!this->defaultCoeffs(true)) + { + this->coeffDict().lookup("B0") >> b0_; + this->coeffDict().lookup("B1") >> b1_; + this->coeffDict().lookup("Ctau") >> cTau_; + this->coeffDict().lookup("CRT") >> cRT_; + this->coeffDict().lookup("msLimit") >> msLimit_; + this->coeffDict().lookup("WeberLimit") >> weberLimit_; + } +} template diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C index 73dd7cc401..a705c37096 100644 --- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C +++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C @@ -142,7 +142,7 @@ bool Foam::SHF::update { bool addChild = false; - scalar d03 = pow(d, 3); + scalar d03 = pow3(d); scalar rhopi6 = rho*constant::mathematical::pi/6.0; scalar mass0 = nParticle*rhopi6*d03; scalar mass = mass0;