Clean-up of default copy constructors for polyPatches - copy constructor needed

src/dynamicMesh/dynamicTopoFvMesh/coupledMesh/subMeshProcessorPolyPatch.H

@@ -84,9 +84,8 @@ public:
             const polyBoundaryMesh&
         );
 
-    // Destructor
+    //- Destructor
-
+    virtual ~subMeshProcessorPolyPatch();
-        virtual ~subMeshProcessorPolyPatch();
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/foam/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.C

@@ -221,6 +221,15 @@ Foam::coupledPolyPatch::coupledPolyPatch
 {}
 
 
+Foam::coupledPolyPatch::coupledPolyPatch
+(
+    const coupledPolyPatch& pp
+)
+:
+    polyPatch(pp)
+{}
+
+
 Foam::coupledPolyPatch::coupledPolyPatch
 (
     const coupledPolyPatch& pp,

src/foam/meshes/polyMesh/polyPatches/basic/coupled/coupledPolyPatch.H

@@ -131,6 +131,9 @@ public:
             const polyBoundaryMesh& bm
         );
 
+        //- Construct as copy
+        coupledPolyPatch(const coupledPolyPatch&);
+
         //- Construct as copy, resetting the boundary mesh
         coupledPolyPatch(const coupledPolyPatch&, const polyBoundaryMesh&);
 

src/foam/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C

