diff --git a/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H b/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H index 438396ae90..34a822a0a2 100644 --- a/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/XiDyMFoam/pEqn.H @@ -2,9 +2,7 @@ rho = thermo.rho(); volScalarField rAU(1.0/UEqn.A()); surfaceScalarField rhorAUf("rhorAUf", fvc::interpolate(rho*rAU)); - -volVectorField HbyA("HbyA", U); -HbyA = rAU*UEqn.H(); +volVectorField HbyA(constrainHbyA(rAU*UEqn.H(), U, p)); if (pimple.transonic()) { @@ -54,6 +52,9 @@ else fvc::makeRelative(phiHbyA, rho, U); MRF.makeRelative(phiHbyA); + // Update the pressure BCs to ensure flux consistency + constrainPressure(p, rho, U, phiHbyA, rhorAUf, MRF); + while (pimple.correctNonOrthogonal()) { fvScalarMatrix pEqn diff --git a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H index d197c2c405..9edefc0c2c 100644 --- a/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H +++ b/applications/solvers/heatTransfer/thermoFoam/setAlphaEff.H @@ -27,7 +27,7 @@ IOobject::MUST_READ ); - if (turbulenceHeader.typeHeaderOk(true)) + if (turbulencePropertiesHeader.typeHeaderOk(true)) { autoPtr turbulence ( diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C index 0e43bb1b9b..b73c1fbecc 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C @@ -1368,7 +1368,7 @@ int main(int argc, char *argv[]) // Add all information for all the remaining faceZones // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - HashTable > faceZoneToPatches; + HashTable> faceZoneToPatches; forAll(mesh.faceZones(), zoneI) { const word& fzName = mesh.faceZones()[zoneI].name(); @@ -1400,7 +1400,7 @@ int main(int argc, char *argv[]) if (faceZoneToPatches.size()) { - autoRefineDriver::addFaceZones + snappyRefineDriver::addFaceZones ( meshRefiner, refineParams, diff --git a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C index a61141a2d5..c158b74842 100644 --- a/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C +++ b/applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C @@ -230,7 +230,7 @@ void subsetDimensionedFields ( const fvMeshSubset& subsetter, const wordList& fieldNames, - PtrList >& subFields + PtrList>& subFields ) { const fvMesh& baseMesh = subsetter.baseMesh(); diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.C b/applications/utilities/parallelProcessing/decomposePar/readFields.C index eeb53b3e64..5f36afaffa 100644 --- a/applications/utilities/parallelProcessing/decomposePar/readFields.C +++ b/applications/utilities/parallelProcessing/decomposePar/readFields.C @@ -33,7 +33,7 @@ void Foam::readFields ( const typename GeoMesh::Mesh& mesh, const IOobjectList& objects, - PtrList >& fields, + PtrList>& fields, const bool readOldTime ) { diff --git a/applications/utilities/parallelProcessing/decomposePar/readFields.H b/applications/utilities/parallelProcessing/decomposePar/readFields.H index 43f870aa82..d1c24d1031 100644 --- a/applications/utilities/parallelProcessing/decomposePar/readFields.H +++ b/applications/utilities/parallelProcessing/decomposePar/readFields.H @@ -47,7 +47,7 @@ namespace Foam ( const typename GeoMesh::Mesh& mesh, const IOobjectList& objects, - PtrList >& fields, + PtrList>& fields, const bool readOldTime ); diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H index e27ed92046..29e3673127 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H +++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructor.H @@ -105,7 +105,7 @@ public: //- Reconstruct volume internal field template - tmp > + tmp> reconstructFvVolumeInternalField ( const DimensionedField& @@ -113,14 +113,14 @@ public: //- Read and reconstruct volume internal field template - tmp > + tmp> reconstructFvVolumeInternalField(const IOobject& fieldIoObject) const; //- Reconstruct volume field template - tmp > + tmp> reconstructFvVolumeField ( const GeometricField& fld @@ -128,14 +128,14 @@ public: //- Read and reconstruct volume field template - tmp > + tmp> reconstructFvVolumeField(const IOobject& fieldIoObject) const; //- Reconstruct surface field template - tmp > + tmp> reconstructFvSurfaceField ( const GeometricField& @@ -143,7 +143,7 @@ public: //- Read and reconstruct surface field template - tmp > + tmp> reconstructFvSurfaceField(const IOobject& fieldIoObject) const; diff --git a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C index d5afc26416..5b9dc19431 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C +++ b/applications/utilities/parallelProcessing/redistributePar/parFvFieldReconstructorReconstructFields.C @@ -41,7 +41,7 @@ License // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField ( const DimensionedField& fld @@ -66,7 +66,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField IOobject::NO_WRITE ); - return tmp > + return tmp> ( new DimensionedField ( @@ -80,7 +80,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField ( const IOobject& fieldIoObject @@ -100,7 +100,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeInternalField // Reconstruct a field onto the baseMesh template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvVolumeField ( const GeometricField& fld @@ -123,7 +123,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Note: patchFields still on mesh, not baseMesh - PtrList > patchFields(fld.mesh().boundary().size()); + PtrList> patchFields(fld.mesh().boundary().size()); const typename GeometricField < @@ -151,7 +151,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField } - PtrList > basePatchFields + PtrList> basePatchFields ( baseMesh_.boundary().size() ); @@ -213,7 +213,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField IOobject::NO_WRITE ); - return tmp > + return tmp> ( new GeometricField ( @@ -228,7 +228,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvVolumeField ( const IOobject& fieldIoObject @@ -247,7 +247,7 @@ Foam::parFvFieldReconstructor::reconstructFvVolumeField template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvSurfaceField ( const GeometricField& fld @@ -263,16 +263,13 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField ); // Create flat field of internalField + all patch fields - Field flatFld(fld.mesh().nFaces(), pTraits::zero); - SubList(flatFld, fld.internalField().size()).assign - ( - fld.internalField() - ); + Field flatFld(fld.mesh().nFaces(), Type(Zero)); + SubList(flatFld, fld.internalField().size()) = fld.internalField(); forAll(fld.boundaryField(), patchI) { const fvsPatchField& fvp = fld.boundaryField()[patchI]; - SubList(flatFld, fvp.size(), fvp.patch().start()).assign(fvp); + SubList(flatFld, fvp.size(), fvp.patch().start()) = fvp; } // Map all faces @@ -293,7 +290,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // Note: patchFields still on mesh, not baseMesh - PtrList > patchFields(fld.mesh().boundary().size()); + PtrList> patchFields(fld.mesh().boundary().size()); const typename GeometricField < @@ -321,7 +318,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField } - PtrList > basePatchFields + PtrList> basePatchFields ( baseMesh_.boundary().size() ); @@ -383,7 +380,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField IOobject::NO_WRITE ); - return tmp > + return tmp> ( new GeometricField ( @@ -398,7 +395,7 @@ Foam::parFvFieldReconstructor::reconstructFvSurfaceField template -Foam::tmp > +Foam::tmp> Foam::parFvFieldReconstructor::reconstructFvSurfaceField ( const IOobject& fieldIoObject @@ -440,7 +437,7 @@ void Foam::parFvFieldReconstructor::reconstructFvVolumeInternalFields { Info<< " " << fieldIter()->name() << endl; - tmp > tfld + tmp> tfld ( reconstructFvVolumeInternalField(*fieldIter()) ); @@ -484,7 +481,7 @@ void Foam::parFvFieldReconstructor::reconstructFvVolumeFields { Info<< " " << name << endl; - tmp > tfld + tmp> tfld ( reconstructFvVolumeField(*fieldIter()) ); @@ -525,7 +522,7 @@ void Foam::parFvFieldReconstructor::reconstructFvSurfaceFields { Info<< " " << fieldIter()->name() << endl; - tmp > tfld + tmp> tfld ( reconstructFvSurfaceField(*fieldIter()) ); diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C index 16bf0a5137..0443a8e72d 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C +++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributor.C @@ -142,7 +142,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions { // List of lists of particles to be transfered for all of the // neighbour processors - List > particleTransferLists + List> particleTransferLists ( Pstream::nProcs() ); @@ -185,7 +185,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions // Start sending. Sets number of bytes transferred - labelListList allNTrans(Pstream::nProcs()); + labelList allNTrans(Pstream::nProcs()); pBufs.finishedSends(allNTrans); @@ -208,7 +208,7 @@ Foam::parLagrangianRedistributor::redistributeLagrangianPositions // Retrieve from receive buffers forAll(allNTrans, procI) { - label nRec = allNTrans[procI][Pstream::myProcNo()]; + label nRec = allNTrans[procI]; //Pout<< "From processor " << procI << " receiving bytes " << nRec // << endl; diff --git a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C index ca4f949dab..1eca70bd1e 100644 --- a/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C +++ b/applications/utilities/parallelProcessing/redistributePar/parLagrangianRedistributorRedistributeFields.C @@ -74,7 +74,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields { const wordList objectNames ( - filterObjects > + filterObjects> ( objects, selectedFields @@ -125,7 +125,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFields IOobject::NO_WRITE, false ), - xferMove >(field) + xferMove>(field) ).write(); } } @@ -146,7 +146,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields { wordList objectNames ( - filterObjects, Type> > + filterObjects, Type>> ( objects, selectedFields @@ -157,7 +157,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields { const wordList ioFieldNames ( - filterObjects > > + filterObjects>> ( objects, selectedFields @@ -212,7 +212,7 @@ void Foam::parLagrangianRedistributor::redistributeLagrangianFieldFields IOobject::NO_WRITE, false ), - xferMove > >(field) + xferMove>>(field) ).write(); } } @@ -309,7 +309,7 @@ void Foam::parLagrangianRedistributor::redistributeStoredLagrangianFields IOobject::NO_WRITE, false ), - xferMove >(field) + xferMove>(field) ).write(); } } diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index 5207aca97a..a02bf106a7 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -577,7 +577,7 @@ void readField const IOobject& io, const fvMesh& mesh, const label i, - PtrList >& fields + PtrList>& fields ) { fields.set @@ -829,11 +829,11 @@ autoPtr redistributeAndWrite PtrList surfSymmTensorFields; PtrList surfTensorFields; - PtrList > dimScalarFields; - PtrList > dimVectorFields; - PtrList > dimSphereTensorFields; - PtrList > dimSymmTensorFields; - PtrList > dimTensorFields; + PtrList> dimScalarFields; + PtrList> dimVectorFields; + PtrList> dimSphereTensorFields; + PtrList> dimSymmTensorFields; + PtrList> dimTensorFields; if (doReadFields) @@ -1815,21 +1815,21 @@ void readLagrangian //Pout<< "Found clould objects:" << sprayObjs.names() << endl; parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , label> > + , label>> ( clouds[i], sprayObjs, @@ -1838,21 +1838,21 @@ void readLagrangian parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , scalar> > + , scalar>> ( clouds[i], sprayObjs, @@ -1861,21 +1861,21 @@ void readLagrangian parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , vector> > + , vector>> ( clouds[i], sprayObjs, @@ -1884,21 +1884,21 @@ void readLagrangian parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , sphericalTensor> > + , sphericalTensor>> ( clouds[i], sprayObjs, @@ -1907,21 +1907,21 @@ void readLagrangian parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , symmTensor> > + , symmTensor>> ( clouds[i], sprayObjs, @@ -1930,21 +1930,21 @@ void readLagrangian parLagrangianRedistributor::readLagrangianFields - > + > ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - > > + >> ( clouds[i], sprayObjs, selectedLagrangianFields ); parLagrangianRedistributor::readLagrangianFields - , tensor> > + , tensor>> ( clouds[i], sprayObjs, @@ -1987,19 +1987,19 @@ void redistributeLagrangian distributor.redistributeLagrangianPositions(clouds[i]); distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , label> > + , label>> ( lagrangianMap, clouds[i] @@ -2007,19 +2007,19 @@ void redistributeLagrangian distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , scalar> > + , scalar>> ( lagrangianMap, clouds[i] @@ -2027,19 +2027,19 @@ void redistributeLagrangian distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , vector> > + , vector>> ( lagrangianMap, clouds[i] @@ -2047,19 +2047,19 @@ void redistributeLagrangian distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , sphericalTensor> > + , sphericalTensor>> ( lagrangianMap, clouds[i] @@ -2067,19 +2067,19 @@ void redistributeLagrangian distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , symmTensor> > + , symmTensor>> ( lagrangianMap, clouds[i] @@ -2087,19 +2087,19 @@ void redistributeLagrangian distributor.redistributeStoredLagrangianFields - > + > ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - > > + >> ( lagrangianMap, clouds[i] ); distributor.redistributeStoredLagrangianFields - , tensor> > + , tensor>> ( lagrangianMap, clouds[i] diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C index 9dc2708528..11c3a9a7b6 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -66,7 +66,7 @@ volField template -tmp > +tmp> volField ( const fvMeshSubset& meshSubsetter, @@ -83,7 +83,7 @@ volField IOobject io(df); io.readOpt() = IOobject::NO_READ; - tmp > tvf + tmp> tvf ( new GeometricField ( @@ -93,18 +93,18 @@ volField zeroGradientFvPatchField::typeName ) ); - tvf().internalField() = df; - tvf().correctBoundaryConditions(); + tvf.ref().internalField() = df; + tvf.ref().correctBoundaryConditions(); const GeometricField& vf = tvf(); if (meshSubsetter.hasSubMesh()) { - tmp > tfld + tmp> tfld ( meshSubsetter.interpolate(vf) ); - tfld().checkOut(); - tfld().rename(vf.name()); + tfld.ref().checkOut(); + tfld.ref().rename(vf.name()); return tfld; } else diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H index e2e2305091..813fea468e 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.H @@ -51,7 +51,7 @@ volField //- Wrapper to convert dimensionedInternalField to volField template -Foam::tmp > +Foam::tmp> volField ( const Foam::fvMeshSubset&, diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C index aea5074aff..234c9d85b3 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C @@ -706,7 +706,7 @@ int main(int argc, char *argv[]) IOobject::MUST_READ ); - bool fieldExists = fieldObject.typeHeaderOk > + bool fieldExists = fieldObject.typeHeaderOk> ( false ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H index b00aca4d17..f8fe345822 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H @@ -73,7 +73,7 @@ for (label i=0; i < nTypes; i++) if ( - lagrangianHeader.typeHeaderOk > > + lagrangianHeader.typeHeaderOk>> ( false ) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H index fe60ea8a0b..68b2f50f7f 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriter.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -98,7 +98,7 @@ public: template void write ( - const PtrList >& flds + const PtrList>& flds ); //- Interpolate and write volFields @@ -114,7 +114,7 @@ public: void write ( const volPointInterpolation&, - const PtrList >& + const PtrList>& ); }; diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C index c245f60a14..f2c346c49a 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/internalWriterTemplates.C @@ -44,7 +44,7 @@ void Foam::internalWriter::write template void Foam::internalWriter::write ( - const PtrList >& flds + const PtrList>& flds ) { forAll(flds, i) @@ -79,7 +79,7 @@ template void Foam::internalWriter::write ( const volPointInterpolation& pInterp, - const PtrList >& flds + const PtrList>& flds ) { forAll(flds, i) diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H index 310c2321fd..1776eefe09 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFuns.H @@ -156,7 +156,7 @@ public: ( std::ostream&, const bool binary, - const PtrList >&, + const PtrList>&, const vtkMesh& ); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C index 388e561c25..6f0c368bec 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C @@ -177,7 +177,7 @@ void Foam::writeFuns::write ( std::ostream& os, const bool binary, - const PtrList >& flds, + const PtrList>& flds, const vtkMesh& vMesh ) { diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H index 5bae918d13..5fb4b0b0d8 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.H @@ -487,7 +487,7 @@ class vtkPVFoam template void convertVolField ( - const PtrList >&, + const PtrList>&, const GeometricField&, const bool interpFields, vtkMultiBlockDataSet* output @@ -509,7 +509,7 @@ class vtkPVFoam void convertDimFields ( const fvMesh&, - const PtrList >&, + const PtrList>&, const IOobjectList&, const bool interpFields, vtkMultiBlockDataSet* output diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H index 468225eea0..11ed19a488 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfoFields.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -100,27 +100,27 @@ void Foam::vtkPVFoam::updateInfoFields ); //- Add dimensioned fields to GUI - addToSelection > + addToSelection> ( select, objects ); - addToSelection > + addToSelection> ( select, objects ); - addToSelection > + addToSelection> ( select, objects ); - addToSelection > + addToSelection> ( select, objects ); - addToSelection > + addToSelection> ( select, objects diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H index 7468f6ec51..ea4287beb0 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamVolFields.H @@ -51,7 +51,7 @@ template <<<<<<< HEAD:applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H void Foam::vtkPV4Foam::convertVolField ( - const PtrList >& ppInterpList, + const PtrList>& ppInterpList, const GeometricField& tf, ======= void Foam::vtkPVFoam::convertVolFields @@ -68,7 +68,7 @@ void Foam::vtkPVFoam::convertVolFields const polyBoundaryMesh& patches = mesh.boundaryMesh(); // Interpolated field (demand driven) - autoPtr > ptfPtr; + autoPtr> ptfPtr; if (interpFields) { if (debug) @@ -157,7 +157,7 @@ void Foam::vtkPVFoam::convertVolFields if ( - isType >(ptf) + isType>(ptf) || ( reader_->GetExtrapolatePatches() @@ -167,7 +167,7 @@ void Foam::vtkPVFoam::convertVolFields { fvPatch p(ptf.patch().patch(), mesh.boundary()); - tmp > tpptf + tmp> tpptf ( <<<<<<< HEAD:applications/utilities/postProcessing/graphics/PV4Readers/PV4FoamReader/vtkPV4Foam/vtkPV4FoamVolFields.H fvPatchField(p, tf).patchInternalField() @@ -313,7 +313,7 @@ template void Foam::vtkPV4Foam::convertVolFields ( const fvMesh& mesh, - const PtrList >& ppInterpList, + const PtrList>& ppInterpList, const IOobjectList& objects, const bool interpFields, vtkMultiBlockDataSet* output @@ -348,7 +348,7 @@ template void Foam::vtkPV4Foam::convertDimFields ( const fvMesh& mesh, - const PtrList >& ppInterpList, + const PtrList>& ppInterpList, const IOobjectList& objects, const bool interpFields, vtkMultiBlockDataSet* output @@ -375,7 +375,7 @@ void Foam::vtkPV4Foam::convertDimFields IOobject io(dimFld); io.readOpt() = IOobject::NO_READ; - PtrList > patchFields(mesh.boundary().size()); + PtrList> patchFields(mesh.boundary().size()); forAll(patchFields, patchI) { patchFields.set diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H index ba26142e3e..7110e2431c 100644 --- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H +++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H @@ -171,7 +171,7 @@ int USERD_set_filenames false ); - if (sprayHeader.typeHeaderOk >(false)) + if (sprayHeader.typeHeaderOk>(false)) { Info<< "[Found lagrangian]" << endl; diff --git a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C index 07fa9d7944..7b597bd777 100644 --- a/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C +++ b/applications/utilities/preProcessing/applyBoundaryLayer/applyBoundaryLayer.C @@ -74,7 +74,7 @@ Foam::tmp createSimplifiedU(const volVectorField& U) ); // Assign the internal value to the original field - tU() = U; + tU.ref() = U; return tU; } @@ -94,7 +94,7 @@ void correctProcessorPatches(volScalarField& vf) forAll(bf, patchI) { - if (isA >(bf[patchI])) + if (isA>(bf[patchI])) { bf[patchI].initEvaluate(); } @@ -102,7 +102,7 @@ void correctProcessorPatches(volScalarField& vf) forAll(bf, patchI) { - if (isA >(bf[patchI])) + if (isA>(bf[patchI])) { bf[patchI].evaluate(); } @@ -128,7 +128,7 @@ void blendField false ); - if (fieldHeader.headerOk()) + if (fieldHeader.typeHeaderOk(true)) { volScalarField fld(fieldHeader, mesh); scalarField& internalField = fld.internalField(); @@ -236,7 +236,7 @@ tmp calcNut basicThermo::dictName, runTime.constant(), mesh - ).headerOk() + ).typeHeaderOk(true) ) { // Compressible diff --git a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H index 128806c023..26c9577f4c 100644 --- a/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H +++ b/applications/utilities/preProcessing/createZeroDirectory/solverTemplate.H @@ -94,7 +94,7 @@ private: List fieldTypes_; //- Field dimensions - List > fieldDimensions_; + List> fieldDimensions_; // Public member functions diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C index 77db19822a..7f2746338c 100644 --- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C +++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C @@ -74,7 +74,7 @@ void rewriteBoundary HashTable& nbrNames ) { - Info<< "Reading boundary from " << typeFilePath >(io) + Info<< "Reading boundary from " << typeFilePath>(io) << endl; // Read PtrList of dictionary. @@ -447,7 +447,7 @@ int main(int argc, char *argv[]) false ); - if (io.typeHeaderOk >(false)) + if (io.typeHeaderOk>(false)) { rewriteBoundary ( @@ -481,7 +481,7 @@ int main(int argc, char *argv[]) false ); - if (io.typeHeaderOk >(false)) + if (io.typeHeaderOk>(false)) { rewriteBoundary ( diff --git a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C index a98613e5e5..02f0c5d9ad 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C +++ b/applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C @@ -335,7 +335,7 @@ int main(int argc, char *argv[]) const polyBoundaryMesh& coarsePatches = coarseMesh.boundaryMesh(); labelList viewFactorsPatches(patches.findIndices(viewFactorWall)); - forAll (viewFactorsPatches, i) + forAll(viewFactorsPatches, i) { label patchI = viewFactorsPatches[i]; nCoarseFaces += coarsePatches[patchI].size(); @@ -413,14 +413,14 @@ int main(int argc, char *argv[]) ( availablePoints, upp.faceCentres().size() - ).assign(upp.faceCentres()); + ) = upp.faceCentres(); SubList ( availablePoints, upp.localPoints().size(), upp.faceCentres().size() - ).assign(upp.localPoints()); + ) = upp.localPoints(); point cfo = cf; scalar dist = GREAT; @@ -783,24 +783,17 @@ int main(int argc, char *argv[]) const labelList& agglom = finalAgglom[patchID]; if (agglom.size() > 0) { -<<<<<<< HEAD label nAgglom = max(agglom)+1; labelListList coarseToFine(invertOneToMany(nAgglom, agglom)); const labelList& coarsePatchFace = coarseMesh.patchFaceMap()[patchID]; forAll(coarseToFine, coarseI) -======= - const scalar Fij = sum(F[compactI]); - const label coarseFaceID = coarsePatchFace[coarseI]; - const labelList& fineFaces = coarseToFine[coarseFaceID]; - forAll(fineFaces, fineId) ->>>>>>> foundation { const scalar Fij = sum(F[compactI]); const label coarseFaceID = coarsePatchFace[coarseI]; const labelList& fineFaces = coarseToFine[coarseFaceID]; - forAll (fineFaces, fineId) + forAll(fineFaces, fineId) { const label faceID = fineFaces[fineId]; viewFactorField.boundaryField()[patchID][faceID] = Fij; diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C index 656197ec80..f8c094c4bd 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C +++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -607,7 +607,7 @@ labelPair edgeIntersectionsCGAL const labelList& meshPoints = surf.meshPoints(); //Info<< "Intersecting CGAL surface ..." << endl; - List > intersections(edges.size()); + List> intersections(edges.size()); labelListList classifications(edges.size()); label nPoints = 0; @@ -1006,12 +1006,12 @@ void calcEdgeCutsBitsCGAL { edgeCuts1 = edgeIntersections ( - List >(surf1.nEdges()), + List>(surf1.nEdges()), labelListList(surf1.nEdges()) ); edgeCuts2 = edgeIntersections ( - List >(surf2.nEdges()), + List>(surf2.nEdges()), labelListList(surf2.nEdges()) ); @@ -1247,8 +1247,8 @@ autoPtr createEdgeMesh ( 2*nFeatEds ); - List > edgeNormals(nFeatEds); - List > normalDirections(nFeatEds); + List> edgeNormals(nFeatEds); + List> normalDirections(nFeatEds); const triSurface& s1 = surf1; @@ -1570,7 +1570,7 @@ int main(int argc, char *argv[]) } - List > surfaceAndSide; + List> surfaceAndSide; if (args.optionReadIfPresent("trim", surfaceAndSide)) { Info<< "Trimming edges with " << surfaceAndSide << endl; diff --git a/applications/utilities/surface/surfaceInflate/surfaceInflate.C b/applications/utilities/surface/surfaceInflate/surfaceInflate.C index aeb9b87d1c..2990c26a18 100644 --- a/applications/utilities/surface/surfaceInflate/surfaceInflate.C +++ b/applications/utilities/surface/surfaceInflate/surfaceInflate.C @@ -90,7 +90,7 @@ tmp calcVertexNormals(const triSurface& surf) ( new pointField(surf.nPoints(), vector::zero) ); - vectorField& pointNormals = tpointNormals(); + vectorField& pointNormals = tpointNormals.ref(); const pointField& points = surf.points(); const labelListList& pointFaces = surf.pointFaces(); @@ -134,7 +134,7 @@ tmp calcPointNormals { //const pointField pointNormals(s.pointNormals()); tmp tpointNormals(calcVertexNormals(s)); - vectorField& pointNormals = tpointNormals(); + vectorField& pointNormals = tpointNormals.ref(); // feature edges: create edge normals from edgeFaces only. @@ -356,7 +356,7 @@ tmp avg ) { tmp tres(new scalarField(s.nPoints(), 0.0)); - scalarField& res = tres(); + scalarField& res = tres.ref(); scalarField sumWeight(s.nPoints(), 0.0); diff --git a/etc/config.sh/settings b/etc/config.sh/settings index aff65057c3..f53af4b162 100644 --- a/etc/config.sh/settings +++ b/etc/config.sh/settings @@ -125,7 +125,7 @@ SunOS) /bin/cat <&2 Your "$WM_ARCH" operating system is not supported by this release - of OpenFOAM. For further assistance, please contact www.OpenFOAM.org + of OpenFOAM. For further assistance, please contact www.OpenFOAM.com USAGE ;; diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C index a9389addcf..dd52529602 100644 --- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C +++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C @@ -44,7 +44,6 @@ Foam::UPtrList::UPtrList(const label s) template -<<<<<<< HEAD Foam::UPtrList::UPtrList(UList& lst) : ptrs_(lst.size()) diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C index 6e00b3ef75..d5c3e77214 100644 --- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C +++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C @@ -78,7 +78,7 @@ Foam::IOobjectList::IOobjectList ); // Use object with local scope - if (objectPtr->typeHeaderOk >(false)) + if (objectPtr->typeHeaderOk>(false)) { insert(ObjectNames[i], objectPtr); } diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C index 84c9cc3771..3cb85ba18a 100644 --- a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C +++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,7 +33,7 @@ Foam::GlobalIOField::GlobalIOField(const IOobject& io) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); readHeaderOk(IOstream::BINARY, typeName); } @@ -45,7 +45,7 @@ Foam::GlobalIOField::GlobalIOField(const IOobject& io, const label size) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if (!readHeaderOk(IOstream::BINARY, typeName)) { @@ -64,7 +64,7 @@ Foam::GlobalIOField::GlobalIOField regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if (!readHeaderOk(IOstream::BINARY, typeName)) { @@ -77,13 +77,13 @@ template Foam::GlobalIOField::GlobalIOField ( const IOobject& io, - const Xfer >& f + const Xfer>& f ) : regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); Field::transfer(f()); diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H index db33e9ef8c..ee2dcbf79a 100644 --- a/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H +++ b/src/OpenFOAM/db/IOobjects/GlobalIOField/GlobalIOField.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -71,7 +71,7 @@ public: GlobalIOField(const IOobject&, const Field&); //- Construct by transferring the Field contents - GlobalIOField(const IOobject&, const Xfer >&); + GlobalIOField(const IOobject&, const Xfer>&); //- Destructor diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C index 51130e9b21..bad4fe1237 100644 --- a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C +++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,7 +33,7 @@ Foam::GlobalIOList::GlobalIOList(const IOobject& io) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); readHeaderOk(IOstream::BINARY, typeName); } @@ -45,7 +45,7 @@ Foam::GlobalIOList::GlobalIOList(const IOobject& io, const label size) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if (!readHeaderOk(IOstream::BINARY, typeName)) { @@ -60,7 +60,7 @@ Foam::GlobalIOList::GlobalIOList(const IOobject& io, const List& f) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if (!readHeaderOk(IOstream::BINARY, typeName)) { @@ -73,13 +73,13 @@ template Foam::GlobalIOList::GlobalIOList ( const IOobject& io, - const Xfer >& f + const Xfer>& f ) : regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); List::transfer(f()); diff --git a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H index f2ef2ee73e..7230fd6c7d 100644 --- a/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H +++ b/src/OpenFOAM/db/IOobjects/GlobalIOList/GlobalIOList.H @@ -71,7 +71,7 @@ public: GlobalIOList(const IOobject&, const List&); //- Construct by transferring the List contents - GlobalIOList(const IOobject&, const Xfer >&); + GlobalIOList(const IOobject&, const Xfer>&); //- Destructor diff --git a/src/OpenFOAM/db/IOobjects/IOField/IOField.C b/src/OpenFOAM/db/IOobjects/IOField/IOField.C index 3f5bdacd71..ce115c36f7 100644 --- a/src/OpenFOAM/db/IOobjects/IOField/IOField.C +++ b/src/OpenFOAM/db/IOobjects/IOField/IOField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,7 +33,7 @@ Foam::IOField::IOField(const IOobject& io) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -56,7 +56,7 @@ Foam::IOField::IOField(const IOobject& io, const label size) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -83,7 +83,7 @@ Foam::IOField::IOField(const IOobject& io, const Field& f) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -110,7 +110,7 @@ Foam::IOField::IOField(const IOobject& io, const Xfer>& f) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); Field::transfer(f()); diff --git a/src/OpenFOAM/db/IOobjects/IOList/IOList.C b/src/OpenFOAM/db/IOobjects/IOList/IOList.C index d5177f2036..3859e4de04 100644 --- a/src/OpenFOAM/db/IOobjects/IOList/IOList.C +++ b/src/OpenFOAM/db/IOobjects/IOList/IOList.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -33,7 +33,7 @@ Foam::IOList::IOList(const IOobject& io) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -56,7 +56,7 @@ Foam::IOList::IOList(const IOobject& io, const label size) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -83,7 +83,7 @@ Foam::IOList::IOList(const IOobject& io, const List& list) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); if ( @@ -110,7 +110,7 @@ Foam::IOList::IOList(const IOobject& io, const Xfer>& list) regIOobject(io) { // Check for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); List::transfer(list()); diff --git a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C index dd64eb60d5..894dd2cfc6 100644 --- a/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C +++ b/src/OpenFOAM/db/IOobjects/IOMap/IOMapName.C @@ -32,7 +32,7 @@ namespace Foam //- Template specialisation for obtaining filePath template<> - fileName typeFilePath >(const IOobject& io) + fileName typeFilePath>(const IOobject& io) { return io.globalFilePath(); } diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C index 0a2f3c71ee..ab24791b7f 100644 --- a/src/OpenFOAM/db/Time/findInstance.C +++ b/src/OpenFOAM/db/Time/findInstance.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -64,7 +64,7 @@ Foam::word Foam::Time::findInstance timeName(), dir, *this - ).typeHeaderOk >(false) // use object with local scope + ).typeHeaderOk>(false) // use object with local scope ) ) { @@ -109,7 +109,7 @@ Foam::word Foam::Time::findInstance ts[instanceI].name(), dir, *this - ).typeHeaderOk >(false) + ).typeHeaderOk>(false) ) ) { @@ -182,7 +182,7 @@ Foam::word Foam::Time::findInstance constant(), dir, *this - ).typeHeaderOk >(false) + ).typeHeaderOk>(false) ) ) { diff --git a/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H index 6bf3ec4331..f17b051aff 100644 --- a/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H +++ b/src/OpenFOAM/db/functionObjects/functionObjectState/functionObjectState.H @@ -134,7 +134,7 @@ public: Type getProperty ( const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Retrieve generic property @@ -151,7 +151,7 @@ public: ( const word& objectName, const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Retrieve generic property from named object @@ -197,7 +197,7 @@ public: Type getResult ( const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Retrieve result from named object @@ -206,7 +206,7 @@ public: ( const word& objectName, const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Retrieve result from named object diff --git a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C index a0a3cc245e..d9488544d5 100644 --- a/src/OpenFOAM/db/regIOobject/regIOobjectRead.C +++ b/src/OpenFOAM/db/regIOobject/regIOobjectRead.C @@ -365,6 +365,7 @@ bool Foam::regIOobject::read() { // Re-watch master file addWatch(); + } return ok; } diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H index 7d1549f4b2..fe817e4afe 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H +++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H @@ -129,7 +129,7 @@ public: const word&, const dictionary&, const dimensionSet& dims = dimless, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ); //- Construct from dictionary dimensionless with value. @@ -137,7 +137,7 @@ public: ( const word&, const dictionary&, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ); //- Construct from dictionary, with default value. @@ -147,7 +147,7 @@ public: const word&, dictionary&, const dimensionSet& dims = dimless, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ); //- Construct from dictionary, dimensionless with default value. @@ -156,7 +156,7 @@ public: ( const word&, dictionary&, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ); diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 429c97c8ef..dfd8a413e3 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -167,14 +167,9 @@ Foam::Field::Field template Foam::Field::Field ( -<<<<<<< HEAD - const tmp >& tmapF, + const tmp>& tmapF, const FieldMapper& mapper, const bool applyFlip -======= - const tmp>& tmapF, - const FieldMapper& mapper ->>>>>>> foundation ) : List(mapper.size()) @@ -504,14 +499,9 @@ void Foam::Field::map template void Foam::Field::map ( -<<<<<<< HEAD - const tmp >& tmapF, + const tmp>& tmapF, const FieldMapper& mapper, const bool applyFlip -======= - const tmp>& tmapF, - const FieldMapper& mapper ->>>>>>> foundation ) { map(tmapF(), mapper, applyFlip); diff --git a/src/OpenFOAM/fields/Fields/Field/Field.H b/src/OpenFOAM/fields/Fields/Field/Field.H index e901ac18e2..edb788a1b3 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.H +++ b/src/OpenFOAM/fields/Fields/Field/Field.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -185,14 +185,9 @@ public: //- Construct by mapping from the given tmp field Field ( -<<<<<<< HEAD - const tmp >& tmapF, + const tmp>& tmapF, const FieldMapper& map, const bool applyFlip = true -======= - const tmp>& tmapF, - const FieldMapper& map ->>>>>>> foundation ); //- Construct by mapping from the given tmp field. Supplied uniform @@ -290,14 +285,9 @@ public: //- Map from the given tmp field void map ( -<<<<<<< HEAD - const tmp >& tmapF, + const tmp>& tmapF, const FieldMapper& map, const bool applyFlip = true -======= - const tmp>& tmapF, - const FieldMapper& map ->>>>>>> foundation ); //- Map from self diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index 8310a39300..2a7390940c 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -31,14 +31,14 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#define checkField(gf1, gf2, op) \ -if ((gf1).mesh() != (gf2).mesh()) \ -{ \ - FatalErrorInFunction \ - << "different mesh for fields " \ - << (gf1).name() << " and " << (gf2).name() \ - << " during operation " << op \ - << abort(FatalError); \ +#define checkField(gf1, gf2, op) \ +if ((gf1).mesh() != (gf2).mesh()) \ +{ \ + FatalErrorInFunction \ + << "different mesh for fields " \ + << (gf1).name() << " and " << (gf2).name() \ + << " during operation " << op \ + << abort(FatalError); \ } @@ -108,7 +108,7 @@ bool Foam::GeometricField::readIfPresent() else if ( this->readOpt() == IOobject::READ_IF_PRESENT - && this->template typeHeaderOk > + && this->template typeHeaderOk> ( true ) @@ -151,7 +151,7 @@ bool Foam::GeometricField::readOldTimeIfPresent() if ( - field0.template typeHeaderOk > + field0.template typeHeaderOk> ( true ) diff --git a/src/OpenFOAM/fields/ReadFields/ReadFields.H b/src/OpenFOAM/fields/ReadFields/ReadFields.H index 57f7303d82..636238176f 100644 --- a/src/OpenFOAM/fields/ReadFields/ReadFields.H +++ b/src/OpenFOAM/fields/ReadFields/ReadFields.H @@ -57,7 +57,7 @@ wordList ReadFields ( const typename GeoMesh::Mesh& mesh, const IOobjectList& objects, - PtrList >& fields, + PtrList>& fields, const bool syncPar = true, const bool readOldTime = false ); diff --git a/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C index 7a7a02c038..5642213d43 100644 --- a/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C +++ b/src/OpenFOAM/fields/ReadFields/ReadFieldsTemplates.C @@ -36,7 +36,7 @@ Foam::wordList Foam::ReadFields ( const typename GeoMesh::Mesh& mesh, const IOobjectList& objects, - PtrList >& fields, + PtrList>& fields, const bool syncPar, const bool readOldTime ) diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C index ec9dfa6ea4..520f28e6ab 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/uniformFixedValue/uniformFixedValuePointPatchField.C @@ -78,7 +78,7 @@ uniformFixedValuePointPatchField ) : fixedValuePointPatchField(ptf, p, iF, mapper), - uniformValue_(ptf.uniformValue_().clone().ptr()) + uniformValue_(ptf.uniformValue_, false) { // For safety re-evaluate const scalar t = this->db().time().timeOutputValue(); @@ -94,7 +94,7 @@ uniformFixedValuePointPatchField ) : fixedValuePointPatchField(ptf), - uniformValue_(ptf.uniformValue_().clone().ptr()) + uniformValue_(ptf.uniformValue_, false) {} @@ -107,7 +107,7 @@ uniformFixedValuePointPatchField ) : fixedValuePointPatchField(ptf, iF), - uniformValue_(ptf.uniformValue_().clone().ptr()) + uniformValue_(ptf.uniformValue_, false) { // For safety re-evaluate const scalar t = this->db().time().timeOutputValue(); diff --git a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H index 1c639c4439..3c5d5ae912 100644 --- a/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H +++ b/src/OpenFOAM/matrices/LduMatrix/LduMatrix/SolverPerformance.H @@ -122,8 +122,8 @@ public: ( const word& solverName, const word& fieldName, - const Type& iRes = pTraits::zero, - const Type& fRes = pTraits::zero, + const Type& iRes = Type(Zero), + const Type& fRes = Type(Zero), const label nIter = 0, const bool converged = false, const bool singular = false diff --git a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C index 5e9ed25702..943dff0f24 100644 --- a/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C +++ b/src/OpenFOAM/matrices/scalarMatrices/scalarMatricesTemplates.C @@ -139,7 +139,7 @@ void Foam::LUBacksubstitute sum -= luMatrixi[j]*sourceSol[j]; } } - else if (sum != pTraits::zero) + else if (sum != Type(Zero)) { ii = i+1; } @@ -185,7 +185,7 @@ void Foam::LUBacksubstitute sum -= luMatrixi[j]*sourceSol[j]; } } - else if (sum != pTraits::zero) + else if (sum != Type(Zero)) { ii = i+1; } diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C index 2cdf3d0af2..ef132e5676 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -50,7 +50,7 @@ Foam::List Foam::mapDistributeBase::schedule List allComms; { - HashSet > commsSet(Pstream::nProcs()); + HashSet> commsSet(Pstream::nProcs()); // Find what communication is required forAll(subMap, procI) @@ -280,7 +280,7 @@ void Foam::mapDistributeBase::calcCompactAddressing ( const globalIndex& globalNumbering, const labelList& elements, - List >& compactMap + List>& compactMap ) const { compactMap.setSize(Pstream::nProcs()); @@ -329,7 +329,7 @@ void Foam::mapDistributeBase::calcCompactAddressing ( const globalIndex& globalNumbering, const labelListList& cellCells, - List >& compactMap + List>& compactMap ) const { compactMap.setSize(Pstream::nProcs()); @@ -389,7 +389,7 @@ void Foam::mapDistributeBase::exchangeAddressing const int tag, const globalIndex& globalNumbering, labelList& elements, - List >& compactMap, + List>& compactMap, labelList& compactStart ) { @@ -446,12 +446,10 @@ void Foam::mapDistributeBase::exchangeAddressing } subMap_.setSize(Pstream::nProcs()); - labelListList sendSizes; Pstream::exchange ( wantedRemoteElements, subMap_, - sendSizes, tag, Pstream::worldComm //TBD ); @@ -469,7 +467,7 @@ void Foam::mapDistributeBase::exchangeAddressing const int tag, const globalIndex& globalNumbering, labelListList& cellCells, - List >& compactMap, + List>& compactMap, labelList& compactStart ) { @@ -526,12 +524,10 @@ void Foam::mapDistributeBase::exchangeAddressing } subMap_.setSize(Pstream::nProcs()); - labelListList sendSizes; Pstream::exchange ( wantedRemoteElements, subMap_, - sendSizes, tag, Pstream::worldComm //TBD ); @@ -658,7 +654,7 @@ Foam::mapDistributeBase::mapDistributeBase ( const globalIndex& globalNumbering, labelList& elements, - List >& compactMap, + List>& compactMap, const int tag ) : @@ -718,7 +714,7 @@ Foam::mapDistributeBase::mapDistributeBase ( const globalIndex& globalNumbering, labelListList& cellCells, - List >& compactMap, + List>& compactMap, const int tag ) : @@ -824,7 +820,7 @@ Foam::Xfer Foam::mapDistributeBase::xfer() Foam::label Foam::mapDistributeBase::renumber ( const globalIndex& globalNumbering, - const List >& compactMap, + const List>& compactMap, const label globalI ) { diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H index 80be2a8b9e..9497a3467d 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -112,7 +112,7 @@ protected: //- Schedule - mutable autoPtr > schedulePtr_; + mutable autoPtr> schedulePtr_; // Private Member Functions @@ -128,13 +128,13 @@ protected: ( const globalIndex& globalNumbering, const labelList& elements, - List >& compactMap + List>& compactMap ) const; void calcCompactAddressing ( const globalIndex& globalNumbering, const labelListList& elements, - List >& compactMap + List>& compactMap ) const; void exchangeAddressing @@ -142,7 +142,7 @@ protected: const int tag, const globalIndex& globalNumbering, labelList& elements, - List >& compactMap, + List>& compactMap, labelList& compactStart ); void exchangeAddressing @@ -150,7 +150,7 @@ protected: const int tag, const globalIndex& globalNumbering, labelListList& elements, - List >& compactMap, + List>& compactMap, labelList& compactStart ); @@ -212,7 +212,7 @@ public: ( const globalIndex&, labelList& elements, - List >& compactMap, + List>& compactMap, const int tag = Pstream::msgType() ); @@ -223,7 +223,7 @@ public: ( const globalIndex&, labelListList& cellCells, - List >& compactMap, + List>& compactMap, const int tag = Pstream::msgType() ); @@ -326,7 +326,7 @@ public: static label renumber ( const globalIndex&, - const List >& compactMap, + const List>& compactMap, const label globalElement ); diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C index 111424e589..df1986bf8c 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBaseTemplates.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -461,7 +461,7 @@ void Foam::mapDistributeBase::distribute { // Set up sends to neighbours - List > sendFields(Pstream::nProcs()); + List> sendFields(Pstream::nProcs()); for (label domain = 0; domain < Pstream::nProcs(); domain++) { @@ -495,7 +495,7 @@ void Foam::mapDistributeBase::distribute // Set up receives from neighbours - List > recvFields(Pstream::nProcs()); + List> recvFields(Pstream::nProcs()); for (label domain = 0; domain < Pstream::nProcs(); domain++) { @@ -938,7 +938,7 @@ void Foam::mapDistributeBase::distribute { // Set up sends to neighbours - List > sendFields(Pstream::nProcs()); + List> sendFields(Pstream::nProcs()); for (label domain = 0; domain < Pstream::nProcs(); domain++) { @@ -972,7 +972,7 @@ void Foam::mapDistributeBase::distribute // Set up receives from neighbours - List > recvFields(Pstream::nProcs()); + List> recvFields(Pstream::nProcs()); for (label domain = 0; domain < Pstream::nProcs(); domain++) { diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C index b0e95a63e6..3e72e591dc 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -81,7 +81,7 @@ bool Foam::ZoneMesh::read() ) { // Warn for MUST_READ_IF_MODIFIED - warnNoRereading >(); + warnNoRereading>(); PtrList& zones = *this; diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C index d24abf7291..883a05d00a 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C +++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C @@ -27,6 +27,18 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::Function1Types::Constant::Constant +( + const word& entryName, + const Type& value +) +: + Function1(entryName), + value_(value) +{} + + template Foam::Function1Types::Constant::Constant ( @@ -44,29 +56,11 @@ Foam::Function1Types::Constant::Constant template -<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C -Foam::Constant::Constant -( - const word& entryName, - const Type& value, - const dimensionSet& dimensions -) -: - DataEntry(entryName), - value_(value), - dimensions_(dimensions) -{} - - -template -Foam::Constant::Constant(const Constant& cnst) -======= Foam::Function1Types::Constant::Constant ( const word& entryName, Istream& is ) ->>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C : Function1(entryName), value_(pTraits(is)) diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H index 1fe11c7fa8..ee0279b23e 100644 --- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H +++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H @@ -78,17 +78,13 @@ public: // Constructors -<<<<<<< HEAD:src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H //- Construct from components Constant ( const word& entryName, - const Type& value, - const dimensionSet& dimensions = dimless + const Type& value ); -======= ->>>>>>> foundation:src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H //- Construct from entry name and dictionary Constant(const word& entryName, const dictionary& dict); diff --git a/src/OpenFOAM/primitives/subModelBase/subModelBase.H b/src/OpenFOAM/primitives/subModelBase/subModelBase.H index c5f05c06c5..c3e861caac 100644 --- a/src/OpenFOAM/primitives/subModelBase/subModelBase.H +++ b/src/OpenFOAM/primitives/subModelBase/subModelBase.H @@ -165,7 +165,7 @@ public: Type getBaseProperty ( const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Retrieve generic property from the base model @@ -188,7 +188,7 @@ public: Type getModelProperty ( const word& entryName, - const Type& defaultValue = pTraits::zero + const Type& defaultValue = Type(Zero) ) const; //- Add generic property to the sub-model diff --git a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H index 291a47a8ec..94b316270b 100644 --- a/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H +++ b/src/TurbulenceModels/schemes/DEShybrid/DEShybrid.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -129,10 +129,10 @@ class DEShybrid // Private Data //- Scheme 1 - tmp > tScheme1_; + tmp> tScheme1_; //- Scheme 2 - tmp > tScheme2_; + tmp> tScheme2_; //- DES Coefficient scalar CDES_; @@ -424,7 +424,7 @@ public: //- Return the face-interpolate of the given cell field // with explicit correction - tmp > + tmp> interpolate ( const GeometricField& vf @@ -447,7 +447,7 @@ public: //- Return the explicit correction to the face-interpolate // for the given field - virtual tmp > + virtual tmp> correction ( const GeometricField& vf @@ -482,7 +482,7 @@ public: } else { - return tmp > + return tmp> ( NULL ); diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C index 38fd4a9617..e4d8fddf16 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C @@ -175,7 +175,7 @@ tmp SpalartAllmarasDES::psi if (lowReCorrection_) { - volScalarField& psi = tpsi(); + volScalarField& psi = tpsi.ref(); const volScalarField fv2(this->fv2(chi, fv1)); const volScalarField ft2(this->ft2(chi)); @@ -477,7 +477,7 @@ tmp SpalartAllmarasDES::k() const zeroGradientFvPatchField::typeName ) ); - volScalarField& dTildaF = tdTilda(); + volScalarField& dTildaF = tdTilda.ref(); dTildaF = dTilda(chi, fv1, fvc::grad(this->U_)); dTildaF.correctBoundaryConditions(); diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 7ce8a1fae1..a302520b58 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -98,7 +98,7 @@ tmp SpalartAllmarasIDDES::rd scalar(10) ) ); - tr().boundaryField() == 0.0; + tr.ref().boundaryField() == 0.0; return tr; } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C index b4f46dfd1d..76868eea29 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDDES/kOmegaSSTDDES.C @@ -56,7 +56,7 @@ tmp kOmegaSSTDDES::rd scalar(10) ) ); - tr().boundaryField() == 0.0; + tr.ref().boundaryField() == 0.0; return tr; } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C index 0251f96e2a..91fae228e7 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -38,7 +38,7 @@ template void kOmegaSSTDES::correctNut(const volScalarField& S2) { // Correct the turbulence viscosity - kOmegaSSTBase >::correctNut(S2); + kOmegaSSTBase>::correctNut(S2); // Correct the turbulence thermal diffusivity BasicTurbulenceModel::correctNut(); @@ -81,7 +81,7 @@ kOmegaSSTDES::kOmegaSSTDES const word& type ) : - kOmegaSSTBase > + kOmegaSSTBase> ( type, alpha, @@ -135,7 +135,7 @@ kOmegaSSTDES::kOmegaSSTDES template bool kOmegaSSTDES::read() { - if (kOmegaSSTBase >::read()) + if (kOmegaSSTBase>::read()) { kappa_.readIfPresent(this->coeffDict()); CDESkom_.readIfPresent(this->coeffDict()); @@ -206,9 +206,9 @@ void kOmegaSSTDES::correct() + this->omegaSource() ); - omegaEqn().relax(); + omegaEqn.ref().relax(); - omegaEqn().boundaryManipulate(omega.boundaryField()); + omegaEqn.ref().boundaryManipulate(omega.boundaryField()); solve(omegaEqn); bound(omega, this->omegaMin_); @@ -231,7 +231,7 @@ void kOmegaSSTDES::correct() + this->kSource() ); - kEqn().relax(); + kEqn.ref().relax(); solve(kEqn); bound(k, this->kMin_); } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H index a7648d0dd1..c609ab98dc 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -65,7 +65,7 @@ namespace LESModels template class kOmegaSSTDES : - public kOmegaSSTBase > + public kOmegaSSTBase> { // Private Member Functions diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C index a3e3bc8104..a01df0542a 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C @@ -98,7 +98,7 @@ tmp kOmegaSSTIDDES::rd scalar(10) ) ); - tr().boundaryField() == 0.0; + tr.ref().boundaryField() == 0.0; return tr; } diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C index 9f0eb506cf..0aa485a0ec 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "LESeddyViscosity.H" +#include "zeroGradientFvPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -107,10 +108,10 @@ tmp LESeddyViscosity::epsilon() const IOobject::NO_WRITE ), Ce_*tk()*sqrt(tk())/this->delta(), - zeroGradientFvPatchScalarField::typeName + zeroGradientFvPatchField::typeName ) ); - volScalarField& epsilon = tepsilon(); + volScalarField& epsilon = tepsilon.ref(); epsilon.correctBoundaryConditions(); return tepsilon; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C index 1041847dc8..0db50da62e 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C @@ -24,12 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "kOmegaSST.H" -<<<<<<< HEAD -======= -#include "fvOptions.H" -#include "bound.H" -#include "wallDist.H" ->>>>>>> foundation // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -44,7 +38,7 @@ template void kOmegaSST::correctNut(const volScalarField& S2) { // Correct the turbulence viscosity - kOmegaSSTBase > >::correctNut + kOmegaSSTBase>>::correctNut ( S2 ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C index 4940cacefb..511ac65abf 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C @@ -56,8 +56,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField fixedJumpFvPatchField(p, iF), phiName_(dict.lookupOrDefault("phi", "phi")), rhoName_(dict.lookupOrDefault("rho", "rho")), - D_(DataEntry::New("D", dict)), - I_(DataEntry::New("I", dict)), + D_(Function1::New("D", dict)), + I_(Function1::New("I", dict)), length_(readScalar(dict.lookup("length"))), uniformJump_(dict.lookupOrDefault("uniformJump", false)) { diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H index e67d7a4634..851fe6df75 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -89,7 +89,7 @@ SourceFiles #define porousBafflePressureFvPatchField_H #include "fixedJumpFvPatchField.H" -#include "DataEntry.H" +#include "Function1.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -113,10 +113,10 @@ class porousBafflePressureFvPatchField const word rhoName_; //- Darcy pressure loss coefficient - autoPtr > D_; + autoPtr> D_; //- Inertia pressure lost coefficient - autoPtr > I_; + autoPtr> I_; //- Porous media length scalar length_; diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C index 7d740ba875..3261bf1b51 100644 --- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C +++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.C @@ -256,14 +256,14 @@ diffusionMulticomponent::correct() const List& lhs = reactions_[k].lhs(); // Set to zero RR's - forAll (lhs, l) + forAll(lhs, l) { const label lIndex = lhs[l].index; this->chemistryPtr_->RR(lIndex) = dimensionedScalar("zero", dimMass/dimTime/dimVolume, 0.0); } - forAll (rhs, l) + forAll(rhs, l) { const label rIndex = rhs[l].index; this->chemistryPtr_->RR(rIndex) = @@ -363,7 +363,7 @@ diffusionMulticomponent::correct() const List& lhs = reactions_[k].lhs(); scalar fuelStoic = 1.0; - forAll (lhs, l) + forAll(lhs, l) { const label lIndex = lhs[l].index; if (lIndex == fuelIndex) @@ -376,7 +376,7 @@ diffusionMulticomponent::correct() const scalar MwFuel = specieThermo_[fuelIndex].W(); // Update left hand side species - forAll (lhs, l) + forAll(lhs, l) { const label lIndex = lhs[l].index; @@ -389,7 +389,7 @@ diffusionMulticomponent::correct() } // Update right hand side species - forAll (rhs, r) + forAll(rhs, r) { const label rIndex = rhs[r].index; @@ -411,7 +411,7 @@ R(volScalarField& Y) const { tmp tSu(new fvScalarMatrix(Y, dimMass/dimTime)); - fvScalarMatrix& Su = tSu(); + fvScalarMatrix& Su = tSu.ref(); if (this->active()) { @@ -449,7 +449,7 @@ dQ() const if (this->active()) { - volScalarField& dQ = tdQ(); + volScalarField& dQ = tdQ.ref(); dQ = this->chemistryPtr_->dQ(); } @@ -483,7 +483,7 @@ Sh() const if (this->active()) { - scalarField& Sh = tSh(); + scalarField& Sh = tSh.ref(); Sh = this->chemistryPtr_->Sh(); } diff --git a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H index e859e8e4bb..f7143d00ee 100644 --- a/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H +++ b/src/combustionModels/diffusionMulticomponent/diffusionMulticomponent.H @@ -92,7 +92,7 @@ class diffusionMulticomponent // Private data //- Reactions - const PtrList >& reactions_; + const PtrList>& reactions_; //- Thermodynamic data of the species const PtrList& specieThermo_; diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C index 70a0b593b3..96a0c4dc5a 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -408,7 +408,7 @@ Foam::tmp Foam::fvMeshDistribute::generateTestField dimensionedScalar("zero", dimless, 0.0) ) ); - surfaceScalarField& fld = tfld(); + surfaceScalarField& fld = tfld.ref(); const surfaceVectorField n(mesh.Sf()/mesh.magSf()); @@ -1104,15 +1104,15 @@ Foam::autoPtr Foam::fvMeshDistribute::doRemoveCells // Save internal fields (note: not as DimensionedFields since would // get mapped) - PtrList > sFlds; + PtrList> sFlds; saveInternalFields(sFlds); - PtrList > vFlds; + PtrList> vFlds; saveInternalFields(vFlds); - PtrList > sptFlds; + PtrList> sptFlds; saveInternalFields(sptFlds); - PtrList > sytFlds; + PtrList> sytFlds; saveInternalFields(sytFlds); - PtrList > tFlds; + PtrList> tFlds; saveInternalFields(tFlds); // Change the mesh. No inflation. Note: no parallel comms allowed. diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H index dcaeac3110..2effcbcaa6 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -129,7 +129,7 @@ class fvMeshDistribute template void saveInternalFields ( - PtrList >& iflds + PtrList>& iflds ) const; //- Set value of patch faces resulting from internal faces @@ -137,7 +137,7 @@ class fvMeshDistribute void mapExposedFaces ( const mapPolyMesh& map, - const PtrList >& oldFlds + const PtrList>& oldFlds ); //- Init patch fields of certain type diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C index f4d0f59946..6864a222b5 100644 --- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C +++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -147,7 +147,7 @@ void Foam::fvMeshDistribute::mapBoundaryFields template void Foam::fvMeshDistribute::saveInternalFields ( - PtrList >& iflds + PtrList>& iflds ) const { typedef GeometricField fldType; @@ -177,7 +177,7 @@ template void Foam::fvMeshDistribute::mapExposedFaces ( const mapPolyMesh& map, - const PtrList >& oldFlds + const PtrList>& oldFlds ) { const labelList& faceMap = map.faceMap(); diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H index a8b5c57673..03e09505be 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -306,7 +306,7 @@ public: //- Map dimensioned fields template - static tmp > + static tmp> interpolate ( const DimensionedField&, @@ -315,7 +315,7 @@ public: ); template - tmp > + tmp> interpolate ( const DimensionedField& diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index 50d2fddc63..81463a6559 100644 --- a/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -2,11 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | -<<<<<<< HEAD:src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation -======= \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation ->>>>>>> foundation:src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -510,7 +506,7 @@ tmp> fvMeshSubset::interpolate template -tmp > fvMeshSubset::interpolate +tmp> fvMeshSubset::interpolate ( const DimensionedField& df, const fvMesh& sMesh, @@ -518,7 +514,7 @@ tmp > fvMeshSubset::interpolate ) { // Create the complete field from the pieces - tmp > tresF + tmp> tresF ( new DimensionedField ( @@ -541,7 +537,7 @@ tmp > fvMeshSubset::interpolate template -tmp > fvMeshSubset::interpolate +tmp> fvMeshSubset::interpolate ( const DimensionedField& df ) const diff --git a/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C index b6fae65ba8..fc7d6e7c30 100644 --- a/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C +++ b/src/dynamicMesh/motionSolver/velocityDisplacement/velocityDisplacementMotionSolver.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -57,7 +57,7 @@ Foam::velocityDisplacementMotionSolver::pointDisplacementBoundaryTypes() const forAll(pmUbf, patchI) { - if (isA >(pmUbf[patchI])) + if (isA>(pmUbf[patchI])) { cmUbf[patchI] = fixedValuePointPatchField::typeName; } diff --git a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C index dff4699a72..d64b07aae5 100644 --- a/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C +++ b/src/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | Copyright (C) 2015 OpenCFD Ltd. + \\/ M anipulation | Copyright (C) 2015-2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -233,7 +233,7 @@ void Foam::extendedEdgeMesh::cut const pointField& points = this->points(); - List > edgeHits(edges.size()); + List> edgeHits(edges.size()); { pointField start(edges.size()); pointField end(edges.size()); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H index 06da982510..788eef034b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.H @@ -39,12 +39,7 @@ Description myPatch { type movingWallVelocity; -<<<<<<< HEAD - U U; - value uniform (0 0 0); // initial value -======= value uniform (0 0 0); // Initial value ->>>>>>> foundation } \endverbatim diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C index 6bd1d95bc5..b9d1d59127 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorFieldTemplates.C @@ -44,7 +44,7 @@ void Foam::pressurePIDControlInletVelocityFvPatchVectorField::faceZoneAverage const faceZone& zone = mesh.faceZones()[name]; area = 0; - average = pTraits::zero; + average = Type(Zero); forAll(zone, faceI) { diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 8416ac7f82..5c09bc9731 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -124,7 +124,7 @@ CrankNicolsonDdtScheme::ddt0_ name, startTimeName, mesh() - ).template typeHeaderOk >(true) + ).template typeHeaderOk>(true) ) { regIOobject::store diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H index 58f31d20a0..969d086001 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H +++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H @@ -54,7 +54,7 @@ namespace fvc ( const GeometricField&, const CombineOp& cop, - const Type& nullValue = pTraits::zero + const Type& nullValue = Type(Zero) ); template @@ -62,7 +62,7 @@ namespace fvc ( const tmp>&, const CombineOp& cop, - const Type& nullValue = pTraits::zero + const Type& nullValue = Type(Zero) ); } diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C index 9a9404769e..0f95e18a8f 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -186,7 +186,7 @@ void Foam::volPointInterpolation::interpolateDimensionedInternalField { const labelList& ppc = pointCells[pointi]; - pf[pointi] = pTraits::zero; + pf[pointi] = Type(Zero); forAll(ppc, pointCelli) { @@ -382,10 +382,10 @@ Foam::volPointInterpolation::interpolate ) ); - interpolateInternalField(vf, tpf()); + interpolateInternalField(vf, tpf.ref()); // Interpolate to the patches overriding fixed value BCs - interpolateBoundaryField(vf, tpf(), true); + interpolateBoundaryField(vf, tpf.ref(), true); return tpf; } @@ -518,8 +518,8 @@ Foam::volPointInterpolation::interpolate template -tmp > -volPointInterpolation::interpolate +Foam::tmp> +Foam::volPointInterpolation::interpolate ( const DimensionedField& vf, const word& name, @@ -550,7 +550,7 @@ volPointInterpolation::interpolate } - tmp > tpf + tmp> tpf ( new DimensionedField ( @@ -565,7 +565,7 @@ volPointInterpolation::interpolate ) ); - interpolateDimensionedInternalField(vf, tpf()); + interpolateDimensionedInternalField(vf, tpf.ref()); return tpf; } @@ -603,8 +603,8 @@ volPointInterpolation::interpolate template -tmp > -volPointInterpolation::interpolate +Foam::tmp> +Foam::volPointInterpolation::interpolate ( const DimensionedField& vf ) const @@ -614,21 +614,17 @@ volPointInterpolation::interpolate template -tmp > -volPointInterpolation::interpolate +Foam::tmp> +Foam::volPointInterpolation::interpolate ( - const tmp >& tvf + const tmp>& tvf ) const { // Construct tmp - tmp > tpf = interpolate(tvf()); + tmp> tpf = interpolate(tvf.ref()); tvf.clear(); return tpf; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H index dd924fe95e..823d389e93 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H @@ -3,7 +3,7 @@ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -190,7 +190,7 @@ public: //- Interpolate dimensionedField using inverse distance weighting // returning pointField template - tmp > interpolate + tmp> interpolate ( const DimensionedField& ) const; @@ -198,9 +198,9 @@ public: //- Interpolate tmp using inverse distance // weighting returning pointField template - tmp > interpolate + tmp> interpolate ( - const tmp >& + const tmp>& ) const; @@ -264,7 +264,7 @@ public: //- Interpolate dimensionedField using inverse distance weighting // returning pointField with name. Optionally caches template - tmp > interpolate + tmp> interpolate ( const DimensionedField&, const word& name, diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C index a8e2a8e9ca..e0ff309339 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C @@ -52,7 +52,7 @@ namespace Foam ); template<> - const word GlobalIOList >::typeName + const word GlobalIOList>::typeName ( "scalarVectorTable" ); @@ -91,7 +91,7 @@ void Foam::displacementInterpolationMotionSolver::calcInterpolation() const word& tableName = faceZoneToTable[i][1]; - GlobalIOList > table + GlobalIOList> table ( IOobject ( diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C index 3593db771f..165ba536b8 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/surfaceAlignedSBRStress/surfaceAlignedSBRStressFvMotionSolver.C @@ -97,7 +97,7 @@ surfaceAlignedSBRStressFvMotionSolver ), minSigmaDiff_(coeffDict().lookupOrDefault("minSigmaDiff", 1e-4)) { - forAll (surfaceNames_, i) + forAll(surfaceNames_, i) { surfaceMesh_.set ( @@ -146,7 +146,7 @@ void Foam::surfaceAlignedSBRStressFvMotionSolver::calculateCellRot() DynamicList