From 0302ba4418ba266e308fa4683d0ea06b0ba9071d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 14 Sep 2022 14:57:53 +0200
Subject: [PATCH] ENH: construct fa::options from fvMesh instead of fvPatch

- these were previously constructing from an fvPatch (for simpler
  integration with regionFaModel) but this unnecessarily restricts
  the finiteArea to a single volume patch.

- adjusted derived faOptions to support multiple patches
---
 .../corrections/limitVelocity/limitVelocity.C |  4 +-
 .../corrections/limitVelocity/limitVelocity.H |  4 +-
 src/faOptions/faOption/faOption.C             | 13 ++--
 src/faOptions/faOption/faOption.H             | 30 ++++-----
 src/faOptions/faOption/faOptionI.H            |  6 --
 src/faOptions/faOption/faOptionList.C         | 13 ++--
 src/faOptions/faOption/faOptionList.H         | 13 ++--
 src/faOptions/faOption/faOptions.C            | 14 ++---
 src/faOptions/faOption/faOptions.H            | 10 +--
 src/faOptions/faceSetOption/faceSetOption.C   |  4 +-
 src/faOptions/faceSetOption/faceSetOption.H   |  2 +-
 .../contactHeatFluxSource.C                   | 62 +++++++++++++++----
 .../contactHeatFluxSource.H                   | 56 +++++++++--------
 .../externalFileSource/externalFileSource.C   | 59 +++++++++++++-----
 .../externalFileSource/externalFileSource.H   |  4 +-
 .../externalHeatFluxSource.C                  |  4 +-
 .../externalHeatFluxSource.H                  |  2 +-
 .../jouleHeatingSource/jouleHeatingSource.C   |  4 +-
 .../jouleHeatingSource/jouleHeatingSource.H   |  8 +--
 .../liquidFilm/liquidFilmBase.C               |  4 +-
 .../thermalShellModel/thermalShellModel.C     |  4 +-
 .../vibrationShellModel/vibrationShellModel.C |  4 +-
 22 files changed, 189 insertions(+), 135 deletions(-)

diff --git a/src/faOptions/corrections/limitVelocity/limitVelocity.C b/src/faOptions/corrections/limitVelocity/limitVelocity.C
index 186205ce64..e9c686e127 100644
--- a/src/faOptions/corrections/limitVelocity/limitVelocity.C
+++ b/src/faOptions/corrections/limitVelocity/limitVelocity.C
@@ -52,10 +52,10 @@ Foam::fa::limitVelocity::limitVelocity
     const word& name,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& mesh
 )
 :
-    faceSetOption(name, modelType, dict, patch),
+    faceSetOption(name, modelType, dict, mesh),
     UName_(coeffs_.getOrDefault<word>("U", "U")),
     max_(coeffs_.get<scalar>("max"))
 {
diff --git a/src/faOptions/corrections/limitVelocity/limitVelocity.H b/src/faOptions/corrections/limitVelocity/limitVelocity.H
index c4abb1c8d5..c00df0b607 100644
--- a/src/faOptions/corrections/limitVelocity/limitVelocity.H
+++ b/src/faOptions/corrections/limitVelocity/limitVelocity.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -110,7 +110,7 @@ public:
             const word& name,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- No copy construct
diff --git a/src/faOptions/faOption/faOption.C b/src/faOptions/faOption/faOption.C
index e95fd30c44..079c1db011 100644
--- a/src/faOptions/faOption/faOption.C
+++ b/src/faOptions/faOption/faOption.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,13 +56,12 @@ Foam::fa::option::option
     const word& name,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& mesh
 )
 :
     name_(name),
     modelType_(modelType),
-    mesh_(patch.boundaryMesh().mesh()),
-    patch_(patch),
+    mesh_(mesh),
     dict_(dict),
     coeffs_(dict.optionalSubDict(modelType + "Coeffs")),
     fieldNames_(),
@@ -83,7 +82,7 @@ Foam::autoPtr<Foam::fa::option> Foam::fa::option::New
 (
     const word& name,
     const dictionary& coeffs,
-    const fvPatch& patch
+    const fvMesh& mesh
 )
 {
     const word modelType(coeffs.get<word>("type"));
@@ -91,7 +90,7 @@ Foam::autoPtr<Foam::fa::option> Foam::fa::option::New
     Info<< indent
         << "Selecting finite area options type " << modelType << endl;
 
-    patch.boundaryMesh().mesh().time().libs().open
+    mesh.time().libs().open
     (
         coeffs,
         "libs",
@@ -111,7 +110,7 @@ Foam::autoPtr<Foam::fa::option> Foam::fa::option::New
         ) << exit(FatalIOError);
     }
 
