diff --git a/src/functionObjects/field/PecletNo/PecletNo.C b/src/functionObjects/field/PecletNo/PecletNo.C index da4018b54b..c8eb2e8f67 100644 --- a/src/functionObjects/field/PecletNo/PecletNo.C +++ b/src/functionObjects/field/PecletNo/PecletNo.C @@ -157,7 +157,7 @@ Foam::functionObjects::PecletNo::~PecletNo() bool Foam::functionObjects::PecletNo::read(const dictionary& dict) { - dict.readIfPresent("rho", rhoName_); + rhoName_ = dict.lookupOrDefault("rho", "rho"); return true; } diff --git a/src/functionObjects/field/blendingFactor/blendingFactor.C b/src/functionObjects/field/blendingFactor/blendingFactor.C index 3861e809a2..f46374f29c 100644 --- a/src/functionObjects/field/blendingFactor/blendingFactor.C +++ b/src/functionObjects/field/blendingFactor/blendingFactor.C @@ -117,8 +117,13 @@ bool Foam::functionObjects::blendingFactor::read(const dictionary& dict) writeFile::read(dict); phiName_ = dict.lookupOrDefault("phi", "phi"); - dict.readIfPresent("tolerance", tolerance_); - if ((tolerance_ < 0) || (tolerance_ > 1)) + + tolerance_ = 0.001; + if + ( + dict.readIfPresent("tolerance", tolerance_) + && (tolerance_ < 0 || tolerance_ > 1) + ) { FatalErrorInFunction << "tolerance must be in the range 0 to 1. Supplied value: " diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C index 42f57bb9f7..4ebe86bb24 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C @@ -97,7 +97,7 @@ bool Foam::functionObjects::fieldValue::read(const dictionary& dict) dict.lookup("fields") >> fields_; dict.lookup("writeFields") >> writeFields_; - dict.readIfPresent("scaleFactor", scaleFactor_); + scaleFactor_ = dict.lookupOrDefault("scaleFactor", 1.0); return true; } diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H index 6278eea50a..823363316a 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.H @@ -70,7 +70,7 @@ protected: // Protected data - //- Optional scale value + //- Optional scaling factor scalar scaleFactor_; //- Construction dictionary diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C index 63344f52e3..dc403701a4 100644 --- a/src/functionObjects/field/fluxSummary/fluxSummary.C +++ b/src/functionObjects/field/fluxSummary/fluxSummary.C @@ -616,9 +616,9 @@ bool Foam::functionObjects::fluxSummary::read(const dictionary& dict) writeFile::read(dict); mode_ = modeTypeNames_.read(dict.lookup("mode")); - phiName_= dict.lookupOrDefault("phi", "phi"); - dict.readIfPresent("scaleFactor", scaleFactor_); - dict.readIfPresent("tolerance", tolerance_); + phiName_ = dict.lookupOrDefault("phi", "phi"); + scaleFactor_ = dict.lookupOrDefault("scaleFactor", 1.0); + tolerance_ = dict.lookupOrDefault("tolerance", 0.8); // Initialise with capacity of 10 faceZones DynamicList refDir(10); diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C index 4f73902c89..1344041fb0 100644 --- a/src/functionObjects/field/pressure/pressure.C +++ b/src/functionObjects/field/pressure/pressure.C @@ -232,8 +232,8 @@ bool Foam::functionObjects::pressure::read(const dictionary& dict) { fieldExpression::read(dict); - dict.readIfPresent("U", UName_); - dict.readIfPresent("rho", rhoName_); + UName_ = dict.lookupOrDefault("U", "U"); + rhoName_ = dict.lookupOrDefault("rho", "rho"); if (rhoName_ == "rhoInf") {