refactored wall interaction to patch interaction

src/lagrangian/coalCombustion/Make/files

@@ -11,9 +11,9 @@ coalParcel/submodels/makeCoalParcelDispersionModels.C
 coalParcel/submodels/makeCoalParcelInjectionModels.C
 coalParcel/submodels/makeCoalParcelHeatTransferModels.C
 coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
+coalParcel/submodels/makeCoalParcelPatchInteractionModels.C
 coalParcel/submodels/makeCoalParcelPostProcessingModels.C
 coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
-coalParcel/submodels/makeCoalParcelWallInteractionModels.C
 
 submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
 submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -22,4 +22,4 @@ submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
 /* IOLists */
 coalParcel/submodels/makeCoalParcelIOList.C
 
-LIB = $(FOAM_USER_LIBBIN)/libcoalCombustion
+LIB = $(FOAM_LIBBIN)/libcoalCombustion

src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelWallInteractionModels.C → src/lagrangian/coalCombustion/coalParcel/submodels/makeCoalParcelPatchInteractionModels.C

@@ -34,16 +34,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<coalParcel>);
+    makePatchInteractionModel(KinematicCloud<coalParcel>);
 
-    // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    // Add instances of patch interaction model to the table
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         coalParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/Make/files

@@ -30,8 +30,8 @@ $(KINEMATICPARCEL)/defineBasicKinematicParcel.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelDispersionModels.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelDragModels.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelInjectionModels.C
+$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelPatchInteractionModels.C
 $(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelPostProcessingModels.C
-$(KINEMATICPARCEL)/submodels/makeBasicKinematicParcelWallInteractionModels.C
 
 
 /* thermo parcel sub-models */
@@ -41,8 +41,8 @@ $(THERMOPARCEL)/submodels/makeBasicThermoParcelDispersionModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelDragModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelHeatTransferModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelInjectionModels.C
+$(THERMOPARCEL)/submodels/makeBasicThermoParcelPatchInteractionModels.C
 $(THERMOPARCEL)/submodels/makeBasicThermoParcelPostProcessingModels.C
-$(THERMOPARCEL)/submodels/makeBasicThermoParcelWallInteractionModels.C
 
 
 /* reacting parcel sub-models */
@@ -53,9 +53,9 @@ $(REACTINGPARCEL)/submodels/makeBasicReactingParcelDispersionModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelDragModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelHeatTransferModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelInjectionModels.C
+$(REACTINGPARCEL)/submodels/makeBasicReactingParcelPatchInteractionModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelPhaseChangeModels.C
 $(REACTINGPARCEL)/submodels/makeBasicReactingParcelPostProcessingModels.C
-$(REACTINGPARCEL)/submodels/makeBasicReactingParcelWallInteractionModels.C
 
 
 /* reacting multiphase parcel sub-models */
@@ -67,10 +67,10 @@ $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelDispersionModels.
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelDragModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelHeatTransferModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelInjectionModels.C
+$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelPatchInteractionModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelPhaseChangeModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelPostProcessingModels.C
 $(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelSurfaceReactionModels.C
-$(REACTINGMPPARCEL)/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C
 
 
 /* tracked reacting parcel sub-models */
@@ -81,9 +81,9 @@ $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelDispersionModels.C
 $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelDragModels.C
 $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelHeatTransferModels.C
 $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelInjectionModels.C
+$(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelPatchInteractionModels.C
 $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelPhaseChangeModels.C
 $(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelPostProcessingModels.C
-$(TRACKEDREACTINGPARCEL)/submodels/makeTrackedReactingParcelWallInteractionModels.C
 
 
 /* bolt-on models */

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C

@@ -31,8 +31,8 @@ License
 #include "DispersionModel.H"
 #include "DragModel.H"
 #include "InjectionModel.H"
+#include "PatchInteractionModel.H"
 #include "PostProcessingModel.H"
-#include "WallInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -98,19 +98,19 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             *this
         )
     ),
-    postProcessingModel_
+    patchInteractionModel_
     (
-        PostProcessingModel<KinematicCloud<ParcelType> >::New
+        PatchInteractionModel<KinematicCloud<ParcelType> >::New
         (
-            this->particleProperties_,
+            particleProperties_,
             *this
         )
     ),
-    wallInteractionModel_
+    postProcessingModel_
     (
-        WallInteractionModel<KinematicCloud<ParcelType> >::New
+        PostProcessingModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            this->particleProperties_,
             *this
         )
     ),

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H

@@ -75,7 +75,7 @@ template<class CloudType>
 class PostProcessingModel;
 
 template<class CloudType>
-class WallInteractionModel;
+class PatchInteractionModel;
 
 /*---------------------------------------------------------------------------*\
                        Class KinematicCloud Declaration
@@ -163,14 +163,14 @@ protected:
             autoPtr<InjectionModel<KinematicCloud<ParcelType> > >
                 injectionModel_;
 
+            //- Patch interaction model
+            autoPtr<PatchInteractionModel<KinematicCloud<ParcelType> > >
+                patchInteractionModel_;
+
             //- Post-processing model
             autoPtr<PostProcessingModel<KinematicCloud<ParcelType> > >
                 postProcessingModel_;
 
-            //- Wall interaction model
-            autoPtr<WallInteractionModel<KinematicCloud<ParcelType> > >
-                wallInteractionModel_;
-
 
         // Reference to the particle integration schemes
 
@@ -279,32 +279,34 @@ public:
 
             // Sub-models
 
-                //- Return reference to dispersion model
+                //- Return const-access to the dispersion model
                 inline const DispersionModel<KinematicCloud<ParcelType> >&
                     dispersion() const;
 
+                //- Return reference to the dispersion model
                 inline DispersionModel<KinematicCloud<ParcelType> >&
                     dispersion();
 
-                //- Return reference to drag model
+                //- Return const-access to the drag model
                 inline const DragModel<KinematicCloud<ParcelType> >&
                     drag() const;
 
-                //- Return reference to injection model
+                //- Return const access to the injection model
                 inline const InjectionModel<KinematicCloud<ParcelType> >&
                     injection() const;
 
+                //- Return reference to the injection model
                 inline InjectionModel<KinematicCloud<ParcelType> >&
                     injection();
 
+                //- Return const-access to the patch interaction model
+                inline const PatchInteractionModel<KinematicCloud<ParcelType> >&
+                    patchInteraction() const;
+
                 //- Return reference to post-processing model
                 inline PostProcessingModel<KinematicCloud<ParcelType> >&
                     postProcessing();
 
-                //- Return reference to wall interaction model
-                inline const WallInteractionModel<KinematicCloud<ParcelType> >&
-                    wallInteraction() const;
-
 
             // Integration schemes
 

src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H

@@ -151,6 +151,14 @@ Foam::KinematicCloud<ParcelType>::injection() const
 }
 
 
+template<class ParcelType>
+inline const Foam::PatchInteractionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::patchInteraction() const
+{
+    return patchInteractionModel_;
+}
+
+
 template<class ParcelType>
 inline Foam::InjectionModel<Foam::KinematicCloud<ParcelType> >&
 Foam::KinematicCloud<ParcelType>::injection()
@@ -167,14 +175,6 @@ Foam::KinematicCloud<ParcelType>::postProcessing()
 }
 
 
-template<class ParcelType>
-inline const Foam::WallInteractionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::wallInteraction() const
-{
-    return wallInteractionModel_;
-}
-
-
 template<class ParcelType>
 inline const Foam::vectorIntegrationScheme&
 Foam::KinematicCloud<ParcelType>::UIntegrator() const

src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C

@@ -260,6 +260,8 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
     const label patchI
 )
 {
+    td.cloud().patchInteraction().correct(pp, this->face(), U_);
+
     ParcelType& p = static_cast<ParcelType&>(*this);
     td.cloud().postProcessing().postPatch(p, patchI);
 }
@@ -303,9 +305,7 @@ void Foam::KinematicParcel<ParcelType>::hitWallPatch
     const wallPolyPatch& wpp,
     TrackData& td
 )
-{
-    td.cloud().wallInteraction().correct(wpp, this->face(), U_);
-}
+{}
 
 
 template<class ParcelType>

src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelWallInteractionModels.C → src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/submodels/makeBasicKinematicParcelPatchInteractionModels.C

@@ -34,16 +34,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<basicKinematicParcel>);
+    makePatchInteractionModel(KinematicCloud<basicKinematicParcel>);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         basicKinematicParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelWallInteractionModels.C → src/lagrangian/intermediate/parcels/derived/basicReactingMultiphaseParcel/submodels/makeBasicReactingMultiphaseParcelPatchInteractionModels.C

@@ -34,16 +34,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<basicReactingMultiphaseParcel>);
+    makePatchInteractionModel(KinematicCloud<basicReactingMultiphaseParcel>);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         basicReactingMultiphaseParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelWallInteractionModels.C → src/lagrangian/intermediate/parcels/derived/basicReactingParcel/submodels/makeBasicReactingParcelPatchInteractionModels.C

@@ -34,16 +34,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<basicReactingParcel>);
+    makePatchInteractionModel(KinematicCloud<basicReactingParcel>);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         basicReactingParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelWallInteractionModels.C → src/lagrangian/intermediate/parcels/derived/basicThermoParcel/submodels/makeBasicThermoParcelPatchInteractionModels.C

@@ -33,16 +33,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<basicThermoParcel>);
+    makePatchInteractionModel(KinematicCloud<basicThermoParcel>);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         basicThermoParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/parcels/derived/trackedReactingParcel/submodels/makeTrackedReactingParcelWallInteractionModels.C → src/lagrangian/intermediate/parcels/derived/trackedReactingParcel/submodels/makeTrackedReactingParcelPatchInteractionModels.C

@@ -34,16 +34,16 @@ License
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<trackedReactingParcel>);
+    makePatchInteractionModel(KinematicCloud<trackedReactingParcel>);
 
     // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         Rebound,
         KinematicCloud,
         trackedReactingParcel
     );
-    makeWallInteractionModelType
+    makePatchInteractionModelType
     (
         StandardWallInteraction,
         KinematicCloud,

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C

@@ -24,43 +24,43 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::WallInteractionModel<CloudType> >
-Foam::WallInteractionModel<CloudType>::New
+Foam::autoPtr<Foam::PatchInteractionModel<CloudType> >
+Foam::PatchInteractionModel<CloudType>::New
 (
     const dictionary& dict,
     CloudType& owner
 )
 {
-    word WallInteractionModelType(dict.lookup("WallInteractionModel"));
+    word PatchInteractionModelType(dict.lookup("PatchInteractionModel"));
 
-    Info<< "Selecting WallInteractionModel " << WallInteractionModelType
+    Info<< "Selecting PatchInteractionModel " << PatchInteractionModelType
         << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(WallInteractionModelType);
+        dictionaryConstructorTablePtr_->find(PatchInteractionModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "WallInteractionModel<CloudType>::New"
+            "PatchInteractionModel<CloudType>::New"
             "("
                 "const dictionary&, "
                 "CloudType&"
             ")"
-        )   << "Unknown WallInteractionModelType type "
-            << WallInteractionModelType
+        )   << "Unknown PatchInteractionModelType type "
+            << PatchInteractionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid WallInteractionModel types are:" << nl
+            << "    Valid PatchInteractionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
-    return autoPtr<WallInteractionModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<PatchInteractionModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C

@@ -24,12 +24,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::WallInteractionModel<CloudType>::WallInteractionModel
+Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
 (
     const dictionary& dict,
     CloudType& owner,
@@ -45,7 +45,7 @@ Foam::WallInteractionModel<CloudType>::WallInteractionModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::WallInteractionModel<CloudType>::~WallInteractionModel()
+Foam::PatchInteractionModel<CloudType>::~PatchInteractionModel()
 {}
 
 
@@ -53,14 +53,14 @@ Foam::WallInteractionModel<CloudType>::~WallInteractionModel()
 
 template<class CloudType>
 const CloudType&
-Foam::WallInteractionModel<CloudType>::owner() const
+Foam::PatchInteractionModel<CloudType>::owner() const
 {
     return owner_;
 }
 
 
 template<class CloudType>
-const Foam::dictionary& Foam::WallInteractionModel<CloudType>::dict() const
+const Foam::dictionary& Foam::PatchInteractionModel<CloudType>::dict() const
 {
     return dict_;
 }
@@ -68,7 +68,7 @@ const Foam::dictionary& Foam::WallInteractionModel<CloudType>::dict() const
 
 template<class CloudType>
 const Foam::dictionary&
-Foam::WallInteractionModel<CloudType>::coeffDict() const
+Foam::PatchInteractionModel<CloudType>::coeffDict() const
 {
     return coeffDict_;
 }
@@ -76,7 +76,7 @@ Foam::WallInteractionModel<CloudType>::coeffDict() const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "NewWallInteractionModel.C"
+#include "NewPatchInteractionModel.C"
 
 // ************************************************************************* //
 

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H

@@ -23,20 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::WallInteractionModel
-
+    Foam::PatchInteractionModel
 
 Description
-    Templated wall interaction model class
+    Templated patch interaction model class
 
 SourceFiles
-    WallInteractionModel.C
-    NewWallInteractionModel.C
+    PatchInteractionModel.C
+    NewPatchInteractionModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef WallInteractionModel_H
-#define WallInteractionModel_H
+#ifndef PatchInteractionModel_H
+#define PatchInteractionModel_H
 
 #include "IOdictionary.H"
 #include "autoPtr.H"
@@ -48,18 +47,18 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class WallInteractionModel Declaration
+                   Class PatchInteractionModel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class WallInteractionModel
+class PatchInteractionModel
 {
     // Private data
 
         //- The cloud dictionary
         const dictionary& dict_;
 
-        // reference to the owner cloud class
+        //- Reference to the owner cloud class
         CloudType& owner_;
 
         //- The coefficients dictionary
@@ -69,13 +68,13 @@ class WallInteractionModel
 public:
 
     //- Runtime type information
-    TypeName("WallInteractionModel");
+    TypeName("PatchInteractionModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
     (
         autoPtr,
-        WallInteractionModel,
+        PatchInteractionModel,
         dictionary,
         (
             const dictionary& dict,
@@ -88,7 +87,7 @@ public:
     // Constructors
 
         //- Construct from components
-        WallInteractionModel
+        PatchInteractionModel
         (
             const dictionary& dict,
             CloudType& owner,
@@ -97,11 +96,11 @@ public:
 
 
     //- Destructor
-    virtual ~WallInteractionModel();
+    virtual ~PatchInteractionModel();
 
 
     //- Selector
-    static autoPtr<WallInteractionModel<CloudType> > New
+    static autoPtr<PatchInteractionModel<CloudType> > New
     (
         const dictionary& dict,
         CloudType& owner
@@ -122,13 +121,13 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
+        //- Flag to indicate whether model activates patch interaction model
         virtual bool active() const = 0;
 
-        //- Apply wall correction
+        //- Apply velocity correction
         virtual void correct
         (
-            const wallPolyPatch& wpp,
+            const polyPatch& pp,
             const label faceId,
             vector& U
         ) const = 0;
@@ -141,22 +140,22 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeWallInteractionModel(CloudType)                                   \
+#define makePatchInteractionModel(CloudType)                                  \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(WallInteractionModel<CloudType>, 0);  \
+    defineNamedTemplateTypeNameAndDebug(PatchInteractionModel<CloudType>, 0); \
                                                                               \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
-        WallInteractionModel<CloudType>,                                      \
+        PatchInteractionModel<CloudType>,                                     \
         dictionary                                                            \
     );
 
 
-#define makeWallInteractionModelType(SS, CloudType, ParcelType)               \
+#define makePatchInteractionModelType(SS, CloudType, ParcelType)              \
                                                                               \
     defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
                                                                               \
-    WallInteractionModel<CloudType<ParcelType> >::                            \
+    PatchInteractionModel<CloudType<ParcelType> >::                           \
         adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
@@ -164,7 +163,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "WallInteractionModel.C"
+#   include "PatchInteractionModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C

@@ -35,7 +35,7 @@ Foam::Rebound<CloudType>::Rebound
     CloudType& cloud
 )
 :
-    WallInteractionModel<CloudType>(dict, cloud, typeName),
+    PatchInteractionModel<CloudType>(dict, cloud, typeName),
     UFactor_(readScalar(this->coeffDict().lookup("UFactor")))
 {}
 
@@ -59,12 +59,12 @@ bool Foam::Rebound<CloudType>::active() const
 template<class CloudType>
 void Foam::Rebound<CloudType>::correct
 (
-    const wallPolyPatch& wpp,
+    const polyPatch& pp,
     const label faceId,
     vector& U
 ) const
 {
-    vector nw = wpp.faceAreas()[wpp.whichFace(faceId)];
+    vector nw = pp.faceAreas()[pp.whichFace(faceId)];
     nw /= mag(nw);
 
     scalar Un = U & nw;

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H

@@ -26,14 +26,14 @@ Class
     Foam::Rebound
 
 Description
-    Simple rebound wall interaction model
+    Simple rebound patch interaction model
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef Rebound_H
 #define Rebound_H
 
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 template<class CloudType>
 class Rebound
 :
-    public WallInteractionModel<CloudType>
+    public PatchInteractionModel<CloudType>
 {
     // Private data
 
@@ -64,11 +64,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        Rebound
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        Rebound(const dictionary& dict, CloudType& cloud);
 
 
     //- Destructor
@@ -77,13 +73,13 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
+        //- Flag to indicate whether model activates patch interaction model
         bool active() const;
 
-        //- Apply wall correction
+        //- Apply velocity correction
         virtual void correct
         (
-            const wallPolyPatch& wpp,
+            const polyPatch& pp,
             const label faceId,
             vector& U
         ) const;

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C

@@ -35,7 +35,7 @@ Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
     CloudType& cloud
 )
 :
-    WallInteractionModel<CloudType>(dict, cloud, typeName),
+    PatchInteractionModel<CloudType>(dict, cloud, typeName),
     e_(dimensionedScalar(this->coeffDict().lookup("e")).value()),
     mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value())
 {}
@@ -60,23 +60,26 @@ bool Foam::StandardWallInteraction<CloudType>::active() const
 template <class CloudType>
 void Foam::StandardWallInteraction<CloudType>::correct
 (
-    const wallPolyPatch& wpp,
+    const polyPatch& pp,
     const label faceId,
     vector& U
 ) const
 {
-    vector nw = wpp.faceAreas()[wpp.whichFace(faceId)];
-    nw /= mag(nw);
+    if (isA<wallPolyPatch>(pp))
+    {
+        vector nw = pp.faceAreas()[pp.whichFace(faceId)];
+        nw /= mag(nw);
 
-    scalar Un = U & nw;
-    vector Ut = U - Un*nw;
+        scalar Un = U & nw;
+        vector Ut = U - Un*nw;
 
-    if (Un > 0)
-    {
-        U -= (1.0 + e_)*Un*nw;
-    }
+        if (Un > 0)
+        {
+            U -= (1.0 + e_)*Un*nw;
+        }
 
-    U -= mu_*Ut;
+        U -= mu_*Ut;
+    }
 }
 
 

src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H → src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H

@@ -33,7 +33,7 @@ Description
 #ifndef StandardWallInteraction_H
 #define StandardWallInteraction_H
 
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,14 +46,14 @@ namespace Foam
 template<class CloudType>
 class StandardWallInteraction
 :
-    public WallInteractionModel<CloudType>
+    public PatchInteractionModel<CloudType>
 {
     // Private data
 
         //- Elasticity
         const scalar e_;
 
-        //-Restitution coefficient
+        //- Restitution coefficient
         const scalar mu_;
 
 
@@ -66,11 +66,7 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        StandardWallInteraction
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        StandardWallInteraction(const dictionary& dict, CloudType& cloud);
 
 
     //- Destructor
@@ -79,13 +75,13 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
+        //- Flag to indicate whether model activates patch interaction model
         bool active() const;
 
-        //- Apply wall correction
+        //- Apply velocity correction
         virtual void correct
         (
-            const wallPolyPatch& wpp,
+            const polyPatch& pp,
             const label faceId,
             vector& U
         ) const;

tutorials/Lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties

@@ -21,7 +21,7 @@ DragModel       SphereDrag;
 
 DispersionModel StochasticDispersionRAS;
 
-WallInteractionModel StandardWallInteraction;
+PatchInteractionModel StandardWallInteraction;
 
 HeatTransferModel RanzMarshall;