-    return autoPtr<fa::option>(ctorPtr(name, modelType, coeffs, patch));
+    return autoPtr<fa::option>(ctorPtr(name, modelType, coeffs, mesh));
 }
 
 
diff --git a/src/faOptions/faOption/faOption.H b/src/faOptions/faOption/faOption.H
index 8e55e5c29a..40ab0a3e80 100644
--- a/src/faOptions/faOption/faOption.H
+++ b/src/faOptions/faOption/faOption.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -72,8 +72,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Foam_faOption_H
-#define Foam_faOption_H
+#ifndef Foam_fa_option_H
+#define Foam_fa_option_H
 
 #include "faMatricesFwd.H"
 #include "areaFieldsFwd.H"
@@ -114,9 +114,6 @@ protected:
         //- Reference to the mesh database
         const fvMesh& mesh_;
 
-        //- Reference to the patch
-        const fvPatch& patch_;
-
         //- Top level source dictionary
         dictionary dict_;
 
@@ -174,9 +171,9 @@ public:
                 const word& name,
                 const word& modelType,
                 const dictionary& dict,
-                const fvPatch& patch
+                const fvMesh& mesh
             ),
-            (name, modelType, dict, patch)
+            (name, modelType, dict, mesh)
         );
 
 
@@ -188,7 +185,7 @@ public:
             const word& name,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- Return clone
@@ -202,8 +199,8 @@ public:
         //- on the freestore from an Istream
         class iNew
         {
-            //- Reference to the patch
-            const fvPatch& patch_;
+            //- Reference to the mesh
+            const fvMesh& mesh_;
 
             //- Name
             const word& name_;
@@ -212,11 +209,11 @@ public:
 
             iNew
             (
-                const fvPatch& patch,
+                const fvMesh& mesh,
                 const word& name
             )
             :
-                patch_(patch),
+                mesh_(mesh),
                 name_(name)
             {}
 
@@ -226,7 +223,7 @@ public:
 
                 return autoPtr<option>
                 (
-                    option::New(name_, dict, patch_)
+                    option::New(name_, dict, mesh_)
                 );
             }
         };
@@ -239,7 +236,7 @@ public:
         (
             const word& name,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
 
@@ -257,9 +254,6 @@ public:
             //- Return const access to the mesh database
             inline const fvMesh& mesh() const noexcept;
 
-            //- Return const access to fvPatch
-            inline const fvPatch& patch() const noexcept;
-
             //- Return dictionary
             inline const dictionary& coeffs() const noexcept;
 
diff --git a/src/faOptions/faOption/faOptionI.H b/src/faOptions/faOption/faOptionI.H
index 42ef920af6..21d2255835 100644
--- a/src/faOptions/faOption/faOptionI.H
+++ b/src/faOptions/faOption/faOptionI.H
@@ -39,12 +39,6 @@ inline const Foam::fvMesh& Foam::fa::option::mesh() const noexcept
 }
 
 
-inline const Foam::fvPatch& Foam::fa::option::patch() const noexcept
-{
-    return patch_;
-}
-
-
 inline const Foam::dictionary& Foam::fa::option::coeffs() const noexcept
 {
     return coeffs_;
diff --git a/src/faOptions/faOption/faOptionList.C b/src/faOptions/faOption/faOptionList.C
index f49c5e2039..947479d746 100644
--- a/src/faOptions/faOption/faOptionList.C
+++ b/src/faOptions/faOption/faOptionList.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 ------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -79,18 +79,17 @@ void Foam::fa::optionList::checkApplied() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::fa::optionList::optionList(const fvPatch& p)
+Foam::fa::optionList::optionList(const fvMesh& mesh)
 :
     PtrList<fa::option>(),
-    mesh_(p.boundaryMesh().mesh()),
-    patch_(p),
+    mesh_(mesh),
     checkTimeIndex_(mesh_.time().startTimeIndex() + 2)
 {}
 
 
-Foam::fa::optionList::optionList(const fvPatch& p, const dictionary& dict)
+Foam::fa::optionList::optionList(const fvMesh& mesh, const dictionary& dict)
 :
-    Foam::fa::optionList(p)
+    Foam::fa::optionList(mesh)
 {
     reset(optionsDict(dict));
 }
@@ -123,7 +122,7 @@ void Foam::fa::optionList::reset(const dictionary& dict)
             this->set
             (
                 count++,
-                option::New(name, sourceDict, patch_)
+                option::New(name, sourceDict, mesh_)
             );
         }
     }
