diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 06c3c5537c..e85e41b432 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -122,7 +122,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const ( "zero", nsv.dimensions(), - pTraits::zero + Zero ) ); ns.internalField() = nsv.internalField()*Cw; diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C index 0de82a82e4..7e3d2bb7aa 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C @@ -108,7 +108,7 @@ Foam::tmp Foam::PDRDragModels::basic::Dcu() const ( "zero", dimMass/dimTime/pow(dimLength, 3), - pTraits::zero + Zero ) ) ); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index a84aca3210..966dae7175 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -131,7 +131,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const ( "zero", nsv.dimensions(), - pTraits::zero + Zero ) ); ns.internalField() = nsv.internalField()*pow(mesh.V(), 2.0/3.0); diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index cdc1616e2b..a303ae4fe4 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C @@ -60,7 +60,7 @@ void zeroCells { forAll(cells, i) { - vf[cells[i]] = pTraits::zero; + vf[cells[i]] = Zero; } } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C index 78eb01cf1c..abff13475e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -47,7 +47,7 @@ void Foam::BlendedInterfacialModel::correctFixedFluxBCs ) { field.boundaryField()[patchI] - = pTraits::zero; + = Zero; } } } @@ -382,7 +382,7 @@ Foam::BlendedInterfacialModel::F() const false ), phase1_.mesh(), - dimensioned("zero", ModelType::dimF, pTraits::zero) + dimensioned("zero", ModelType::dimF, Zero) ) ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C index 1b2a492782..0d78e02ac8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/BlendedInterfacialModel/BlendedInterfacialModel.C @@ -47,7 +47,7 @@ void Foam::BlendedInterfacialModel::correctFixedFluxBCs ) { field.boundaryField()[patchI] - = pTraits::zero; + = Zero; } } } @@ -280,7 +280,7 @@ Foam::BlendedInterfacialModel::F() const false ), pair_.phase1().mesh(), - dimensioned("zero", modelType::dimF, pTraits::zero) + dimensioned("zero", modelType::dimF, Zero) ) ); diff --git a/applications/test/extendedStencil/Test-ExtendedStencil2.C b/applications/test/extendedStencil/Test-ExtendedStencil2.C index 3c0228df85..03d5283233 100644 --- a/applications/test/extendedStencil/Test-ExtendedStencil2.C +++ b/applications/test/extendedStencil/Test-ExtendedStencil2.C @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) const volVectorField& fld = mesh.C(); // 1. Construct cell data in compact addressing - List compactFld(map.constructSize(), pTraits::zero); + List compactFld(map.constructSize(), Zero); // Insert my internal values forAll(fld, cellI) diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index ca1f9a4752..8be739c5ff 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C @@ -781,7 +781,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + scalar(Zero), volScalarField::typeName, scalarFlds ); @@ -793,7 +793,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + vector(Zero), volVectorField::typeName, vectorFlds ); @@ -811,7 +811,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + sphericalTensor(Zero), volSphericalTensorField::typeName, sphericalTensorFlds ); @@ -823,7 +823,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + symmTensor(Zero), volSymmTensorField::typeName, symmTensorFlds ); @@ -835,7 +835,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + tensor(Zero), volTensorField::typeName, tensorFlds ); @@ -849,7 +849,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + scalar(Zero), surfaceScalarField::typeName, surfScalarFlds ); @@ -861,7 +861,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + vector(Zero), surfaceVectorField::typeName, surfVectorFlds ); @@ -879,7 +879,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + sphericalTensor(Zero), surfaceSphericalTensorField::typeName, surfSphericalTensorFlds ); @@ -899,7 +899,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + symmTensor(Zero), surfaceSymmTensorField::typeName, surfSymmTensorFlds ); @@ -911,7 +911,7 @@ int main(int argc, char *argv[]) subsetter, objects, defaultPatchI, - pTraits::zero, + tensor(Zero), surfaceTensorField::typeName, surfTensorFlds ); diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C index 6697fbecfb..2a7e0727cc 100644 --- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C +++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C @@ -182,7 +182,7 @@ void subsetVolFields if (addedPatches.found(patchI)) { tSubFld.ref().boundaryField()[patchI] == - pTraits::zero; + typename GeoField::value_type(Zero); } } @@ -234,7 +234,7 @@ void subsetSurfaceFields if (addedPatches.found(patchI)) { tSubFld.ref().boundaryField()[patchI] == - pTraits::zero; + typename GeoField::value_type(Zero); } } diff --git a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C index c27ee167f5..ec53cb414d 100644 --- a/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C +++ b/applications/utilities/miscellaneous/foamHelp/helpTypes/helpBoundary/helpBoundaryTemplates.C @@ -94,7 +94,7 @@ void Foam::helpTypes::helpBoundary::fixedValueFieldConditions false ), mesh, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C index 18f3deabf0..aeb18be678 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightCloudField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ void ensightCloudField if (mag(v) < 1.0e-90) { - v = pTraits::zero; + v = Zero; } for (direction cmpt=0; cmpt::nComponents; cmpt++) diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C index a21efa64da..309b49a82d 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C @@ -182,7 +182,7 @@ void Foam::ensightLagrangianField if (mag(val) < 1.0e-90) { - val = pTraits::zero; + val = Zero; } for (direction cmpt=0; cmpt < pTraits::nComponents; cmpt++) diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C index 888d274dea..6e50d70471 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -86,7 +86,7 @@ void ReadAndMapFields ( "zero", readField.dimensions(), - pTraits::zero + Zero ) ) ); @@ -252,7 +252,7 @@ int main(int argc, char *argv[]) objects, tetDualMesh, pointDualAddressing, - pTraits::zero, // nullValue + Zero, // nullValue psFlds ); @@ -263,7 +263,7 @@ int main(int argc, char *argv[]) objects, tetDualMesh, pointDualAddressing, - pTraits::zero, // nullValue + Zero, // nullValue pvFlds ); @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) objects, tetDualMesh, pointDualAddressing, - pTraits::zero, // nullValue + Zero, // nullValue pstFlds ); @@ -285,7 +285,7 @@ int main(int argc, char *argv[]) objects, tetDualMesh, pointDualAddressing, - pTraits::zero, // nullValue + Zero, // nullValue psymmtFlds ); @@ -296,7 +296,7 @@ int main(int argc, char *argv[]) objects, tetDualMesh, pointDualAddressing, - pTraits::zero, // nullValue + Zero, // nullValue ptFlds ); diff --git a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C index b4ce9a7bfb..2f50554802 100644 --- a/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C +++ b/applications/utilities/postProcessing/miscellaneous/postChannel/channelIndexTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ License template Foam::Field Foam::channelIndex::regionSum(const Field& cellField) const { - Field regionField(cellRegion_().nRegions(), pTraits::zero); + Field regionField(cellRegion_().nRegions(), Zero); forAll(cellRegion_(), cellI) { diff --git a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C index acdc968fa7..ace3dc3b9d 100644 --- a/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C +++ b/applications/utilities/postProcessing/patch/patchAverage/patchAverage.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ void printAverage FieldType field(fieldHeader, mesh); typename FieldType::value_type sumField = - pTraits::zero; + Zero; if (area > 0) { diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index d5f295a62b..defc6fb870 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -584,8 +584,8 @@ int main(int argc, char *argv[]) // I need coarse Sf (Ai), fine Sf (dAi) and fine Cf(r) to calculate Fij // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - pointField compactCoarseCf(map.constructSize(), pTraits::zero); - pointField compactCoarseSf(map.constructSize(), pTraits::zero); + pointField compactCoarseCf(map.constructSize(), Zero); + pointField compactCoarseSf(map.constructSize(), Zero); List> compactFineSf(map.constructSize()); List> compactFineCf(map.constructSize()); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C index 2679132d78..1f95e729cd 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,8 +34,8 @@ namespace Foam atmBoundaryLayer::atmBoundaryLayer() : - flowDir_(pTraits::zero), - zDir_(pTraits::zero), + flowDir_(Zero), + zDir_(Zero), kappa_(0.41), Cmu_(0.09), Uref_(0), diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 7605716a4a..0f4bff28a6 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -209,9 +209,9 @@ nutURoughWallFunctionFvPatchScalarField::nutURoughWallFunctionFvPatchScalarField ) : nutWallFunctionFvPatchScalarField(p, iF), - roughnessHeight_(pTraits::zero), - roughnessConstant_(pTraits::zero), - roughnessFactor_(pTraits::zero) + roughnessHeight_(Zero), + roughnessConstant_(Zero), + roughnessFactor_(Zero) {} diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C index e38f3c6d47..bbf056d0d8 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C @@ -2215,11 +2215,11 @@ Foam::autoPtr Foam::fvMeshDistribute::distribute // from nothing so explicitly reset. initPatchFields> ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); initPatchFields < @@ -2227,24 +2227,24 @@ Foam::autoPtr Foam::fvMeshDistribute::distribute processorFvPatchField > ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); initPatchFields < @@ -2252,7 +2252,7 @@ Foam::autoPtr Foam::fvMeshDistribute::distribute processorFvsPatchField > ( - pTraits::zero + Zero ); initPatchFields < @@ -2260,11 +2260,11 @@ Foam::autoPtr Foam::fvMeshDistribute::distribute processorFvsPatchField > ( - pTraits::zero + Zero ); initPatchFields> ( - pTraits::zero + Zero ); diff --git a/src/dynamicMesh/fvMeshTools/fvMeshTools.C b/src/dynamicMesh/fvMeshTools/fvMeshTools.C index 19e41d1558..cab0199354 100644 --- a/src/dynamicMesh/fvMeshTools/fvMeshTools.C +++ b/src/dynamicMesh/fvMeshTools/fvMeshTools.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,35 +107,35 @@ Foam::label Foam::fvMeshTools::addPatch mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); // Surface fields @@ -145,35 +145,35 @@ Foam::label Foam::fvMeshTools::addPatch mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); addPatchFields ( mesh, patchFieldDict, defaultPatchFieldType, - pTraits::zero + Zero ); // Create reordering list @@ -237,36 +237,36 @@ void Foam::fvMeshTools::setPatchFields void Foam::fvMeshTools::zeroPatchFields(fvMesh& mesh, const label patchI) { - setPatchFields(mesh, patchI, pTraits::zero); - setPatchFields(mesh, patchI, pTraits::zero); + setPatchFields(mesh, patchI, Zero); + setPatchFields(mesh, patchI, Zero); setPatchFields ( mesh, patchI, - pTraits::zero + Zero ); setPatchFields ( mesh, patchI, - pTraits::zero + Zero ); - setPatchFields(mesh, patchI, pTraits::zero); - setPatchFields(mesh, patchI, pTraits::zero); - setPatchFields(mesh, patchI, pTraits::zero); + setPatchFields(mesh, patchI, Zero); + setPatchFields(mesh, patchI, Zero); + setPatchFields(mesh, patchI, Zero); setPatchFields ( mesh, patchI, - pTraits::zero + Zero ); setPatchFields ( mesh, patchI, - pTraits::zero + Zero ); - setPatchFields(mesh, patchI, pTraits::zero); + setPatchFields(mesh, patchI, Zero); } diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C index 46250fb6b0..683d42f75f 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C @@ -155,7 +155,7 @@ Foam::motionSmootherAlgo::avg false ), fld.mesh(), - dimensioned("zero", fld.dimensions(), pTraits::zero) + dimensioned("zero", fld.dimensions(), Zero) ) ); GeometricField& res = tres.ref(); @@ -197,7 +197,7 @@ Foam::motionSmootherAlgo::avg mesh, res, plusEqOp(), - pTraits::zero // null value + Type(Zero) // null value ); syncTools::syncPointList ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C index 681d04ab31..1ea26724c6 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C @@ -36,7 +36,7 @@ Foam::fixedProfileFvPatchField::fixedProfileFvPatchField : fixedValueFvPatchField(p, iF), profile_(), - dir_(pTraits::zero), + dir_(Zero), origin_(0) {} @@ -51,7 +51,7 @@ Foam::fixedProfileFvPatchField::fixedProfileFvPatchField : fixedValueFvPatchField(p, iF, fld), profile_(), - dir_(pTraits::zero), + dir_(Zero), origin_(0) {} diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C index 107313dd4c..2d4fdaceea 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C @@ -95,7 +95,7 @@ Foam::fixedValueFvsPatchField::valueInternalCoeffs { return tmp> ( - new Field(this->size(), pTraits::zero) + new Field(this->size(), Zero) ); } diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C index 7f21db69bb..2290d1735f 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/steadyStateD2dt2Scheme/steadyStateD2dt2Scheme.C @@ -63,7 +63,7 @@ steadyStateD2dt2Scheme::fvcD2dt2 ( "0", vf.dimensions()/dimTime/dimTime, - pTraits::zero + Zero ) ) ); @@ -95,7 +95,7 @@ steadyStateD2dt2Scheme::fvcD2dt2 ( "0", rho.dimensions()*vf.dimensions()/dimTime/dimTime, - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index 2374f31fff..aabc1320f3 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -178,7 +178,7 @@ CoEulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -201,7 +201,7 @@ CoEulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ), calculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index d33969f50a..9d4be317ff 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -162,7 +162,7 @@ CrankNicolsonDdtScheme::ddt0_ ( "0", dims/dimTime, - pTraits::zero + Zero ) ) ); @@ -310,7 +310,7 @@ CrankNicolsonDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C index 79c3069f0d..e6c7239f61 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C @@ -68,7 +68,7 @@ EulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -90,7 +90,7 @@ EulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ), calculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index 204f88e69c..a3b9b841e1 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -178,7 +178,7 @@ SLTSDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -200,7 +200,7 @@ SLTSDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ), calculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index 9297d106d8..e3127a453b 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -106,7 +106,7 @@ backwardDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -130,7 +130,7 @@ backwardDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ), calculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index 4338399573..69d707974a 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -74,7 +74,7 @@ localEulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -97,7 +97,7 @@ localEulerDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ), calculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C index b26de564ae..790d189bc3 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C @@ -61,7 +61,7 @@ steadyStateDdtScheme::fvcDdt ( "0", dt.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -90,7 +90,7 @@ steadyStateDdtScheme::fvcDdt ( "0", vf.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -120,7 +120,7 @@ steadyStateDdtScheme::fvcDdt ( "0", rho.dimensions()*vf.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -150,7 +150,7 @@ steadyStateDdtScheme::fvcDdt ( "0", rho.dimensions()*vf.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -181,7 +181,7 @@ steadyStateDdtScheme::fvcDdt ( "0", rho.dimensions()*vf.dimensions()/dimTime, - pTraits::zero + Zero ) ) ); @@ -295,7 +295,7 @@ steadyStateDdtScheme::fvcDdtUfCorr ( "0", Uf.dimensions()*dimArea/dimTime, - pTraits::type>::zero + Zero ) ) ); @@ -325,7 +325,7 @@ steadyStateDdtScheme::fvcDdtPhiCorr ( "0", phi.dimensions()/dimTime, - pTraits::type>::zero + Zero ) ) ); @@ -358,7 +358,7 @@ steadyStateDdtScheme::fvcDdtUfCorr ( "0", Uf.dimensions()*dimArea/dimTime, - pTraits::type>::zero + Zero ) ) ); @@ -391,7 +391,7 @@ steadyStateDdtScheme::fvcDdtPhiCorr ( "0", phi.dimensions()/dimTime, - pTraits::type>::zero + Zero ) ) ); diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C index c078bd365d..bbc5cfc275 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C @@ -65,7 +65,7 @@ tmp> cellReduce IOobject::NO_WRITE ), mesh, - dimensioned("0", ssf.dimensions(), pTraits::zero), + dimensioned("0", ssf.dimensions(), Zero), extrapolatedCalculatedFvPatchField::typeName ) ); diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C index 6c97f1afd2..f4e5bae45d 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C @@ -79,7 +79,7 @@ reconstruct ( "0", ssf.dimensions()/dimArea, - pTraits::zero + Zero ), extrapolatedCalculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C index dd08e083aa..3ce8ab38ec 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C @@ -102,7 +102,7 @@ surfaceIntegrate ( "0", ssf.dimensions()/dimVol, - pTraits::zero + Zero ), extrapolatedCalculatedFvPatchField::typeName ) @@ -154,7 +154,7 @@ surfaceSum IOobject::NO_WRITE ), mesh, - dimensioned("0", ssf.dimensions(), pTraits::zero), + dimensioned("0", ssf.dimensions(), Zero), extrapolatedCalculatedFvPatchField::typeName ) ); diff --git a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C index a462ff85f7..b8f0336226 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C @@ -75,7 +75,7 @@ Foam::fv::LeastSquaresGrad::calcGrad ( "zero", vtf.dimensions()/dimLength, - pTraits::zero + Zero ), extrapolatedCalculatedFvPatchField::typeName ) @@ -89,7 +89,7 @@ Foam::fv::LeastSquaresGrad::calcGrad // Construct flat version of vtf // including all values referred to by the stencil - List flatVtf(stencil.map().constructSize(), pTraits::zero); + List flatVtf(stencil.map().constructSize(), Zero); // Insert internal values forAll(vtf, celli) diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C index 7e0c76cf55..34b9170c62 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C @@ -65,7 +65,7 @@ Foam::fv::gaussGrad::gradf ( "0", ssf.dimensions()/dimLength, - pTraits::zero + Zero ), extrapolatedCalculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C index 4a15dbc4d1..2a3839b5b2 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C @@ -71,7 +71,7 @@ Foam::fv::leastSquaresGrad::calcGrad ( "zero", vsf.dimensions()/dimLength, - pTraits::zero + Zero ), extrapolatedCalculatedFvPatchField::typeName ) diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C index 467dc0af52..e67bc081e3 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C @@ -116,7 +116,7 @@ Foam::fv::faceCorrectedSnGrad::fullGradCorrection sfCorr[facei] = dCorr&fgrad; } - tsfCorr.ref().boundaryField() = pTraits::zero; + tsfCorr.ref().boundaryField() = Zero; return tsfCorr; } diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 41b7fae8a7..1d1e9ee529 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -249,10 +249,10 @@ void Foam::fvMatrix::setValuesFromList mesh.boundaryMesh()[patchi].whichFace(facei); internalCoeffs_[patchi][patchFacei] = - pTraits::zero; + Zero; boundaryCoeffs_[patchi][patchFacei] = - pTraits::zero; + Zero; } } } @@ -273,7 +273,7 @@ Foam::fvMatrix::fvMatrix lduMatrix(psi.mesh()), psi_(psi), dimensions_(ds), - source_(psi.size(), pTraits::zero), + source_(psi.size(), Zero), internalCoeffs_(psi.mesh().boundary().size()), boundaryCoeffs_(psi.mesh().boundary().size()), faceFluxCorrectionPtr_(NULL) @@ -293,7 +293,7 @@ Foam::fvMatrix::fvMatrix new Field ( psi.mesh().boundary()[patchI].size(), - pTraits::zero + Zero ) ); @@ -303,7 +303,7 @@ Foam::fvMatrix::fvMatrix new Field ( psi.mesh().boundary()[patchI].size(), - pTraits::zero + Zero ) ); } @@ -433,7 +433,7 @@ Foam::fvMatrix::fvMatrix new Field ( psi.mesh().boundary()[patchI].size(), - pTraits::zero + Zero ) ); @@ -443,7 +443,7 @@ Foam::fvMatrix::fvMatrix new Field ( psi.mesh().boundary()[patchI].size(), - pTraits::zero + Zero ) ); } @@ -2292,7 +2292,7 @@ Foam::operator& } else { - Mphi.internalField() = pTraits::zero; + Mphi.internalField() = Zero; } Mphi.internalField() += M.lduMatrix::H(psi.field()) + M.source(); diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C index 20b328bb81..77eead6d48 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToCell/extendedCellToCellStencilTemplates.C @@ -70,7 +70,7 @@ Foam::tmp ( fld.name(), fld.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C index 7fe2202afe..d6aac47191 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C @@ -37,7 +37,7 @@ void Foam::extendedCellToFaceStencil::collectData ) { // 1. Construct cell data in compact addressing - List flatFld(map.constructSize(), pTraits::zero); + List flatFld(map.constructSize(), Zero); // Insert my internal values forAll(fld, cellI) @@ -114,7 +114,7 @@ Foam::extendedCellToFaceStencil::weightedSum ( fld.name(), fld.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C index fe06177ec4..e47683cb48 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C +++ b/src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C @@ -63,7 +63,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum ( fld.name(), fld.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C index e1530b0b36..0535e0548d 100644 --- a/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C +++ b/src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C @@ -37,7 +37,7 @@ void Foam::extendedFaceToCellStencil::collectData ) { // 1. Construct face data in compact addressing - List flatFld(map.constructSize(), pTraits::zero); + List flatFld(map.constructSize(), Zero); // Insert my internal values forAll(fld, cellI) @@ -108,7 +108,7 @@ Foam::extendedFaceToCellStencil::weightedSum ( fld.name(), fld.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C index 537c686bdb..deecb80321 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ Type Foam::interpolationCellPointFace::interpolate scalar phi[4], phiCandidate[4]; label tetLabelCandidate[2], tetPointLabels[2]; - Type t = pTraits::zero; + Type t = Zero; // only use face information when the position is on a face if (faceI < 0) diff --git a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H index 47ea12bab9..61f7cedb25 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationPointMVC/pointMVCWeightI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ inline Type Foam::pointMVCWeight::interpolate { const labelList& vertices = psip.mesh()().cellPoints()[cellIndex_]; - Type t = pTraits::zero; + Type t = Zero; forAll(vertices, i) { t += psip[vertices[i]]*weights_[i]; diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H index 2531574315..18b767b002 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cubic/cubic.H @@ -175,7 +175,7 @@ public: { if (!sfCorr.boundaryField()[pi].coupled()) { - sfCorr.boundaryField()[pi] = pTraits::zero; + sfCorr.boundaryField()[pi] = Zero; } } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C index aa7d4482b8..6dad60e254 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C @@ -51,7 +51,7 @@ Foam::linearUpwind::correction false ), mesh, - dimensioned(vf.name(), vf.dimensions(), pTraits::zero) + dimensioned(vf.name(), vf.dimensions(), Zero) ) ); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C index fce527802c..608c573ad2 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C @@ -57,7 +57,7 @@ Foam::linearUpwindV::correction ( vf.name(), vf.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H index 819347a972..dbdebfa7d2 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/outletStabilised/outletStabilised.H @@ -222,7 +222,7 @@ public: if (mesh_.isInternalFace(facei)) { // Remove correction - corr[facei] = pTraits::zero; + corr[facei] = Zero; } } } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C index 98a7cdbf41..303421fcf6 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/pointLinear/pointLinear.C @@ -166,7 +166,7 @@ correction } else { - pSfCorr = pTraits::zero; + pSfCorr = Zero; } } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H index 1f568e6315..28649caa75 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/skewCorrected/skewCorrected.H @@ -152,7 +152,7 @@ public: ( vf.name(), vf.dimensions(), - pTraits::zero + Zero ) ) ); diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C index 79bdc2a29a..2759d0fb4b 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C @@ -143,7 +143,7 @@ void Foam::volPointInterpolation::interpolateInternalField const scalarList& pw = pointWeights_[pointi]; const labelList& ppc = pointCells[pointi]; - pf[pointi] = pTraits::zero; + pf[pointi] = Zero; forAll(ppc, pointCelli) { @@ -192,7 +192,7 @@ Foam::tmp> Foam::volPointInterpolation::flatBoundaryField forAll(pp, i) { - boundaryVals[bFaceI++] = pTraits::zero; + boundaryVals[bFaceI++] = Zero; } } } @@ -231,7 +231,7 @@ void Foam::volPointInterpolation::interpolateBoundaryField Type& val = pfi[pointI]; - val = pTraits::zero; + val = Zero; forAll(pFaces, j) { if (boundaryIsPatchFace_[pFaces[j]]) diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C index 9ddc691bb7..5943814b4c 100644 --- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C +++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomerationTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ void Foam::pairPatchAgglomeration::restrictField << abort(FatalError); } - cf = pTraits::zero; + cf = Zero; forAll(ff, i) { diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C index 7d3b5a8d7c..6223cdb13c 100644 --- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C +++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C @@ -46,10 +46,10 @@ timeVaryingMappedFixedValuePointPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_() {} @@ -74,10 +74,10 @@ timeVaryingMappedFixedValuePointPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_ ( ptf.offset_.valid() @@ -113,10 +113,10 @@ timeVaryingMappedFixedValuePointPatchField sampleTimes_(0), startSampleTime_(-1), startSampledValues_(0), - startAverage_(pTraits::zero), + startAverage_(Zero), endSampleTime_(-1), endSampledValues_(0), - endAverage_(pTraits::zero), + endAverage_(Zero), offset_() { if (dict.found("offset")) diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C index 3ca231a5c1..0d757a57c8 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C @@ -182,7 +182,7 @@ void Foam::fv::rotorDiskSource::writeField IOobject::NO_WRITE ), mesh_, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ) ); diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C index c7643dd71a..459ded8cd9 100644 --- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C +++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -157,7 +157,7 @@ void Foam::fv::SemiImplicitSource::addSup ( "zero", eqn.dimensions()/dimVolume, - pTraits::zero + Zero ), false ); diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H index ab077d5b7f..88326f8c2b 100644 --- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H +++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H @@ -69,8 +69,8 @@ public: //- Constructor integrationResult() : - value_(pTraits::zero), - average_(pTraits::zero) + value_(Zero), + average_(Zero) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C index 572e5a41d0..7f27ff8438 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/PairCollisionRecord/PairCollisionRecord.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Foam::PairCollisionRecord::PairCollisionRecord() : origProcOfOther_(0), origIdOfOther_(-1), - data_(pTraits::zero) + data_(Zero) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C index 3e4470eaf3..ed533633f0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C +++ b/src/lagrangian/intermediate/parcels/Templates/CollidingParcel/CollisionRecordList/WallCollisionRecord/WallCollisionRecord.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,7 +38,7 @@ Foam::WallCollisionRecord::WallCollisionRecord() : accessed_(false), pRel_(), - data_(pTraits::zero) + data_(Zero) {} diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C index 136140ad5f..2fa9f5b72a 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/AveragingMethod/AveragingMethod.C @@ -47,7 +47,7 @@ Foam::AveragingMethod::AveragingMethod { FieldField::append ( - new Field(size[i], pTraits::zero) + new Field(size[i], Zero) ); } } @@ -161,7 +161,7 @@ bool Foam::AveragingMethod::write() const mesh_ ), mesh_, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ); GeometricField cellGrad ( @@ -172,7 +172,7 @@ bool Foam::AveragingMethod::write() const mesh_ ), mesh_, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ); GeometricField pointValue ( @@ -183,7 +183,7 @@ bool Foam::AveragingMethod::write() const mesh_ ), pointMesh_, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ); GeometricField pointGrad ( @@ -194,7 +194,7 @@ bool Foam::AveragingMethod::write() const mesh_ ), pointMesh_, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ); // tet-volume weighted sums diff --git a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C index 97bbb7b9b5..b921b0042d 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/AveragingMethods/Basic/Basic.C @@ -77,7 +77,7 @@ void Foam::AveragingMethods::Basic::updateGrad() false ), this->mesh_, - dimensioned("zero", dimless, pTraits::zero), + dimensioned("zero", dimless, Zero), zeroGradientFvPatchField::typeName ); tempData.internalField() = data_; diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C index d693708a9b..895ae8bfd0 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C @@ -41,7 +41,7 @@ void Foam::bufferedAccumulator::accumulateAndResetBuffer(const label b) averagesTaken_++; - (*this)[b] = Field(bufferLength(), pTraits::zero); + (*this)[b] = Field(bufferLength(), Zero); bufferOffsets_[b] = 0; } @@ -112,7 +112,7 @@ void Foam::bufferedAccumulator::setSizes forAll((*this), b) { - (*this)[b] = Field(bufferLength, pTraits::zero); + (*this)[b] = Field(bufferLength, Zero); } averagesTaken_ = 0; @@ -187,7 +187,7 @@ Foam::Field Foam::bufferedAccumulator::averaged() const << ". Returning empty field." << endl; - return Field(bufferLength(), pTraits::zero); + return Field(bufferLength(), Zero); } } @@ -195,7 +195,7 @@ Foam::Field Foam::bufferedAccumulator::averaged() const template void Foam::bufferedAccumulator::resetAveraging() { - accumulationBuffer() = Field(bufferLength(), pTraits::zero); + accumulationBuffer() = Field(bufferLength(), Zero); averagesTaken_ = 0; } diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C index c90588a71f..a89c35333d 100644 --- a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C +++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C @@ -68,7 +68,7 @@ void Foam::correlationFunction::setTimesAndSizes Field ( tZeroBufferSize, - pTraits::zero + Zero ) ); } diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C index 0caa4f166c..f5630ead7e 100644 --- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C +++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchField.C @@ -50,7 +50,7 @@ zeroFixedValuePointPatchField : fixedValuePointPatchField(p, iF, dict, false) { - fixedValuePointPatchField::operator=(pTraits::zero); + fixedValuePointPatchField::operator=(Zero); } @@ -67,7 +67,7 @@ zeroFixedValuePointPatchField fixedValuePointPatchField(ptf, p, iF, mapper) { // For safety re-evaluate - fixedValuePointPatchField::operator=(pTraits::zero); + fixedValuePointPatchField::operator=(Zero); } @@ -93,7 +93,7 @@ zeroFixedValuePointPatchField fixedValuePointPatchField(ptf, iF) { // For safety re-evaluate - fixedValuePointPatchField::operator=(pTraits::zero); + fixedValuePointPatchField::operator=(Zero); } diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C index 7e42869451..12a1011e87 100644 --- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C +++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementTemplates.C @@ -70,7 +70,7 @@ T Foam::meshRefinement::gAverage << exit(FatalError); } - T sum = pTraits::zero; + T sum = Zero; label n = 0; forAll(values, i) @@ -305,7 +305,7 @@ void Foam::meshRefinement::weightedSum } sum.setSize(meshPoints.size()); - sum = pTraits::zero; + sum = Zero; forAll(edges, edgeI) { @@ -329,7 +329,7 @@ void Foam::meshRefinement::weightedSum meshPoints, sum, plusEqOp(), - pTraits::zero // null value + Type(Zero) // null value ); } diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C index a8eb5fff8c..d4f9cd36e5 100644 --- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C +++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C @@ -43,7 +43,7 @@ void Foam::snappyLayerDriver::averageNeighbours { const pointField& pts = mesh.points(); - average = pTraits::zero; + average = Zero; forAll(edges, edgeI) { @@ -77,7 +77,7 @@ void Foam::snappyLayerDriver::averageNeighbours meshPoints, average, plusEqOp(), - pTraits::zero // null value + Zero // null value ); average *= invSumWeight; diff --git a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C index 6b2f0ae692..1c55843ee2 100644 --- a/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C +++ b/src/meshTools/AMIInterpolation/AMIInterpolation/AMIInterpolation.C @@ -1284,7 +1284,7 @@ Foam::AMIInterpolation::interpolateToSource new Field ( srcAddress_.size(), - pTraits::zero + Zero ) ); @@ -1329,7 +1329,7 @@ Foam::AMIInterpolation::interpolateToTarget new Field ( tgtAddress_.size(), - pTraits::zero + Zero ) ); diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C index 8b5a50e394..bfd9152ceb 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBaseTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -70,7 +70,7 @@ void Foam::mappedPatchBase::distribute map().constructMap(), lst, cop, - pTraits::zero + Type(Zero) ); } } @@ -126,7 +126,7 @@ void Foam::mappedPatchBase::reverseDistribute map().subMap(), lst, cop, - pTraits::zero + Type(Zero) ); break; } diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C index 217f1f58f3..d678ee53a8 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSourceTemplates.C @@ -75,7 +75,7 @@ Type Foam::fieldValues::cellSource::processValues const scalarField& weightField ) const { - Type result = pTraits::zero; + Type result = Zero; switch (operation_) { case opSum: diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C index ca7c997662..0cfd1f40c6 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C @@ -81,7 +81,7 @@ Foam::tmp> Foam::fieldValues::faceSource::getFieldValues const faceList& faces = surfacePtr_().faces(); tmp> tavg ( - new Field(faces.size(), pTraits::zero) + new Field(faces.size(), Zero) ); Field& avg = tavg.ref(); @@ -127,7 +127,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues const scalarField& weightField ) const { - Type result = pTraits::zero; + Type result = Zero; switch (operation_) { case opSum: @@ -148,7 +148,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues << pTraits::typeName << exit(FatalError); - result = pTraits::zero; + result = Zero; break; } case opSumDirectionBalance: @@ -159,7 +159,7 @@ Type Foam::fieldValues::faceSource::processSameTypeValues << pTraits::typeName << exit(FatalError); - result = pTraits::zero; + result = Zero; break; } case opAverage: diff --git a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C index d5067cfce6..4cc4c9aea5 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/fieldValueDelta/fieldValueDeltaTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Type Foam::fieldValues::fieldValueDelta::applyOperation const Type& value2 ) const { - Type result = pTraits::zero; + Type result = Zero; switch (operation_) { @@ -89,8 +89,8 @@ void Foam::fieldValues::fieldValueDelta::processFields(bool& found) const dictionary& results1 = source1Ptr_->resultDict(); const dictionary& results2 = source2Ptr_->resultDict(); - Type r1(pTraits::zero); - Type r2(pTraits::zero); + Type r1(Zero); + Type r2(Zero); forAll(fields1, i) { diff --git a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C index 89589a0c45..0a570b9872 100644 --- a/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C +++ b/src/postProcessing/functionObjects/fvTools/calcFvcGrad/calcFvcGradTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,7 +63,7 @@ Foam::calcFvcGrad::gradField(const word& gradName, const dimensionSet& dims) ( "zero", dims/dimLength, - pTraits::zero + Zero ) ) ); diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C index 8722957966..03ef4f601e 100644 --- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C +++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C @@ -93,7 +93,7 @@ Foam::regionModels::regionModel::mapRegionPatchField new Field ( p.size(), - pTraits::zero + Zero ) ); } @@ -149,7 +149,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField new Field ( p.size(), - pTraits::zero + Zero ) ); } diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C index 1490e558b1..5454563cb8 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C +++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C @@ -182,7 +182,7 @@ thermalBaffle::thermalBaffle ( "zero", dimEnergy/dimArea/dimTime, - pTraits::zero + Zero ) ), Q_ @@ -200,7 +200,7 @@ thermalBaffle::thermalBaffle ( "zero", dimEnergy/dimVolume/dimTime, - pTraits::zero + Zero ) ), radiation_ @@ -242,7 +242,7 @@ thermalBaffle::thermalBaffle ( "zero", dimEnergy/dimArea/dimTime, - pTraits::zero + Zero ) ), Q_ @@ -260,7 +260,7 @@ thermalBaffle::thermalBaffle ( "zero", dimEnergy/dimVolume/dimTime, - pTraits::zero + Zero ) ), radiation_ diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 958b932be5..59b1590a9d 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -111,7 +111,7 @@ void Foam::meshToMesh::mapSrcToTgt if (srcAddress.size()) { -// result[cellI] = pTraits::zero; +// result[cellI] = Zero; result[cellI] *= (1.0 - sum(srcWeight)); forAll(srcAddress, i) { @@ -131,7 +131,7 @@ void Foam::meshToMesh::mapSrcToTgt if (srcAddress.size()) { -// result[cellI] = pTraits::zero; +// result[cellI] = Zero; result[cellI] *= (1.0 - sum(srcWeight)); forAll(srcAddress, i) { @@ -157,7 +157,7 @@ Foam::tmp> Foam::meshToMesh::mapSrcToTgt new Field ( tgtToSrcCellAddr_.size(), - pTraits::zero + Zero ) ); @@ -276,7 +276,7 @@ Foam::tmp> Foam::meshToMesh::mapTgtToSrc new Field ( srcToTgtCellAddr_.size(), - pTraits::zero + Zero ) ); @@ -362,7 +362,7 @@ void Foam::meshToMesh::mapSrcToTgt tgtField.rmap(tnewTgt(), identity(tgtField.size())); } - tgtField == pTraits::zero; + tgtField == Type(Zero); AMIList[i].interpolateToTarget ( @@ -461,7 +461,7 @@ Foam::meshToMesh::mapSrcToTgt ), tgtMesh, field.dimensions(), - Field(tgtMesh.nCells(), pTraits::zero), + Field(tgtMesh.nCells(), Zero), tgtPatchFields ) ); @@ -551,7 +551,7 @@ void Foam::meshToMesh::mapTgtToSrc srcField.rmap(tnewSrc(), identity(srcField.size())); } - srcField == pTraits::zero; + srcField == Type(Zero); AMIList[i].interpolateToSource ( @@ -650,7 +650,7 @@ Foam::meshToMesh::mapTgtToSrc ), srcMesh, field.dimensions(), - Field(srcMesh.nCells(), pTraits::zero), + Field(srcMesh.nCells(), Zero), srcPatchFields ) ); diff --git a/src/sampling/meshToMesh0/meshToMesh0Templates.C b/src/sampling/meshToMesh0/meshToMesh0Templates.C index b4805a5c98..b36d2c55d4 100644 --- a/src/sampling/meshToMesh0/meshToMesh0Templates.C +++ b/src/sampling/meshToMesh0/meshToMesh0Templates.C @@ -70,7 +70,7 @@ void Foam::meshToMesh0::interpolateField const labelList& overlapCells = adr[celli]; const scalarList& w = weights[celli]; - Type f = pTraits::zero; + Type f = Zero; forAll(overlapCells, i) { label fromCelli = overlapCells[i]; diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C index c0444401db..b610d44d03 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C @@ -468,7 +468,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints ( snappedPoint[pointI] != -1 ? snappedPoints[snappedPoint[pointI]] - : pTraits::zero + : Type(Zero) ), pVals[nextPointI], @@ -477,7 +477,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints ( snappedPoint[nextPointI] != -1 ? snappedPoints[snappedPoint[nextPointI]] - : pTraits::zero + : Type(Zero) ), cVals[own], @@ -486,7 +486,7 @@ Foam::label Foam::isoSurface::generateFaceTriPoints ( snappedCc[own] != -1 ? snappedPoints[snappedCc[own]] - : pTraits::zero + : Type(Zero) ), neiVal, @@ -582,7 +582,7 @@ void Foam::isoSurface::generateTriPoints ( snappedCc[nei[faceI]] != -1 ? snappedPoints[snappedCc[nei[faceI]]] - : pTraits::zero + : Type(Zero) ), triPoints, @@ -594,7 +594,7 @@ void Foam::isoSurface::generateTriPoints // Determine neighbouring snap status boolList neiSnapped(mesh_.nFaces()-mesh_.nInternalFaces(), false); - List neiSnappedPoint(neiSnapped.size(), pTraits::zero); + List neiSnappedPoint(neiSnapped.size(), Type(Zero)); forAll(patches, patchI) { const polyPatch& pp = patches[patchI]; @@ -680,7 +680,7 @@ void Foam::isoSurface::generateTriPoints cVals.boundaryField()[patchI][i], cCoords.boundaryField()[patchI][i], false, - pTraits::zero, + Type(Zero), triPoints, triMeshCells @@ -713,7 +713,7 @@ void Foam::isoSurface::generateTriPoints cVals.boundaryField()[patchI][i], cCoords.boundaryField()[patchI][i], false, // fc not snapped - pTraits::zero, + Type(Zero), triPoints, triMeshCells @@ -739,7 +739,7 @@ Foam::isoSurface::interpolate ) { // One value per point - tmp > tvalues(new Field(nPoints, pTraits::zero)); + tmp > tvalues(new Field(nPoints, Type(Zero))); Field& values = tvalues.ref(); labelList nValues(values.size(), 0); diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C index dcf176b56a..758c3395ed 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C @@ -49,7 +49,7 @@ bool Foam::sampledSurface::checkFieldSize(const Field& field) const template Type Foam::sampledSurface::integrate(const Field& field) const { - Type value = pTraits::zero; + Type value = Zero; if (checkFieldSize(field)) { @@ -73,7 +73,7 @@ Type Foam::sampledSurface::integrate(const tmp>& field) const template Type Foam::sampledSurface::average(const Field& field) const { - Type value = pTraits::zero; + Type value = Zero; if (checkFieldSize(field)) { @@ -89,7 +89,7 @@ Type Foam::sampledSurface::average(const Field& field) const } else { - return pTraits::zero; + return Zero; } } @@ -174,7 +174,7 @@ Foam::sampledSurface::pointAverage false ), mesh, - dimensioned("zero", dimless, pTraits::zero) + dimensioned("zero", dimless, Zero) ) ); GeometricField& cellAvg = tcellAvg.ref(); diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C index c286dde965..737ccba99b 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C @@ -56,7 +56,7 @@ Foam::sampledTriSurfaceMesh::sampleField // Create flat boundary field - Field bVals(nBnd, pTraits::zero); + Field bVals(nBnd, Zero); forAll(vField.boundaryField(), patchI) { diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C index 994f7bf467..12a730b424 100644 --- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C +++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C @@ -181,7 +181,7 @@ void Foam::nastranSurfaceWriter::writeTemplate const DynamicList& dFaces = decomposedFaces[i]; forAll(dFaces, faceI) { - Type v = pTraits::zero; + Type v = Zero; const face& f = dFaces[faceI]; forAll(f, fptI) diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C index f226acc91d..60301d6776 100644 --- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C +++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat::read // number of vertices for this zone label nZonePoints = 0; - vector location(pTraits::zero); + vector location(Zero); // tensor rotation(I); // Read all info for current zone diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C index f47a642e3b..0dee7077b7 100644 --- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C +++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,7 +96,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues false ), *this, - dimensioned("0", fld.dimensions(), pTraits::zero) + dimensioned("0", fld.dimensions(), Zero) ) ); }