Merge commit 'OpenCFD/master' into olesenm

applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.C

@@ -395,7 +395,7 @@ Foam::laminarFlameSpeedModels::SCOPE::Ma() const
                 (
                     "Ma",
                     mesh.time().timeName(),
-                    mesh.db(),
+                    mesh,
                     IOobject::NO_READ,
                     IOobject::NO_WRITE
                 ),

applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C

@@ -613,7 +613,7 @@ autoPtr<mapPolyMesh> createRegionMesh
             "fvSchemes",
             mesh.time().system(),
             regionName,
-            mesh.db(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false
@@ -642,7 +642,7 @@ autoPtr<mapPolyMesh> createRegionMesh
             "fvSolution",
             mesh.time().system(),
             regionName,
-            mesh.db(),
+            mesh,
             IOobject::NO_READ,
             IOobject::NO_WRITE,
             false

src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H

@@ -192,9 +192,14 @@ public:
         //- Assignment of all addressed entries to the given value
         inline void operator=(const T&);
 
-        //- Assignment from List<T>. Also handles assignment from DynamicList.
+        //- Assignment from DynamicList
-        inline void operator=(const UList<T>&);
+        inline void operator=
+        (
+            const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+        );
 
+        //- Assignment from List<T>.
+        inline void operator=(const UList<T>&);
 
     // IOstream operators
 

src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H

@@ -386,13 +386,36 @@ inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
 (
     const UList<T>& lst
 )
+{
+    if (capacity_ >= lst.size())
+    {
+        // can copy w/o reallocating, match initial size to avoid reallocation
+        List<T>::size(lst.size());
+        List<T>::operator=(lst);
+    }
+    else
+    {
+        // make everything available for the copy operation
+        List<T>::size(capacity_);
+
+        List<T>::operator=(lst);
+        capacity_ = List<T>::size();
+    }
+}
+
+
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+inline void Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator=
+(
+    const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
+)
 {
     if (this == &lst)
     {
         FatalErrorIn
         (
             "DynamicList<T, SizeInc, SizeMult, SizeDiv>::operator="
-            "(const UList<T>&)"
+            "(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&)"
         )   << "attempted assignment to self" << abort(FatalError);
     }
 

src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H

@@ -75,7 +75,7 @@ void MapGeometricFields
 {
     HashTable<const GeometricField<Type, PatchField, GeoMesh>*> fields
     (
-        mapper.db().objectRegistry::lookupClass
+        mapper.thisDb().objectRegistry::lookupClass
             <GeometricField<Type, PatchField, GeoMesh> >()
     );
 
@@ -145,7 +145,7 @@ void MapGeometricFields
                 );
             }
 
-            field.instance() = field.mesh().db().time().timeName();
+            field.instance() = field.time().timeName();
         }
         else if (polyMesh::debug)
         {

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C

@@ -97,7 +97,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 {
     if
     (
-        !mesh.db().objectRegistry::foundObject<GAMGAgglomeration>
+        !mesh.thisDb().foundObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         )
@@ -134,7 +134,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<GAMGAgglomeration>
+        return mesh.thisDb().lookupObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         );
@@ -152,7 +152,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
 
     if
     (
-        !mesh.db().objectRegistry::foundObject<GAMGAgglomeration>
+        !mesh.thisDb().foundObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         )
@@ -185,7 +185,7 @@ const Foam::GAMGAgglomeration& Foam::GAMGAgglomeration::New
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<GAMGAgglomeration>
+        return mesh.thisDb().lookupObject<GAMGAgglomeration>
         (
             GAMGAgglomeration::typeName
         );

src/OpenFOAM/meshes/GeoMesh/GeoMesh.H

@@ -76,7 +76,7 @@ public:
     // Member Functions
 
         //- Return the object registry
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_;
         }

src/OpenFOAM/meshes/MeshObject/MeshObject.C

@@ -37,8 +37,8 @@ Foam::MeshObject<Mesh, Type>::MeshObject(const Mesh& mesh)
         IOobject
         (
             Type::typeName,
-            mesh.db().instance(),
+            mesh.thisDb().instance(),
-            mesh.db()
+            mesh.thisDb()
         )
     ),
     mesh_(mesh)