diff --git a/src/faOptions/faOption/faOptionList.H b/src/faOptions/faOption/faOptionList.H
index 22a3b04e33..f1ea39ebb7 100644
--- a/src/faOptions/faOption/faOptionList.H
+++ b/src/faOptions/faOption/faOptionList.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 ------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -76,9 +76,6 @@ protected:
         //- Reference to the mesh database
         const fvMesh& mesh_;
 
-        //- Reference to the patch
-        const fvPatch& patch_;
-
         //- Time index to check that all defined sources have been applied
         label checkTimeIndex_;
 
@@ -119,11 +116,11 @@ public:
 
     // Constructors
 
-        //- Default construct from patch
-        explicit optionList(const fvPatch& p);
+        //- Default construct from mesh
+        explicit optionList(const fvMesh& mesh);
 
-        //- Construct from patch and dictionary
-        optionList(const fvPatch& p, const dictionary&);
+        //- Construct from mesh and dictionary
+        optionList(const fvMesh& mesh, const dictionary& dict);
 
 
     //- Destructor
diff --git a/src/faOptions/faOption/faOptions.C b/src/faOptions/faOption/faOptions.C
index 7c2401be57..5c7835d31b 100644
--- a/src/faOptions/faOption/faOptions.C
+++ b/src/faOptions/faOption/faOptions.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 ------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -91,18 +91,16 @@ Foam::IOobject Foam::fa::options::createIOobject
 
 Foam::fa::options::options
 (
-    const fvPatch& p
+    const fvMesh& mesh
 )
 :
-    IOdictionary(createIOobject(p.boundaryMesh().mesh())),
-    optionList(p, *this)
+    IOdictionary(createIOobject(mesh)),
+    optionList(mesh, *this)
 {}
 
 
-Foam::fa::options& Foam::fa::options::New(const fvPatch& p)
+Foam::fa::options& Foam::fa::options::New(const fvMesh& mesh)
 {
-    const fvMesh& mesh = p.boundaryMesh().mesh();
-
     options* ptr = mesh.thisDb().getObjectPtr<options>(typeName);
 
     if (!ptr)
@@ -111,7 +109,7 @@ Foam::fa::options& Foam::fa::options::New(const fvPatch& p)
             << "Constructing " << typeName
             << " for region " << mesh.name() << endl;
 
-        ptr = new options(p);
+        ptr = new options(mesh);
         regIOobject::store(ptr);
     }
 
diff --git a/src/faOptions/faOption/faOptions.H b/src/faOptions/faOption/faOptions.H
index 165c340164..08ba3e0d9b 100644
--- a/src/faOptions/faOption/faOptions.H
+++ b/src/faOptions/faOption/faOptions.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 ------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fa_options_H
-#define fa_options_H
+#ifndef Foam_fa_options_H
+#define Foam_fa_options_H
 
 #include "faOptionList.H"
 #include "IOdictionary.H"
@@ -78,11 +78,11 @@ public:
     // Constructors
 
         //- Construct from components with list of field names
-        options(const fvPatch& p);
+        explicit options(const fvMesh& mesh);
 
         //- Construct faOptions and register to database if not present
         //- otherwise lookup and return
-        static options& New(const fvPatch& p);
+        static options& New(const fvMesh& mesh);
 
 
     //- Destructor
diff --git a/src/faOptions/faceSetOption/faceSetOption.C b/src/faOptions/faceSetOption/faceSetOption.C
index c28d589ed5..033828d4bf 100644
--- a/src/faOptions/faceSetOption/faceSetOption.C
+++ b/src/faOptions/faceSetOption/faceSetOption.C
@@ -291,10 +291,10 @@ Foam::fa::faceSetOption::faceSetOption
     const word& name,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& mesh
 )
 :
-    fa::option(name, modelType, dict, patch),
+    fa::option(name, modelType, dict, mesh),
     timeStart_(-1),
     duration_(0),
     selectionMode_(selectionModeTypeNames_.get("selectionMode", coeffs_)),
diff --git a/src/faOptions/faceSetOption/faceSetOption.H b/src/faOptions/faceSetOption/faceSetOption.H
index 16416dc4fe..3d53f37ab8 100644
--- a/src/faOptions/faceSetOption/faceSetOption.H
+++ b/src/faOptions/faceSetOption/faceSetOption.H
@@ -188,7 +188,7 @@ public:
             const word& name,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
 
