diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C index f66d376e38..bb789ed827 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedGradient/fixedGradientFvPatchField.C @@ -36,7 +36,7 @@ Foam::fixedGradientFvPatchField::fixedGradientFvPatchField ) : fvPatchField(p, iF), - gradient_(p.size(), pTraits::zero) + gradient_(p.size(), Zero) {} @@ -176,7 +176,7 @@ Foam::fixedGradientFvPatchField::gradientInternalCoeffs() const { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C index 445bed4f7e..b6841f3353 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/fixedValue/fixedValueFvPatchField.C @@ -117,7 +117,7 @@ Foam::fixedValueFvPatchField::valueInternalCoeffs { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C index 4601904a39..4395534fe2 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.C @@ -125,7 +125,7 @@ Foam::zeroGradientFvPatchField::valueBoundaryCoeffs { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } @@ -136,7 +136,7 @@ Foam::zeroGradientFvPatchField::gradientInternalCoeffs() const { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } @@ -147,7 +147,7 @@ Foam::zeroGradientFvPatchField::gradientBoundaryCoeffs() const { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } diff --git a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H index 188dbdb6bd..2b0f7a31f7 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/basic/zeroGradient/zeroGradientFvPatchField.H @@ -143,7 +143,7 @@ public: { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 5fc626e44c..6d17c75187 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -45,11 +45,11 @@ Foam::advectiveFvPatchField::advectiveFvPatchField mixedFvPatchField(p, iF), phiName_("phi"), rhoName_("rho"), - fieldInf_(pTraits::zero), + fieldInf_(Zero), lInf_(-GREAT) { - this->refValue() = pTraits::zero; - this->refGrad() = pTraits::zero; + this->refValue() = Zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -82,7 +82,7 @@ Foam::advectiveFvPatchField::advectiveFvPatchField mixedFvPatchField(p, iF), phiName_(dict.lookupOrDefault("phi", "phi")), rhoName_(dict.lookupOrDefault("rho", "rho")), - fieldInf_(pTraits::zero), + fieldInf_(Zero), lInf_(-GREAT) { if (dict.found("value")) @@ -98,7 +98,7 @@ Foam::advectiveFvPatchField::advectiveFvPatchField } this->refValue() = *this; - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; if (dict.readIfPresent("lInf", lInf_)) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C index 575eae01f7..d6223500e0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C @@ -40,8 +40,8 @@ cylindricalInletVelocityFvPatchVectorField ) : fixedValueFvPatchField(p, iF), - centre_(pTraits::zero), - axis_(pTraits::zero), + centre_(Zero), + axis_(Zero), axialVelocity_(), radialVelocity_(), rpm_() diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index e0a3e4e4b1..b3629e877f 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -455,8 +455,8 @@ externalCoupledMixedFvPatchField initialised_(false), coupledPatchIDs_() { - this->refValue() = pTraits::zero; - this->refGrad() = pTraits::zero; + this->refValue() = Zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -534,7 +534,7 @@ externalCoupledMixedFvPatchField // initialise as a fixed value this->refValue() = *this; - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 1.0; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C index 88e9b93b40..13eba7efa0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJump/fixedJumpFvPatchField.C @@ -35,7 +35,7 @@ Foam::fixedJumpFvPatchField::fixedJumpFvPatchField ) : jumpCyclicFvPatchField(p, iF), - jump_(this->size(), pTraits::zero) + jump_(this->size(), Zero) {} @@ -62,7 +62,7 @@ Foam::fixedJumpFvPatchField::fixedJumpFvPatchField ) : jumpCyclicFvPatchField(p, iF), - jump_(p.size(), pTraits::zero) + jump_(p.size(), Zero) { if (this->cyclicPatch().owner()) { diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C index 59b606b5f7..354a84bb2d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedJumpAMI/fixedJumpAMIFvPatchField.C @@ -35,7 +35,7 @@ Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField ) : jumpCyclicAMIFvPatchField(p, iF), - jump_(this->size(), pTraits::zero) + jump_(this->size(), Zero) {} @@ -62,7 +62,7 @@ Foam::fixedJumpAMIFvPatchField::fixedJumpAMIFvPatchField ) : jumpCyclicAMIFvPatchField(p, iF), - jump_(p.size(), pTraits::zero) + jump_(p.size(), Zero) { if (this->cyclicAMIPatch().owner()) { @@ -128,7 +128,7 @@ Foam::tmp> Foam::fixedJumpAMIFvPatchField::jump() const return this->cyclicAMIPatch().interpolate ( nbrPatch.jump(), - Field(this->size(), pTraits::zero) + Field(this->size(), Zero) ); } else diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C index df658614fb..d2a8a6b425 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedNormalSlip/fixedNormalSlipFvPatchField.C @@ -37,7 +37,7 @@ Foam::fixedNormalSlipFvPatchField::fixedNormalSlipFvPatchField ) : transformFvPatchField(p, iF), - fixedValue_(p.size(), pTraits::zero) + fixedValue_(p.size(), Zero) {} diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C index 19d887e257..198c81d10d 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C @@ -37,8 +37,8 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField mixedFvPatchField(p, iF), phiName_("phi") { - this->refValue() = pTraits::zero; - this->refGrad() = pTraits::zero; + this->refValue() = Zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -82,7 +82,7 @@ Foam::inletOutletFvPatchField::inletOutletFvPatchField fvPatchField::operator=(this->refValue()); } - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C index 607f88934f..54aa5346e9 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutletTotalTemperature/inletOutletTotalTemperatureFvPatchScalarField.C @@ -44,8 +44,8 @@ inletOutletTotalTemperatureFvPatchScalarField gamma_(0.0), T0_(p.size(), 0.0) { - this->refValue() = pTraits::zero; - this->refGrad() = pTraits::zero; + this->refValue() = Zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -83,7 +83,7 @@ inletOutletTotalTemperatureFvPatchScalarField { this->phiName_ = dict.lookupOrDefault("phi", "phi"); - this->refValue() = pTraits::zero; + this->refValue() = Zero; if (dict.found("value")) { fvPatchField::operator= @@ -96,7 +96,7 @@ inletOutletTotalTemperatureFvPatchScalarField fvPatchField::operator=(T0_); } - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C index 1c52eadef5..589afaf309 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C @@ -94,7 +94,7 @@ mappedPatchFieldBase::mappedPatchFieldBase patchField_(patchField), fieldName_(patchField_.dimensionedInternalField().name()), setAverage_(false), - average_(pTraits::zero), + average_(Zero), interpolationScheme_(interpolationCell::typeName) {} @@ -259,7 +259,7 @@ tmp> mappedPatchFieldBase::mappedField() const } case mappedPatchBase::NEARESTFACE: { - Field allValues(nbrMesh.nFaces(), pTraits::zero); + Field allValues(nbrMesh.nFaces(), Zero); const fieldType& nbrField = sampleField(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C index ba3a0e0209..082d9944ed 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C @@ -145,7 +145,7 @@ void Foam::mappedFixedInternalValueFvPatchField::updateCoeffs() } case mappedPatchBase::NEARESTFACE: { - Field allValues(nbrMesh.nFaces(), pTraits::zero); + Field allValues(nbrMesh.nFaces(), Zero); const FieldType& nbrField = this->sampleField(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C index d6f69f823a..b79fd2b83b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C @@ -38,7 +38,7 @@ Foam::outletInletFvPatchField::outletInletFvPatchField phiName_("phi") { this->refValue() = *this; - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -82,7 +82,7 @@ Foam::outletInletFvPatchField::outletInletFvPatchField fvPatchField::operator=(this->refValue()); } - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C index 68caf7d14c..af098508e4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/AverageIOField.C @@ -50,7 +50,7 @@ Foam::AverageIOField::AverageIOField : regIOobject(io), Field(size), - average_(pTraits::zero) + average_(Zero) {} diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index e7edad23a5..94c090296a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C @@ -45,10 +45,10 @@ timeVaryingMappedFixedValueFvPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_() {} @@ -78,10 +78,10 @@ timeVaryingMappedFixedValueFvPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_(Function1::New("offset", dict)) { if @@ -134,10 +134,10 @@ timeVaryingMappedFixedValueFvPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_(ptf.offset_, false) {} diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C index 771586d6a8..4527eca009 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C @@ -36,7 +36,7 @@ Foam::turbulentInletFvPatchField::turbulentInletFvPatchField : fixedValueFvPatchField(p, iF), ranGen_(label(0)), - fluctuationScale_(pTraits::zero), + fluctuationScale_(Zero), referenceField_(p.size()), alpha_(0.1), curTimeIndex_(-1) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C index c68304a93b..2ae611dc17 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C @@ -37,8 +37,8 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField mixedFvPatchField(p, iF), phiName_("phi") { - this->refValue() = pTraits::zero; - this->refGrad() = pTraits::zero; + this->refValue() = Zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -70,7 +70,7 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField fvPatchField::operator=(this->refValue()); } - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; } @@ -94,7 +94,7 @@ Foam::uniformInletOutletFvPatchField::uniformInletOutletFvPatchField this->refValue() = uniformInletValue_->value(this->db().time().timeOutputValue()); - this->refGrad() = pTraits::zero; + this->refGrad() = Zero; this->valueFraction() = 0.0; // Initialize the patch value to the refValue diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C index 856c1a174f..88cd19d712 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.C @@ -116,14 +116,14 @@ Foam::fvPatchField::fvPatchField { if (dict.found("value")) { - fvPatchField::operator= + Field::operator= ( Field("value", dict, p.size()) ); } else if (!valueRequired) { - fvPatchField::operator=(pTraits::zero); + Field::operator=(Zero); } else {