@@ -53,13 +53,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Mesh& mesh
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -72,13 +72,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data1& d
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -92,13 +92,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data2& d2
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d1, d2));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -113,13 +113,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data3& d3
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d1, d2, d3));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -135,13 +135,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
     const Data4& d4
 )
 {
-    if (!mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (!mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
         return store(new Type(mesh, d3, d4));
     }
     else
     {
-        return mesh.db().objectRegistry::lookupObject<Type>(Type::typeName);
+        return mesh.thisDb().objectRegistry::lookupObject<Type>(Type::typeName);
     }
 }
 
@@ -151,13 +151,13 @@ const Type& Foam::MeshObject<Mesh, Type>::New
 template<class Mesh, class Type>
 bool Foam::MeshObject<Mesh, Type>::Delete(const Mesh& mesh)
 {
-    if (mesh.db().objectRegistry::foundObject<Type>(Type::typeName))
+    if (mesh.thisDb().objectRegistry::foundObject<Type>(Type::typeName))
     {
-        return mesh.db().objectRegistry::checkOut
+        return mesh.thisDb().checkOut
         (
             const_cast<Type&>
             (
-                mesh.db().objectRegistry::lookupObject<Type>
+                mesh.thisDb().objectRegistry::lookupObject<Type>
                 (
                     Type::typeName
                 )

src/OpenFOAM/meshes/lduMesh/lduMesh.C

@@ -36,9 +36,9 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::objectRegistry& Foam::lduMesh::db() const
+const Foam::objectRegistry& Foam::lduMesh::thisDb() const
 {
-    notImplemented("lduMesh::db() const");
+    notImplemented("lduMesh::thisDb() const");
     const objectRegistry* orPtr_ = NULL;
     return *orPtr_;
 }

src/OpenFOAM/meshes/lduMesh/lduMesh.H

@@ -71,7 +71,7 @@ public:
         // Access
 
             //- Return the object registry
-            virtual const objectRegistry& db() const;
+            virtual const objectRegistry& thisDb() const;
 
             //- Return ldu addressing
             virtual const lduAddressing& lduAddr() const = 0;

src/OpenFOAM/meshes/pointMesh/pointMesh.H

@@ -112,10 +112,10 @@ public:
             return GeoMesh<polyMesh>::mesh_.globalData();
         }
 
-        //- Return database (only needed for compilation purposes)
+        //- Return database. For now is its polyMesh.
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
-            return GeoMesh<polyMesh>::mesh_.db();
+            return GeoMesh<polyMesh>::mesh_.thisDb();
         }
 
 

src/OpenFOAM/meshes/pointMesh/pointMeshMapper/pointMeshMapper.H

@@ -100,7 +100,7 @@ public:
 
         //- Return reference to objectRegistry storing fields. Can be
         //  removed once fields stored on pointMesh.
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_();
         }

src/OpenFOAM/meshes/polyMesh/polyMesh.C

@@ -1042,17 +1042,11 @@ Foam::tmp<Foam::scalarField> Foam::polyMesh::movePoints
     // movePoints function.
 
     // pointMesh
-    if
+    if (thisDb().foundObject<pointMesh>(pointMesh::typeName))
-    (
-        db().objectRegistry::foundObject<pointMesh>
-        (
-            pointMesh::typeName
-        )
-    )
     {
         const_cast<pointMesh&>
         (
-            db().objectRegistry::lookupObject<pointMesh>
+            thisDb().lookupObject<pointMesh>
             (
                 pointMesh::typeName
             )
@@ -1094,7 +1088,7 @@ const Foam::globalMeshData& Foam::polyMesh::globalData() const
 // Remove all files and some subdirs (eg, sets)
 void Foam::polyMesh::removeFiles(const fileName& instanceDir) const
 {
-    fileName meshFilesPath = db().path()/instanceDir/meshDir();
+    fileName meshFilesPath = thisDb().path()/instanceDir/meshDir();
 
     rm(meshFilesPath/"points");
     rm(meshFilesPath/"faces");

src/OpenFOAM/meshes/polyMesh/polyMesh.H

@@ -343,6 +343,11 @@ public:
             //- Return parallel info
             const globalMeshData& globalData() const;
 
+            //- Return the object registry
+            const objectRegistry& thisDb() const
+            {
+                return *this;
+            }
 
         // Mesh motion
 

src/OpenFOAM/meshes/polyMesh/polyMeshUpdate.C

@@ -71,17 +71,11 @@ void Foam::polyMesh::updateMesh(const mapPolyMesh& mpm)
     // Hack until proper callbacks. Below are all the polyMesh-MeshObjects.
 
     // pointMesh
-    if
+    if (thisDb().foundObject<pointMesh>(pointMesh::typeName))
-    (
-        db().objectRegistry::foundObject<pointMesh>
-        (
-            pointMesh::typeName
-        )
-    )
     {
         const_cast<pointMesh&>
         (
-            db().objectRegistry::lookupObject<pointMesh>
+            thisDb().lookupObject<pointMesh>
             (
                 pointMesh::typeName
             )

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C

@@ -2889,12 +2889,12 @@ void Foam::autoLayerDriver::addLayers
                 //mesh.name()+"_layer",
                 mesh.name(),
                 static_cast<polyMesh&>(mesh).instance(),
-                mesh.db(),
+                mesh.time(),  // register with runTime
                 static_cast<polyMesh&>(mesh).readOpt(),
                 static_cast<polyMesh&>(mesh).writeOpt()
-            ),          // io params from original mesh but new name
+            ),              // io params from original mesh but new name
-            mesh,      // original mesh
+            mesh,           // original mesh
-            true        // parallel sync
+            true            // parallel sync
         );
         fvMesh& newMesh = newMeshPtr();
 

src/autoMesh/autoHexMesh/autoHexMeshDriver/autoRefineDriver.C

@@ -80,7 +80,7 @@ Foam::label Foam::autoRefineDriver::readFeatureEdges
                     featFileName,           // name
                     mesh.time().constant(), // directory
                     "triSurface",           // instance
-                    mesh.db(),              // registry
+                    mesh.time(),            // registry
                     IOobject::MUST_READ,
                     IOobject::NO_WRITE,
                     false

src/autoMesh/autoHexMesh/meshRefinement/meshRefinementProblemCells.C

@@ -443,7 +443,7 @@ Foam::labelList Foam::meshRefinement::markFacesOnProblemCells
     {
         const labelList& cPoints = mesh_.cellPoints(cellI, dynCPoints);
 
-        // Get number of anchor points (pointLevel == cellLevel)
+        // Get number of anchor points (pointLevel <= cellLevel)
 
         label nBoundaryAnchors = 0;
         label nNonAnchorBoundary = 0;

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C

@@ -56,8 +56,8 @@ Foam::SRF::SRFModel::SRFModel
         IOobject
         (
             "SRFProperties",
-            Urel.mesh().time().constant(),
+            Urel.time().constant(),
-            Urel.mesh().db(),
+            Urel.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )

src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/newSRFModel.C

@@ -53,8 +53,8 @@ autoPtr<SRFModel> SRFModel::New
             IOobject
             (
                 "SRFProperties",
-                Urel.mesh().time().constant(),
+                Urel.time().constant(),
-                Urel.mesh().db(),
+                Urel.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE
             )

src/finiteVolume/fvMesh/fvMesh.C

@@ -485,17 +485,11 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
 template<class Type>
 void MeshObjectMovePoints(const Foam::fvMesh& mesh)
 {
-    if
+    if (mesh.thisDb().foundObject<Type>(Type::typeName))
-    (
-        mesh.db().objectRegistry::foundObject<Type>
-        (
-            Type::typeName
-        )
-    )
     {
         const_cast<Type&>
         (
-            mesh.db().objectRegistry::lookupObject<Type>
+            mesh.thisDb().lookupObject<Type>
             (
                 Type::typeName
             )

src/finiteVolume/fvMesh/fvMesh.H

@@ -221,10 +221,10 @@ public:
                 return polyMesh::time();
             }
 
-            //- Return the object registry
+            //- Return the object registry - resolve conflict polyMesh/lduMesh
-            virtual const objectRegistry& db() const
+            virtual const objectRegistry& thisDb() const
             {
-                return *this;
+                return polyMesh::thisDb();
             }
 
             //- Return reference to name

src/finiteVolume/fvMesh/fvMeshMapper/fvMeshMapper.H

@@ -108,7 +108,7 @@ public:
 
         //- Return reference to objectRegistry storing fields. Can be
         //  removed once fields stored on pointMesh.
-        const objectRegistry& db() const
+        const objectRegistry& thisDb() const
         {
             return mesh_;
         }

src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.H

@@ -335,7 +335,6 @@ public:
             (
                 const GeometricField<Type, pointPatchField, pointMesh>&,
                 const pointMesh& sMesh,
-                const objectRegistry& reg,
                 const labelList& patchMap,
                 const labelList& pointMap
             );

src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C

@@ -299,7 +299,6 @@ fvMeshSubset::interpolate
 (
     const GeometricField<Type, pointPatchField, pointMesh>& vf,
     const pointMesh& sMesh,
-    const objectRegistry& reg,
     const labelList& patchMap,
     const labelList& pointMap
 )
@@ -385,7 +384,7 @@ fvMeshSubset::interpolate
             (
                 "subset"+vf.name(),
                 vf.time().timeName(),
-                reg,
+                sMesh.thisDb(),
                 IOobject::NO_READ,
                 IOobject::NO_WRITE
             ),
@@ -410,7 +409,6 @@ tmp<GeometricField<Type, pointPatchField, pointMesh> > fvMeshSubset::interpolate
     (
         sf,
         pointMesh::New(subMesh()),     // subsetted point mesh
-        subMesh(),          // registry (pointfields are stored on the polyMesh)
         patchMap(),
         pointMap()
     );

src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C

@@ -128,7 +128,7 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pMesh.thisDb()
             ),
             pMesh,
             vf.dimensions(),
@@ -168,6 +168,8 @@ volPointInterpolation::interpolate
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
+    const pointMesh& pm = pointMesh::New(vf.mesh());
+
     tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf
     (
         new GeometricField<Type, pointPatchField, pointMesh>
@@ -176,9 +178,9 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pm.thisDb()
             ),
-            pointMesh::New(vf.mesh()),
+            pm,
             vf.dimensions()
         )
     );

src/sampling/Make/files

@@ -22,8 +22,8 @@ $(setWriters)/xmgrace/xmgraceSetWriterRunTime.C
 
 cuttingPlane/cuttingPlane.C
 
-sampledSurface/patch/sampledPatch.C
+sampledSurface/sampledPatch/sampledPatch.C
-sampledSurface/plane/sampledPlane.C
+sampledSurface/sampledPlane/sampledPlane.C
 sampledSurface/isoSurface/isoSurface.C
 sampledSurface/isoSurface/sampledIsoSurface.C
 sampledSurface/isoSurface/isoSurfaceCell.C

src/thermophysicalModels/radiation/radiationModel/radiationModel/newRadiationModel.C

@@ -52,8 +52,8 @@ autoPtr<radiationModel> radiationModel::New
             IOobject
             (
                 "radiationProperties",
-                T.mesh().time().constant(),
+                T.time().constant(),
-                T.mesh().db(),
+                T.db(),
                 IOobject::MUST_READ,
                 IOobject::NO_WRITE
             )

src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C

@@ -54,8 +54,8 @@ Foam::radiation::radiationModel::radiationModel
         IOobject
         (
             "radiationProperties",
-            T.mesh().time().constant(),
+            T.time().constant(),
-            T.mesh().db(),
+            T.db(),
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )

src/topoChangerFvMesh/movingConeTopoFvMesh/movingConeTopoFvMesh.C

@@ -343,7 +343,7 @@ bool Foam::movingConeTopoFvMesh::update()
             //    << endl;
 
             {
-                OFstream str(db().path()/"meshPoints.obj");
+                OFstream str(thisDb().path()/"meshPoints.obj");
                 Pout<< "Writing mesh with meshPoints to " << str.name()
                     << endl;
 
@@ -361,7 +361,7 @@ bool Foam::movingConeTopoFvMesh::update()
                 }
             }
             {
-                OFstream str(db().path()/"preMotionPoints.obj");
+                OFstream str(thisDb().path()/"preMotionPoints.obj");
                 Pout<< "Writing mesh with preMotionPoints to " << str.name()
                     << endl;