diff --git a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
index 0e4f52da14..da3e534d47 100644
--- a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
+++ b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.C
@@ -51,18 +51,18 @@ Foam::fa::contactHeatFluxSource::contactHeatFluxSource
     const word& sourceName,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& mesh
 )
 :
-    fa::faceSetOption(sourceName, modelType, dict, patch),
-    temperatureCoupledBase(patch, dict),
+    fa::faceSetOption(sourceName, modelType, dict, mesh),
     TName_(dict.getOrDefault<word>("T", "T")),
     TprimaryName_(dict.get<word>("Tprimary")),
-    Tp_(mesh().lookupObject<volScalarField>(TprimaryName_)),
+    Tprimary_(mesh_.lookupObject<volScalarField>(TprimaryName_)),
     thicknessLayers_(),
     kappaLayers_(),
     contactRes_(0),
-    curTimeIndex_(-1)
+    curTimeIndex_(-1),
+    coupling_()
 {
     fieldNames_.resize(1, TName_);
 
@@ -85,11 +85,30 @@ Foam::fa::contactHeatFluxSource::htc() const
     );
     auto& htc = thtc.ref();
 
-    htc.field() =
-        temperatureCoupledBase::kappa
-        (
-            vsm().mapInternalToSurface<scalar>(Tp_)()
-        )*patch().deltaCoeffs();
+    // Set up values per coupled patch
+
+    PtrList<scalarField> patchValues(coupling_.size());
+
+    forAll(coupling_, patchi)
+    {
+        const auto* tempCoupled = coupling_.get(patchi);
+
+        if (tempCoupled)
+        {
+            const fvPatch& p = tempCoupled->patch();
+
+            patchValues.set
+            (
+                patchi,
+                (
+                    tempCoupled->kappa(p.patchInternalField(Tprimary_))
+                  * p.deltaCoeffs()
+                )
+            );
+        }
+    }
+
+    vsm().mapToSurface<scalar>(patchValues, htc.field());
 
     if (contactRes_ != 0)
     {
@@ -129,8 +148,7 @@ void Foam::fa::contactHeatFluxSource::addSup
                 dimensionedScalar(dimTemperature, Zero)
             );
 
-            Twall.ref().field() =
-                this->vsm().mapInternalToSurface<scalar>(Tp_);
+            vsm().mapInternalToSurface<scalar>(Tprimary_, Twall.ref().field());
 
             eqn += -fam::Sp(htcw(), eqn.psi()) + htcw()*Twall;
 
@@ -165,6 +183,26 @@ bool Foam::fa::contactHeatFluxSource::read(const dictionary& dict)
             }
         }
 
+
+        // Set up coupling (per-patch) for referenced polyPatches (sorted order)
+        // - size is maxPolyPatch+1
+
+        const labelList& patches = regionMesh().whichPolyPatches();
+
+        coupling_.clear();
+        coupling_.resize(patches.empty() ? 0 : (patches.last()+1));
+
+        for (const label patchi : patches)
+        {
+            const fvPatch& p = mesh_.boundary()[patchi];
+
+            coupling_.set
+            (
+                patchi,
+                new temperatureCoupling(p, dict)
+            );
+        }
+
         return true;
     }
 
diff --git a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.H b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.H
index 3ceada68bf..ffc917a057 100644
--- a/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.H
+++ b/src/faOptions/sources/derived/contactHeatFluxSource/contactHeatFluxSource.H
@@ -81,6 +81,7 @@ SourceFiles
 
 #include "faOption.H"
 #include "Function1.H"
+#include "PtrList.H"
 #include "areaFields.H"
 #include "faceSetOption.H"
 #include "temperatureCoupledBase.H"
@@ -98,9 +99,31 @@ namespace fa
 
 class contactHeatFluxSource
 :