@@ -69,10 +69,24 @@ Foam::genericPolyPatch::genericPolyPatch
 Foam::genericPolyPatch::genericPolyPatch
 (
     const genericPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    polyPatch(pp, bm),
+    polyPatch(pp, bm, index, newSize, newStart),
+    actualTypeName_(pp.actualTypeName_),
+    dict_(pp.dict_)
+{}
+
+
+Foam::genericPolyPatch::genericPolyPatch
+(
+    const genericPolyPatch& pp
+)
+:
+    polyPatch(pp),
     actualTypeName_(pp.actualTypeName_),
     dict_(pp.dict_)
 {}
@@ -81,13 +95,10 @@ Foam::genericPolyPatch::genericPolyPatch
 Foam::genericPolyPatch::genericPolyPatch
 (
     const genericPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    polyPatch(pp, bm, index, newSize, newStart),
+    polyPatch(pp, bm),
     actualTypeName_(pp.actualTypeName_),
     dict_(pp.dict_)
 {}

src/foam/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.H

@@ -87,13 +87,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        genericPolyPatch
-        (
-            const genericPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         genericPolyPatch
@@ -105,6 +98,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        genericPolyPatch(const genericPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        genericPolyPatch
+        (
+            const genericPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {
@@ -128,9 +131,8 @@ public:
         }
 
 
-    // Destructor
+    //- Destructor
-
+    ~genericPolyPatch();
-        ~genericPolyPatch();
 
 
     // Member functions

src/foam/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.C

@@ -897,10 +897,30 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 Foam::cyclicPolyPatch::cyclicPolyPatch
 (
     const cyclicPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPointsPtr_(NULL),
+    coupledEdgesPtr_(NULL),
+    featureCos_(pp.featureCos_),
+    transform_(pp.transform_),
+    rotationAxis_(pp.rotationAxis_),
+    rotationCentre_(pp.rotationCentre_),
+    rotationAngle_(pp.rotationAngle_),
+    separationVector_(pp.separationVector_)
+{}
+
+
+Foam::cyclicPolyPatch::cyclicPolyPatch
+(
+    const cyclicPolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
     coupledPointsPtr_(NULL),
     coupledEdgesPtr_(NULL),
     featureCos_(pp.featureCos_),
@@ -915,13 +935,10 @@ Foam::cyclicPolyPatch::cyclicPolyPatch
 Foam::cyclicPolyPatch::cyclicPolyPatch
 (
     const cyclicPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     coupledPointsPtr_(NULL),
     coupledEdgesPtr_(NULL),
     featureCos_(pp.featureCos_),

src/foam/meshes/polyMesh/polyPatches/constraint/cyclic/cyclicPolyPatch.H

@@ -232,9 +232,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        cyclicPolyPatch(const cyclicPolyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         cyclicPolyPatch
@@ -246,6 +243,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        cyclicPolyPatch(const cyclicPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        cyclicPolyPatch(const cyclicPolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.C

@@ -212,20 +212,6 @@ Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
 {}
 
 
-// Construct as copy, resetting the boundary mesh
-Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
-(
-    const cyclicGgiPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    ggiPolyPatch(pp, bm),
-    separationOffset_(pp.separationOffset_),
-    rotationAxis_(pp.rotationAxis_),
-    rotationAngle_(pp.rotationAngle_)
-{}
-
-
 // Construct as copy, resetting the face list and boundary mesh data
 Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
 (
@@ -243,6 +229,33 @@ Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
 {}
 
 
+// Construct as copy, resetting the boundary mesh
+Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
+(
+    const cyclicGgiPolyPatch& pp
+)
+:
+    ggiPolyPatch(pp),
+    separationOffset_(pp.separationOffset_),
+    rotationAxis_(pp.rotationAxis_),
+    rotationAngle_(pp.rotationAngle_)
+{}
+
+
+// Construct as copy, resetting the boundary mesh
+Foam::cyclicGgiPolyPatch::cyclicGgiPolyPatch
+(
+    const cyclicGgiPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    ggiPolyPatch(pp, bm),
+    separationOffset_(pp.separationOffset_),
+    rotationAxis_(pp.rotationAxis_),
+    rotationAngle_(pp.rotationAngle_)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::cyclicGgiPolyPatch::~cyclicGgiPolyPatch()

src/foam/meshes/polyMesh/polyPatches/constraint/cyclicGgi/cyclicGgiPolyPatch.H

@@ -123,13 +123,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        cyclicGgiPolyPatch
-        (
-            const cyclicGgiPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         cyclicGgiPolyPatch
@@ -141,6 +134,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        cyclicGgiPolyPatch(const cyclicGgiPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        cyclicGgiPolyPatch
+        (
+            const cyclicGgiPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.C

@@ -63,16 +63,6 @@ Foam::emptyPolyPatch::emptyPolyPatch
 {}
 
 
-Foam::emptyPolyPatch::emptyPolyPatch
-(
-    const emptyPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    polyPatch(pp, bm)
-{}
-
-
 Foam::emptyPolyPatch::emptyPolyPatch
 (
     const emptyPolyPatch& pp,
@@ -86,4 +76,23 @@ Foam::emptyPolyPatch::emptyPolyPatch
 {}
 
 
+Foam::emptyPolyPatch::emptyPolyPatch
+(
+    const emptyPolyPatch& pp
+)
+:
+    polyPatch(pp)
+{}
+
+
+Foam::emptyPolyPatch::emptyPolyPatch
+(
+    const emptyPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm)
+{}
+
+
 // ************************************************************************* //

src/foam/meshes/polyMesh/polyPatches/constraint/empty/emptyPolyPatch.H

@@ -77,9 +77,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        emptyPolyPatch(const emptyPolyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         emptyPolyPatch
@@ -91,6 +88,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        emptyPolyPatch(const emptyPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        emptyPolyPatch(const emptyPolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.C

@@ -717,13 +717,40 @@ Foam::ggiPolyPatch::ggiPolyPatch
 }
 
 
+// Construct as copy, resetting the face list and boundary mesh data
 Foam::ggiPolyPatch::ggiPolyPatch
 (
     const ggiPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    shadowName_(pp.shadowName_),
+    zoneName_(pp.zoneName_),
+    bridgeOverlap_(pp.bridgeOverlap_),
+    reject_(pp.reject_),
+    shadowIndex_(-1),
+    zoneIndex_(-1),
+    patchToPatchPtr_(NULL),
+    zoneAddressingPtr_(NULL),
+    remoteZoneAddressingPtr_(NULL),
+    reconFaceCellCentresPtr_(NULL),
+    localParallelPtr_(NULL),
+    comm_(pp.comm_),
+    tag_(pp.tag_),
+    mapPtr_(NULL)
+{}
+
+
+Foam::ggiPolyPatch::ggiPolyPatch
+(
+    const ggiPolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     bridgeOverlap_(pp.bridgeOverlap_),
@@ -741,17 +768,13 @@ Foam::ggiPolyPatch::ggiPolyPatch
 {}
 
 
-//- Construct as copy, resetting the face list and boundary mesh data
 Foam::ggiPolyPatch::ggiPolyPatch
 (
     const ggiPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     bridgeOverlap_(pp.bridgeOverlap_),

src/foam/meshes/polyMesh/polyPatches/constraint/ggi/ggiPolyPatch.H

@@ -229,13 +229,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        ggiPolyPatch
-        (
-            const ggiPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         ggiPolyPatch
@@ -247,6 +240,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        ggiPolyPatch(const ggiPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        ggiPolyPatch
+        (
+            const ggiPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/mixingPlane/mixingPlanePolyPatch.C

@@ -605,13 +605,39 @@ Foam::mixingPlanePolyPatch::mixingPlanePolyPatch
 }
 
 
+// Construct as copy, resetting the face list and boundary mesh data
 Foam::mixingPlanePolyPatch::mixingPlanePolyPatch
 (
     const mixingPlanePolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    shadowName_(pp.shadowName_),
+    zoneName_(pp.zoneName_),
+    csPtr_(pp.csPtr_->clone()),
+    discretisationType_(pp.discretisationType_),
+    sweepAxisType_(pp.sweepAxisType_),
+    stackAxisType_(pp.stackAxisType_),
+    userProfileFile_(pp.userProfileFile_),
+    shadowIndex_(-1),
+    patchToPatchPtr_(NULL),
+    zoneAddressingPtr_(NULL),
+    reconFaceCellCentresPtr_(NULL),
+    localParallelPtr_(NULL),
+    receiveAddrPtr_(NULL)
+{}
+
+
+Foam::mixingPlanePolyPatch::mixingPlanePolyPatch
+(
+    const mixingPlanePolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     csPtr_(pp.csPtr_->clone()),
@@ -628,17 +654,13 @@ Foam::mixingPlanePolyPatch::mixingPlanePolyPatch
 {}
 
 
-//- Construct as copy, resetting the face list and boundary mesh data
 Foam::mixingPlanePolyPatch::mixingPlanePolyPatch
 (
     const mixingPlanePolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     csPtr_(pp.csPtr_->clone()),

src/foam/meshes/polyMesh/polyPatches/constraint/mixingPlane/mixingPlanePolyPatch.H

@@ -230,13 +230,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        mixingPlanePolyPatch
-        (
-            const mixingPlanePolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         mixingPlanePolyPatch
@@ -248,6 +241,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        mixingPlanePolyPatch(const mixingPlanePolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        mixingPlanePolyPatch
+        (
+            const mixingPlanePolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatch.C

@@ -210,14 +210,17 @@ Foam::overlapGgiPolyPatch::overlapGgiPolyPatch
 {}
 
 
-//- Construct as copy, resetting the boundary mesh
+// Construct as copy, resetting the face list and boundary mesh data
 Foam::overlapGgiPolyPatch::overlapGgiPolyPatch
 (
     const overlapGgiPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     shadowIndex_(-1),
@@ -232,17 +235,35 @@ Foam::overlapGgiPolyPatch::overlapGgiPolyPatch
 {}
 
 
-//- Construct as copy, resetting the face list and boundary mesh data
+// Construct as copy, resetting the boundary mesh
+Foam::overlapGgiPolyPatch::overlapGgiPolyPatch
+(
+    const overlapGgiPolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
+    shadowName_(pp.shadowName_),
+    zoneName_(pp.zoneName_),
+    shadowIndex_(-1),
+    zoneIndex_(-1),
+    rotationAxis_(pp.rotationAxis_),
+    nCopies_(pp.nCopies_),
+    expandedMasterPtr_(NULL),
+    expandedSlavePtr_(NULL),
+    patchToPatchPtr_(NULL),
+    localParallelPtr_(NULL),
+    reconFaceCellCentresPtr_(NULL)
+{}
+
+
+//- Construct as copy, resetting the boundary mesh
 Foam::overlapGgiPolyPatch::overlapGgiPolyPatch
 (
     const overlapGgiPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     shadowName_(pp.shadowName_),
     zoneName_(pp.zoneName_),
     shadowIndex_(-1),

src/foam/meshes/polyMesh/polyPatches/constraint/overlapGgi/overlapGgiPolyPatch.H

@@ -217,13 +217,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        overlapGgiPolyPatch
-        (
-            const overlapGgiPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         overlapGgiPolyPatch
@@ -235,6 +228,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        overlapGgiPolyPatch(const overlapGgiPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        overlapGgiPolyPatch
+        (
+            const overlapGgiPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.C

@@ -90,10 +90,29 @@ Foam::processorPolyPatch::processorPolyPatch
 Foam::processorPolyPatch::processorPolyPatch
 (
     const processorPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    myProcNo_(pp.myProcNo_),
+    neighbProcNo_(pp.neighbProcNo_),
+    neighbFaceCentres_(),
+    neighbFaceAreas_(),
+    neighbFaceCellCentres_(),
+    neighbPointsPtr_(NULL),
+    neighbEdgesPtr_(NULL)
+{}
+
+
+Foam::processorPolyPatch::processorPolyPatch
+(
+    const processorPolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
     myProcNo_(pp.myProcNo_),
     neighbProcNo_(pp.neighbProcNo_),
     neighbFaceCentres_(),
@@ -107,13 +126,10 @@ Foam::processorPolyPatch::processorPolyPatch
 Foam::processorPolyPatch::processorPolyPatch
 (
     const processorPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     myProcNo_(pp.myProcNo_),
     neighbProcNo_(pp.neighbProcNo_),
     neighbFaceCentres_(),

src/foam/meshes/polyMesh/polyPatches/constraint/processor/processorPolyPatch.H

@@ -145,9 +145,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        processorPolyPatch(const processorPolyPatch&, const polyBoundaryMesh&);
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         processorPolyPatch
@@ -159,6 +156,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        processorPolyPatch(const processorPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        processorPolyPatch(const processorPolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C

@@ -703,10 +703,38 @@ Foam::regionCouplePolyPatch::regionCouplePolyPatch
 Foam::regionCouplePolyPatch::regionCouplePolyPatch
 (
     const regionCouplePolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm),
+    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    shadowRegionName_(pp.shadowRegionName_),
+    shadowPatchName_(pp.shadowPatchName_),
+    zoneName_(pp.zoneName_),
+    attached_(pp.attached_),
+    master_(pp.master_),
+    isWall_(pp.isWall_),
+    bridgeOverlap_(pp.bridgeOverlap_),
+    reject_(pp.reject_),
+    shadowIndex_(-1),
+    zoneIndex_(-1),
+    patchToPatchPtr_(NULL),
+    zoneAddressingPtr_(NULL),
+    remoteZoneAddressingPtr_(NULL),
+    reconFaceCellCentresPtr_(NULL),
+    localParallelPtr_(NULL),
+    mapPtr_(NULL)
+{}
+
+
+Foam::regionCouplePolyPatch::regionCouplePolyPatch
+(
+    const regionCouplePolyPatch& pp
+)
+:
+    coupledPolyPatch(pp),
     shadowRegionName_(pp.shadowRegionName_),
     shadowPatchName_(pp.shadowPatchName_),
     zoneName_(pp.zoneName_),
@@ -729,13 +757,10 @@ Foam::regionCouplePolyPatch::regionCouplePolyPatch
 Foam::regionCouplePolyPatch::regionCouplePolyPatch
 (
     const regionCouplePolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    coupledPolyPatch(pp, bm, index, newSize, newStart),
+    coupledPolyPatch(pp, bm),
     shadowRegionName_(pp.shadowRegionName_),
     shadowPatchName_(pp.shadowPatchName_),
     zoneName_(pp.zoneName_),

src/foam/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.H

@@ -243,13 +243,6 @@ public:
             const polyBoundaryMesh&
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        regionCouplePolyPatch
-        (
-            const regionCouplePolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct as given the original patch and resetting the
         //  face list and boundary mesh information
         regionCouplePolyPatch
@@ -261,6 +254,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy, resetting the boundary mesh
+        regionCouplePolyPatch(const regionCouplePolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        regionCouplePolyPatch
+        (
+            const regionCouplePolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.C

@@ -63,16 +63,6 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
 {}
 
 
-Foam::symmetryPolyPatch::symmetryPolyPatch
-(
-    const symmetryPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    polyPatch(pp, bm)
-{}
-
-
 Foam::symmetryPolyPatch::symmetryPolyPatch
 (
     const symmetryPolyPatch& pp,
@@ -86,4 +76,23 @@ Foam::symmetryPolyPatch::symmetryPolyPatch
 {}
 
 
+Foam::symmetryPolyPatch::symmetryPolyPatch
+(
+    const symmetryPolyPatch& pp
+)
+:
+    polyPatch(pp)
+{}
+
+
+Foam::symmetryPolyPatch::symmetryPolyPatch
+(
+    const symmetryPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm)
+{}
+
+
 // ************************************************************************* //

src/foam/meshes/polyMesh/polyPatches/constraint/symmetry/symmetryPolyPatch.H

@@ -77,9 +77,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        symmetryPolyPatch(const symmetryPolyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         symmetryPolyPatch
@@ -91,6 +88,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        symmetryPolyPatch(const symmetryPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        symmetryPolyPatch(const symmetryPolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C

@@ -134,18 +134,6 @@ Foam::wedgePolyPatch::wedgePolyPatch
 }
 
 
-Foam::wedgePolyPatch::wedgePolyPatch
-(
-    const wedgePolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    polyPatch(pp, bm)
-{
-    initTransforms();
-}
-
-
 Foam::wedgePolyPatch::wedgePolyPatch
 (
     const wedgePolyPatch& pp,
@@ -161,4 +149,27 @@ Foam::wedgePolyPatch::wedgePolyPatch
 }
 
 
+Foam::wedgePolyPatch::wedgePolyPatch
+(
+    const wedgePolyPatch& pp
+)
+:
+    polyPatch(pp)
+{
+    initTransforms();
+}
+
+
+Foam::wedgePolyPatch::wedgePolyPatch
+(
+    const wedgePolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm)
+{
+    initTransforms();
+}
+
+
 // ************************************************************************* //

src/foam/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.H

@@ -98,9 +98,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        wedgePolyPatch(const wedgePolyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         wedgePolyPatch
@@ -112,6 +109,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        wedgePolyPatch(const wedgePolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        wedgePolyPatch(const wedgePolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.C

@@ -63,16 +63,6 @@ Foam::wallPolyPatch::wallPolyPatch
 {}
 
 
-Foam::wallPolyPatch::wallPolyPatch
-(
-    const wallPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    polyPatch(pp, bm)
-{}
-
-
 Foam::wallPolyPatch::wallPolyPatch
 (
     const wallPolyPatch& pp,
@@ -86,4 +76,23 @@ Foam::wallPolyPatch::wallPolyPatch
 {}
 
 
+Foam::wallPolyPatch::wallPolyPatch
+(
+    const wallPolyPatch& pp
+)
+:
+    polyPatch(pp)
+{}
+
+
+Foam::wallPolyPatch::wallPolyPatch
+(
+    const wallPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm)
+{}
+
+
 // ************************************************************************* //

src/foam/meshes/polyMesh/polyPatches/derived/wall/wallPolyPatch.H

@@ -77,9 +77,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        wallPolyPatch(const wallPolyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         wallPolyPatch
@@ -91,6 +88,12 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        wallPolyPatch(const wallPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        wallPolyPatch(const wallPolyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.C

@@ -347,30 +347,6 @@ Foam::polyPatch::polyPatch
 {}
 
 
-Foam::polyPatch::polyPatch
-(
-    const polyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    patchIdentifier(pp),
-    primitivePatch
-    (
-        faceSubList
-        (
-            bm.mesh().allFaces(),
-            pp.size(),
-            pp.start()
-        ),
-        bm.mesh().allPoints()
-    ),
-    start_(pp.start()),
-    boundaryMesh_(bm),
-    faceCellsPtr_(NULL),
-    mePtr_(NULL)
-{}
-
-
 Foam::polyPatch::polyPatch
 (
     const polyPatch& pp,
@@ -409,6 +385,30 @@ Foam::polyPatch::polyPatch(const polyPatch& p)
 {}
 
 
+Foam::polyPatch::polyPatch
+(
+    const polyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    patchIdentifier(pp),
+    primitivePatch
+    (
+        faceSubList
+        (
+            bm.mesh().allFaces(),
+            pp.size(),
+            pp.start()
+        ),
+        bm.mesh().allPoints()
+    ),
+    start_(pp.start()),
+    boundaryMesh_(bm),
+    faceCellsPtr_(NULL),
+    mePtr_(NULL)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::polyPatch::~polyPatch()

src/foam/meshes/polyMesh/polyPatches/polyPatch/polyPatch.H

@@ -288,9 +288,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        polyPatch(const polyPatch&, const polyBoundaryMesh&);
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         polyPatch
@@ -305,6 +302,9 @@ public:
         //- Construct as copy
         polyPatch(const polyPatch&);
 
+        //- Construct as copy, resetting the boundary mesh
+        polyPatch(const polyPatch&, const polyBoundaryMesh&);
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/immersedBoundary/immersedBoundary/immersedBoundaryPolyPatch/immersedBoundaryPolyPatch.C

@@ -1255,8 +1255,8 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
             name  + ".ftr",
             bm.mesh().time().constant(), // instance
             "triSurface",                // local
-            bm.mesh(),                   // registry
+            bm.mesh().parent(),          // registry
-            IOobject::MUST_READ,
+            IOobject::READ_IF_PRESENT,
             IOobject::NO_WRITE
         )
     ),
@@ -1300,7 +1300,7 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
             name  + ".ftr",
             bm.mesh().time().constant(), // instance
             "triSurface",                // local
-            bm.mesh(),                   // registry
+            bm.mesh().parent(),          // read from parent registry
             IOobject::MUST_READ,
             IOobject::NO_WRITE
         )
@@ -1327,6 +1327,7 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
     correctedIbPatchFaceAreasPtr_(NULL),
     oldIbPointsPtr_(NULL)
 {
+    Pout<< "READ CONSTRUCTOR" << endl;
     if (size() > 0)
     {
         FatalIOErrorIn
@@ -1350,10 +1351,13 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
 Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
 (
     const immersedBoundaryPolyPatch& pp,
-    const polyBoundaryMesh& bm
+    const polyBoundaryMesh& bm,
+    const label index,
+    const label newSize,
+    const label newStart
 )
 :
-    polyPatch(pp, bm),
+    polyPatch(pp, bm, index, newSize, newStart),
     ibMesh_
     (
         IOobject
@@ -1361,10 +1365,54 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
             pp.name() + ".ftr",
             bm.mesh().time().constant(), // instance
             "triSurface",                // local
-            bm.mesh(),                   // registry
+            bm.mesh().parent(),          // parent registry
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::NO_WRITE
-        )
+        ),
+        pp.ibMesh()   // Take ibMesh from pp
+    ),
+    internalFlow_(pp.internalFlow_),
+    isWall_(pp.isWall_),
+    movingIb_(false),
+    ibUpdateTimeIndex_(-1),
+    triSurfSearchPtr_(NULL),
+    ibPatchPtr_(NULL),
+    ibCellsPtr_(NULL),
+    ibCellCentresPtr_(NULL),
+    ibCellVolumesPtr_(NULL),
+    ibFacesPtr_(NULL),
+    ibFaceCentresPtr_(NULL),
+    ibFaceAreasPtr_(NULL),
+    nearestTriPtr_(NULL),
+    deadCellsPtr_(NULL),
+    deadFacesPtr_(NULL),
+    correctedCellCentresPtr_(NULL),
+    correctedFaceCentresPtr_(NULL),
+    correctedCellVolumesPtr_(NULL),
+    correctedFaceAreasPtr_(NULL),
+    correctedIbPatchFaceAreasPtr_(NULL),
+    oldIbPointsPtr_(NULL)
+{}
+
+
+Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
+(
+    const immersedBoundaryPolyPatch& pp
+)
+:
+    polyPatch(pp),
+    ibMesh_
+    (
+        IOobject
+        (
+            pp.name() + ".ftr",
+            pp.boundaryMesh().mesh().time().constant(), // instance
+            "triSurface",                               // local
+            pp.boundaryMesh().mesh().parent(),          // parent registry
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        pp.ibMesh()   // Take ibMesh from pp
     ),
     internalFlow_(pp.internalFlow_),
     isWall_(pp.isWall_),
@@ -1393,13 +1441,10 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
 Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
 (
     const immersedBoundaryPolyPatch& pp,
-    const polyBoundaryMesh& bm,
+    const polyBoundaryMesh& bm
-    const label index,
-    const label newSize,
-    const label newStart
 )
 :
-    polyPatch(pp, bm, index, newSize, newStart),
+    polyPatch(pp, bm),
     ibMesh_
     (
         IOobject
@@ -1407,10 +1452,11 @@ Foam::immersedBoundaryPolyPatch::immersedBoundaryPolyPatch
             pp.name() + ".ftr",
             bm.mesh().time().constant(), // instance
             "triSurface",                // local
-            bm.mesh(),                   // registry
+            bm.mesh().parent(),          // parent registry
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::NO_WRITE
-        )
+        ),
+        pp.ibMesh()   // Take ibMesh from pp
     ),
     internalFlow_(pp.internalFlow_),
     isWall_(pp.isWall_),

src/immersedBoundary/immersedBoundary/immersedBoundaryPolyPatch/immersedBoundaryPolyPatch.H

@@ -209,13 +209,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        immersedBoundaryPolyPatch
-        (
-            const immersedBoundaryPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         immersedBoundaryPolyPatch
@@ -227,6 +220,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        immersedBoundaryPolyPatch(const immersedBoundaryPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        immersedBoundaryPolyPatch
+        (
+            const immersedBoundaryPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.C

@@ -120,17 +120,6 @@ Foam::directMappedPolyPatch::directMappedPolyPatch
 {}
 
 
-Foam::directMappedPolyPatch::directMappedPolyPatch
-(
-    const directMappedPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    polyPatch(pp, bm),
-    directMappedPatchBase(*this, pp)
-{}
-
-
 Foam::directMappedPolyPatch::directMappedPolyPatch
 (
     const directMappedPolyPatch& pp,
@@ -145,6 +134,27 @@ Foam::directMappedPolyPatch::directMappedPolyPatch
 {}
 
 
+Foam::directMappedPolyPatch::directMappedPolyPatch
+(
+    const directMappedPolyPatch& pp
+)
+:
+    polyPatch(pp),
+    directMappedPatchBase(*this, pp)
+{}
+
+
+Foam::directMappedPolyPatch::directMappedPolyPatch
+(
+    const directMappedPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    polyPatch(pp, bm),
+    directMappedPatchBase(*this, pp)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::directMappedPolyPatch::~directMappedPolyPatch()

src/meshTools/directMapped/directMappedPolyPatch/directMappedPolyPatch.H

@@ -137,13 +137,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        directMappedPolyPatch
-        (
-            const directMappedPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         directMappedPolyPatch
@@ -155,6 +148,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        directMappedPolyPatch(const directMappedPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        directMappedPolyPatch
+        (
+            const directMappedPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {

src/overset/oversetMesh/oversetPolyPatch/oversetPolyPatch.C

@@ -45,9 +45,6 @@ namespace Foam
 }
 
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::oversetPolyPatch::initAddressing()
@@ -132,16 +129,6 @@ Foam::oversetPolyPatch::oversetPolyPatch
 {}
 
 
-Foam::oversetPolyPatch::oversetPolyPatch
-(
-    const oversetPolyPatch& pp,
-    const polyBoundaryMesh& bm
-)
-:
-    coupledPolyPatch(pp, bm)
-{}
-
-
 Foam::oversetPolyPatch::oversetPolyPatch
 (
     const oversetPolyPatch& pp,
@@ -155,6 +142,25 @@ Foam::oversetPolyPatch::oversetPolyPatch
 {}
 
 
+Foam::oversetPolyPatch::oversetPolyPatch
+(
+    const oversetPolyPatch& pp
+)
+:
+    coupledPolyPatch(pp)
+{}
+
+
+Foam::oversetPolyPatch::oversetPolyPatch
+(
+    const oversetPolyPatch& pp,
+    const polyBoundaryMesh& bm
+)
+:
+    coupledPolyPatch(pp, bm)
+{}
+
+
 // * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * * //
 
 Foam::oversetPolyPatch::~oversetPolyPatch()

src/overset/oversetMesh/oversetPolyPatch/oversetPolyPatch.H

@@ -110,13 +110,6 @@ public:
             const polyBoundaryMesh& bm
         );
 
-        //- Construct as copy, resetting the boundary mesh
-        oversetPolyPatch
-        (
-            const oversetPolyPatch&,
-            const polyBoundaryMesh&
-        );
-
         //- Construct given the original patch and resetting the
         //  face list and boundary mesh information
         oversetPolyPatch
@@ -128,6 +121,16 @@ public:
             const label newStart
         );
 
+        //- Construct as copy
+        oversetPolyPatch(const oversetPolyPatch&);
+
+        //- Construct as copy, resetting the boundary mesh
+        oversetPolyPatch
+        (
+            const oversetPolyPatch&,
+            const polyBoundaryMesh&
+        );
+
         //- Construct and return a clone, resetting the boundary mesh
         virtual autoPtr<polyPatch> clone(const polyBoundaryMesh& bm) const
         {