ENH: Encapsulated cloud sub-models in sub-dictionary

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

@@ -257,6 +257,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
         )
     ),
     constProps_(particleProperties_),
+    subModelProperties_(particleProperties_.subDict("subModels")),
     active_(particleProperties_.lookup("active")),
     parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))),
     coupled_(particleProperties_.lookup("coupled")),
@@ -276,7 +277,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         DispersionModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -284,7 +285,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         DragModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -292,7 +293,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         InjectionModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -300,7 +301,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         CollisionModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -308,7 +309,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         PatchInteractionModel<KinematicCloud<ParcelType> >::New
         (
-            particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -316,7 +317,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         PostProcessingModel<KinematicCloud<ParcelType> >::New
         (
-            this->particleProperties_,
+            subModelProperties_,
             *this
         )
     ),
@@ -324,7 +325,7 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
     (
         SurfaceFilmModel<KinematicCloud<ParcelType> >::New
         (
-            this->particleProperties_,
+            subModelProperties_,
             *this,
             g
         )

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

@@ -115,6 +115,9 @@ protected:
         //- Dictionary of particle properties
         IOdictionary particleProperties_;
 
+        //- Sub-models dictionary
+        const dictionary& subModelProperties_;
+
         //- Parcel constant properties
         typename ParcelType::constantProperties constProps_;
 
@@ -275,6 +278,9 @@ public:
                 //- Return particle properties dictionary
                 inline const IOdictionary& particleProperties() const;
 
+                //- Return reference to the sub-models dictionary
+                inline const dictionary& subModelProperties() const;
+
                 //- Return the constant properties
                 inline const typename ParcelType::constantProperties&
                     constProps() const;

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

@@ -56,6 +56,14 @@ Foam::KinematicCloud<ParcelType>::particleProperties() const
 }
 
 
+template<class ParcelType>
+inline const Foam::dictionary&
+Foam::KinematicCloud<ParcelType>::subModelProperties() const
+{
+    return subModelProperties_;
+}
+
+
 template<class ParcelType>
 inline const typename ParcelType::constantProperties&
 Foam::KinematicCloud<ParcelType>::constProps() const

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

@@ -183,7 +183,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
     (
         CompositionModel<ReactingCloud<ParcelType> >::New
         (
-            this->particleProperties(),
+            this->subModelProperties(),
             *this
         )
     ),
@@ -191,7 +191,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
     (
         PhaseChangeModel<ReactingCloud<ParcelType> >::New
         (
-            this->particleProperties(),
+            this->subModelProperties(),
             *this
         )
     ),

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

@@ -156,7 +156,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
     (
         DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >::New
         (
-            this->particleProperties(),
+            this->subModelProperties(),
             *this
         )
     ),
@@ -164,7 +164,7 @@ Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
     (
         SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >::New
         (
-            this->particleProperties(),
+            this->subModelProperties(),
             *this
         )
     ),

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

@@ -158,7 +158,7 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
     (
         HeatTransferModel<ThermoCloud<ParcelType> >::New
         (
-            this->particleProperties(),
+            this->subModelProperties(),
             *this
         )
     ),