-    public fa::faceSetOption,
-    public temperatureCoupledBase
+    public fa::faceSetOption
 {
+    // Private Classes
+
+         //- Wrapper to make non-abstract
+         struct temperatureCoupling : public Foam::temperatureCoupledBase
+         {
+             // Inherit constructors
+             using temperatureCoupledBase::temperatureCoupledBase;
+
+             //- The fvPatch
+             const fvPatch& patch() const noexcept { return patch_; }
+
+             // Dummy implementations
+
+             //- Map (and resize as needed) from self given a mapping object
+             virtual void autoMap(const fvPatchFieldMapper&)
+             {}
+
+             // Dummy implementation
+             virtual void rmap(const fvPatchField<scalar>&, const labelList&)
+             {}
+        };
+
+
     // Private Data
 
         //- Name of temperature field
@@ -110,7 +133,7 @@ class contactHeatFluxSource
         word TprimaryName_;
 
         //- Primary region temperature
-        const volScalarField& Tp_;
+        const volScalarField& Tprimary_;
 
         //- Thickness of layers
         scalarList thicknessLayers_;
@@ -124,6 +147,9 @@ class contactHeatFluxSource
         //- Current time index (used for updating)
         label curTimeIndex_;
 
+        //- Contact coupling (per-patch)
+        PtrList<temperatureCoupling> coupling_;
+
 
     // Private Member Functions
 
@@ -145,7 +171,7 @@ public:
             const word& sourceName,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- No copy construct
@@ -161,28 +187,6 @@ public:
 
     // Member Functions
 
-        // Mapping functions
-
-            //- Map (and resize as needed) from self given a mapping object
-            virtual void autoMap
-            (
-                const fvPatchFieldMapper& mapper
-            )
-            {
-                temperatureCoupledBase::autoMap(mapper);
-            }
-
-            //- Reverse map the given fvPatchField onto this fvPatchField
-            virtual void rmap
-            (
-                const fvPatchField<scalar>& fld,
-                const labelList& map
-            )
-            {
-                temperatureCoupledBase::rmap(fld, map);
-            }
-
-
         // Evaluation
 
             //- Add explicit contribution to compressible momentum equation
diff --git a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
index e885726d93..6f0a35080e 100644
--- a/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
+++ b/src/faOptions/sources/derived/externalFileSource/externalFileSource.C
@@ -50,10 +50,10 @@ Foam::fa::externalFileSource::externalFileSource
     const word& sourceName,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& p
+    const fvMesh& m
 )
 :
-    fa::faceSetOption(sourceName, modelType, dict, p),
+    fa::faceSetOption(sourceName, modelType, dict, m),
     fieldName_(dict.get<word>("fieldName")),
     tableName_(dict.get<word>("tableName")),
     pExt_
@@ -71,17 +71,7 @@ Foam::fa::externalFileSource::externalFileSource
         dimensionedScalar(dimPressure, Zero)
     ),
     curTimeIndex_(-1),
-    mapping_
-    (
-        new PatchFunction1Types::MappedFile<scalar>
-        (
-            p.patch(),
-            "uniformValue",
-            dict,
-            tableName_,          // field table name
-            true                 // face values
-        )
-    )
+    mapping_()
 {
     fieldNames_.resize(1, fieldName_);
 
@@ -95,9 +85,22 @@ Foam::fa::externalFileSource::externalFileSource
 
 void Foam::fa::externalFileSource::updateMapping()
 {
+    // Set up mapped values per patch
     const scalar t = mesh().time().value();
 
-    pExt_.field() = mapping_->value(t);
+    PtrList<scalarField> patchValues(mapping_.size());
+
+    forAll(mapping_, patchi)
+    {
+        const auto* map = mapping_.get(patchi);
+
+        if (map)
+        {
+            patchValues.set(patchi, map->value(t));
+        }
+    }
+
+    vsm().mapToSurface<scalar>(patchValues, pExt_.field());
 
     // Zero pressure for non-mapped faces
     faceSetOption::subsetFilter(pExt_.field());
@@ -133,6 +136,34 @@ bool Foam::fa::externalFileSource::read(const dictionary& dict)
 {
     if (fa::option::read(dict))
     {
+        // Set up mapping (per-patch) for referenced polyPatches (sorted order)
+        // - size is maxPolyPatch+1
+
+        const labelList& patches = regionMesh().whichPolyPatches();
+
+        mapping_.clear();
+        mapping_.resize(patches.empty() ? 0 : (patches.last()+1));
+
+        for (const label patchi : patches)
+        {
+            const polyPatch& p = mesh_.boundaryMesh()[patchi];
+
+            mapping_.set
+            (
+                patchi,
+                (
+                    new PatchFunction1Types::MappedFile<scalar>
+                    (
+                        p,
+                        "uniformValue",
+                        dict,
+                        tableName_,     // field table name
+                        true            // face values
+                    )
+                )
+            );
+        }
+
         return true;
     }
 
diff --git a/src/faOptions/sources/derived/externalFileSource/externalFileSource.H b/src/faOptions/sources/derived/externalFileSource/externalFileSource.H
index c5c2447106..a2056e18b0 100644
--- a/src/faOptions/sources/derived/externalFileSource/externalFileSource.H
+++ b/src/faOptions/sources/derived/externalFileSource/externalFileSource.H
@@ -106,7 +106,7 @@ class externalFileSource
         label curTimeIndex_;
 
         //- Mapped data from file
-        autoPtr<PatchFunction1Types::MappedFile<scalar>> mapping_;
+        PtrList<PatchFunction1Types::MappedFile<scalar>> mapping_;
 
 
     // Private Member Functions
@@ -129,7 +129,7 @@ public:
             const word& sourceName,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- No copy construct
diff --git a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
index c8cb3d0c19..8b7108fdb5 100644
--- a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
+++ b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
@@ -65,10 +65,10 @@ Foam::fa::externalHeatFluxSource::externalHeatFluxSource
     const word& sourceName,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& m
 )
 :
-    fa::faceSetOption(sourceName, modelType, dict, patch),
+    fa::faceSetOption(sourceName, modelType, dict, m),
     mode_(operationModeNames.get("mode", dict)),
     TName_(dict.getOrDefault<word>("T", "T")),
     Q_(nullptr),
diff --git a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.H b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.H
index a7adc670dc..dce81a0acb 100644
--- a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.H
+++ b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.H
@@ -193,7 +193,7 @@ public:
             const word& sourceName,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- No copy construct
diff --git a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
index 9b946c3566..b50853bccc 100644
--- a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
+++ b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.C
@@ -49,10 +49,10 @@ Foam::fa::jouleHeatingSource::jouleHeatingSource
     const word& sourceName,
     const word& modelType,
     const dictionary& dict,
-    const fvPatch& patch
+    const fvMesh& m
 )
 :
-    fa::faceSetOption(sourceName, modelType, dict, patch),
+    fa::faceSetOption(sourceName, modelType, dict, m),
     TName_(dict.getOrDefault<word>("T", "T")),
     V_
     (
diff --git a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
index e3c99f68d1..1202b93be1 100644
--- a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
+++ b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSource.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -135,8 +135,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef fa_jouleHeatingSource_H
-#define fa_jouleHeatingSource_H
+#ifndef Foam_fa_jouleHeatingSource_H
+#define Foam_fa_jouleHeatingSource_H
 
 #include "faOption.H"
 #include "Function1.H"
@@ -212,7 +212,7 @@ public:
             const word& sourceName,
             const word& modelType,
             const dictionary& dict,
-            const fvPatch& patch
+            const fvMesh& mesh
         );
 
         //- No copy construct
diff --git a/src/regionFaModels/liquidFilm/liquidFilmBase.C b/src/regionFaModels/liquidFilm/liquidFilmBase.C
index d5a49af125..93783e5fcf 100644
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
+    Copyright (C) 2020-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -233,7 +233,7 @@ liquidFilmBase::liquidFilmBase
 
     addedMassTotal_(0),
 
-    faOptions_(Foam::fa::options::New(p))
+    faOptions_(Foam::fa::options::New(primaryMesh()))
 {
     const areaVectorField& ns = regionMesh().faceAreaNormals();
 
diff --git a/src/regionFaModels/thermalShellModel/thermalShellModel.C b/src/regionFaModels/thermalShellModel/thermalShellModel.C
index 41d242f233..658c2195e3 100644
--- a/src/regionFaModels/thermalShellModel/thermalShellModel.C
+++ b/src/regionFaModels/thermalShellModel/thermalShellModel.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +67,7 @@ thermalShellModel::thermalShellModel
         ),
         regionMesh()
     ),
-    faOptions_(Foam::fa::options::New(p))
+    faOptions_(Foam::fa::options::New(primaryMesh()))
 {
     if (!faOptions_.optionList::size())
     {
diff --git a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
index 0be141cb91..2799a1be40 100644
--- a/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
+++ b/src/regionFaModels/vibrationShellModel/vibrationShellModel.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2021 OpenCFD Ltd.
+    Copyright (C) 2019-2022 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -80,7 +80,7 @@ vibrationShellModel::vibrationShellModel
         regionMesh(),
         dimensionedScalar(dimAcceleration, Zero)
     ),
-    faOptions_(Foam::fa::options::New(p)),
+    faOptions_(Foam::fa::options::New(primaryMesh())),
     solid_(dict.subDict("solid"))
 {
     if (!faOptions_.optionList::size())