Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

src/finiteVolume/fvMesh/fvMesh.H

@@ -409,7 +409,6 @@ fvMesh::validComponents<sphericalTensor>() const;
 
 #ifdef NoRepository
     #include "fvMeshTemplates.C"
-    #include "fvPatchFvMeshTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -90,6 +90,12 @@ Foam::wordList Foam::fvPatch::constraintTypes()
 }
 
 
+const Foam::objectRegistry& Foam::fvPatch::db() const
+{
+    return boundaryMesh().mesh();
+}
+
+
 const Foam::labelUList& Foam::fvPatch::faceCells() const
 {
     return polyPatch_.faceCells();

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatch.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,6 +53,7 @@ namespace Foam
 {
 
 class fvBoundaryMesh;
+class objectRegistry;
 class surfaceInterpolation;
 
 /*---------------------------------------------------------------------------*\
@@ -182,6 +183,9 @@ public:
                 return boundaryMesh_;
             }
 
+            //- Return the local object registry
+            const objectRegistry& db() const;
+
             //- Slice list to patch
             template<class T>
             const typename List<T>::subList patchSlice(const List<T>& l) const
@@ -253,15 +257,10 @@ public:
 
             //- Lookup and return the patchField of the named field from the
             //  local objectRegistry.
-            //  N.B.  The dummy pointer arguments are used if this function is
-            //  instantiated within a templated function to avoid a bug in gcc.
-            //  See inletOutletFvPatchField.C and outletInletFvPatchField.C
             template<class GeometricField, class Type>
             const typename GeometricField::Patch& lookupPatchField
             (
-                const word& name,
-                const GeometricField* = nullptr,
-                const Type* = nullptr
+                const word& name
             ) const;
 
 

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchFvMeshTemplates.C

@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvPatch.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class GeometricField, class Type>
-const typename GeometricField::Patch& Foam::fvPatch::lookupPatchField
-(
-    const word& name,
-    const GeometricField*,
-    const Type*
-) const
-{
-    return patchField<GeometricField, Type>
-    (
-        boundaryMesh().mesh().objectRegistry::template
-            lookupObject<GeometricField>(name)
-    );
-}
-
-
-// ************************************************************************* //

src/finiteVolume/fvMesh/fvPatches/fvPatch/fvPatchTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fvPatch.H"
+#include "objectRegistry.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -85,4 +86,17 @@ typename GeometricField::Patch& Foam::fvPatch::patchField
 }
 
 
+template<class GeometricField, class Type>
+const typename GeometricField::Patch& Foam::fvPatch::lookupPatchField
+(
+    const word& name
+) const
+{
+    return patchField<GeometricField, Type>
+    (
+        db().template lookupObject<GeometricField>(name)
+    );
+}
+
+
 // ************************************************************************* //