Skip to content
Snippets Groups Projects
Commit 53959e7e authored by Mark OLESEN's avatar Mark OLESEN
Browse files

COMP: ambiguous construction from tmp (clang)

STYLE: more consistent use of dimensioned Zero
parent a784afc8
Branches
Tags
No related merge requests found
...@@ -70,7 +70,6 @@ bool Foam::functionObjects::stabilityBlendingFactor::calc() ...@@ -70,7 +70,6 @@ bool Foam::functionObjects::stabilityBlendingFactor::calc()
bool Foam::functionObjects::stabilityBlendingFactor::init(bool first) bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
{ {
const IOField<scalar>* residualPtr = const IOField<scalar>* residualPtr =
mesh_.lookupObjectPtr<IOField<scalar>>(residualName_); mesh_.lookupObjectPtr<IOField<scalar>>(residualName_);
...@@ -100,7 +99,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first) ...@@ -100,7 +99,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
oldErrorIntegral_ = errorIntegral_; oldErrorIntegral_ = errorIntegral_;
error_ = mag(meanRes - mag(*residualPtr)); error_ = mag(meanRes - mag(*residualPtr));
errorIntegral_ = oldErrorIntegral_ + 0.5*(error_ + oldError_); errorIntegral_ = oldErrorIntegral_ + 0.5*(error_ + oldError_);
const scalarField errorDifferential = error_ - oldError_; const scalarField errorDifferential(error_ - oldError_);
const scalarField factorList const scalarField factorList
( (
...@@ -229,7 +228,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first) ...@@ -229,7 +228,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("0", dimless, Zero), dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
) )
); );
...@@ -248,7 +247,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first) ...@@ -248,7 +247,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("zero", dimLength, 0), dimensionedScalar(dimLength, Zero),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
); );
cci = mesh_.C().component(i); cci = mesh_.C().component(i);
...@@ -298,7 +297,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first) ...@@ -298,7 +297,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("0", dimless, Zero), dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
) )
); );
...@@ -360,7 +359,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor ...@@ -360,7 +359,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("0", dimless, 0.0), dimensionedScalar(dimless, Zero),
zeroGradientFvPatchScalarField::typeName zeroGradientFvPatchScalarField::typeName
), ),
nonOrthogonality_(dict.lookupOrDefault<Switch>("switchNonOrtho", false)), nonOrthogonality_(dict.lookupOrDefault<Switch>("switchNonOrtho", false)),
...@@ -434,7 +433,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor ...@@ -434,7 +433,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
IOobject::NO_WRITE IOobject::NO_WRITE
), ),
mesh_, mesh_,
dimensionedScalar("0", dimless, 0.0) dimensionedScalar(dimless, Zero)
) )
); );
store(resultName_, faceBlendedPtr); store(resultName_, faceBlendedPtr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment