Enhancement from Thompson and Tsouris

src/enhancementModels/Make/files

@@ -5,5 +5,6 @@ noEnhancement/noEnhancement.C
 lowHa/lowHa.C
 surfaceRenewalPseudoFirstOrder/surfaceRenewalPseudoFirstOrder.C
 filmPseudoFirstOrder/filmPseudoFirstOrder.C
+thompsonTsouris/thompsonTsouris.C
 
 LIB = $(FOAM_USER_LIBBIN)/libenhancementModels

src/enhancementModels/Make/options

@@ -3,6 +3,9 @@ EXE_INC = \
     -I../../applications/modules/multicomponentFilm/filmMulticomponentThermophysicalTransportModels/lnInclude \
     -I$(FOAM_MODULES)/isothermalFilm/lnInclude \
     -I$(FOAM_MODULES)/isothermalFilm/filmCompressibleMomentumTransportModels/lnInclude \
+    -I$(FOAM_MODULES)/multicomponentFluid/lnInclude \
+    -I$(FOAM_MODULES)/isothermalFluid/lnInclude \
+    -I$(FOAM_MODULES)/fluidSolver/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/physicalProperties/lnInclude \
     -I$(LIB_SRC)/MomentumTransportModels/momentumTransportModels/lnInclude \
@@ -24,5 +27,6 @@ LIB_LIBS = \
     -lmulticomponentFilm \
     -lfluidThermophysicalModels \
     -lfilmCompressibleMomentumTransportModels \
+    -lmulticomponentFluid \
     -lmeshTools \
     -lfiniteVolume

src/enhancementModels/enhancementModel/enhancementModel.C

@@ -42,7 +42,9 @@ Foam::enhancementModel::enhancementModel
     const word& type,
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 :
     massTransferModelCoeffs_(dict.optionalSubDict(type + "Coeffs")),
@@ -74,7 +76,10 @@ Foam::enhancementModel::enhancementModel
         ),
         filmMesh_,
         dimensionedScalar(dimless / dimTime, 1.0)
-    )
+    ),
+    fluid_(fluid),
+    bulkMesh_(fluid_.p.mesh()),
+    bulkPatchID_(bulkPatchID)
 {
 }
 

src/enhancementModels/enhancementModel/enhancementModel.H

@@ -43,6 +43,7 @@ SourceFiles
 #include "dictionary.H"
 #include "volFields.H"
 #include "multicomponentFilm.H"
+#include "multicomponentFluid.H"
 #include "fvc.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -79,6 +80,15 @@ protected:
         //- Apparent reaction rate
         volScalarField kApp_;
 
+	//- Pointer to bulk phase instance
+        const solvers::multicomponentFluid& fluid_;
+
+	//- Pointer to bulk mesh instance
+        const fvMesh& bulkMesh_;
+
+	//- Index of mass transfer patch in bulk mesh
+        const label bulkPatchID_;
+
 public:
 
     //- Runtime type information
@@ -93,9 +103,11 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         ),
-        (dict, film, filmSpecieID)
+        (dict, film, fluid, filmSpecieID, bulkPatchID)
     );
 
 
@@ -107,7 +119,9 @@ public:
             const word& type,
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );
 
         //- Disallow default bitwise copy construction
@@ -120,7 +134,9 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );
 
     //- Destructor

src/enhancementModels/enhancementModel/enhancementModelNew.C

@@ -33,7 +33,9 @@ Foam::autoPtr<Foam::enhancementModel> Foam::enhancementModel::New
 (
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 {
     //- Initialize modelType to a non-model word
@@ -56,7 +58,7 @@ Foam::autoPtr<Foam::enhancementModel> Foam::enhancementModel::New
             << exit(FatalError);
     }
 
-    return autoPtr<enhancementModel>(cstrIter()(dict, film, filmSpecieID));
+    return autoPtr<enhancementModel>(cstrIter()(dict, film, fluid, filmSpecieID, bulkPatchID));
 }
 
 

src/enhancementModels/filmPseudoFirstOrder/filmPseudoFirstOrder.C

@@ -46,15 +46,19 @@ Foam::enhancementModels::filmPseudoFirstOrder::filmPseudoFirstOrder
 (
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 :
     enhancementModel
     (
         typeName,
         dict,
         film,
-        filmSpecieID
+        fluid,
+        filmSpecieID,
+        bulkPatchID
     ),
 
     D1_(dimArea/dimTime/dimTemperature, 

src/enhancementModels/filmPseudoFirstOrder/filmPseudoFirstOrder.H

@@ -90,7 +90,9 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );
 
 

src/enhancementModels/lowHa/lowHa.C

@@ -45,15 +45,19 @@ Foam::enhancementModels::lowHa::lowHa
 (
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 :
     enhancementModel
     (
         typeName,
         dict,
         film,
-        filmSpecieID
+        fluid,
+        filmSpecieID,
+        bulkPatchID
     ),
 
     D1_(dimArea/dimTime/dimTemperature, massTransferModelCoeffs_.lookup<scalar>("Dl1")),

src/enhancementModels/lowHa/lowHa.H

@@ -78,7 +78,9 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );
 
 

src/enhancementModels/noEnhancement/noEnhancement.C

@@ -45,15 +45,19 @@ Foam::enhancementModels::noEnhancement::noEnhancement
 (
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 :
     enhancementModel
     (
         typeName,
         dict,
         film,
-        filmSpecieID
+        fluid,
+        filmSpecieID,
+        bulkPatchID
     )
 {
 }

src/enhancementModels/noEnhancement/noEnhancement.H

@@ -68,7 +68,9 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );
 
 

src/enhancementModels/surfaceRenewalPseudoFirstOrder/surfaceRenewalPseudoFirstOrder.C

@@ -45,15 +45,19 @@ Foam::enhancementModels::surfaceRenewalPseudoFirstOrder::surfaceRenewalPseudoFir
 (
     const dictionary& dict,
     const solvers::multicomponentFilm& film,
-    const label& filmSpecieID
+    const solvers::multicomponentFluid& fluid,
+    const label& filmSpecieID,
+    const label& bulkPatchID
 )
 :
     enhancementModel
     (
         typeName,
         dict,
         film,
-        filmSpecieID
+        fluid,
+        filmSpecieID,
+        bulkPatchID
     ),
 
     D1_(dimArea/dimTime/dimTemperature, massTransferModelCoeffs_.lookup<scalar>("Dl1")),

src/enhancementModels/surfaceRenewalPseudoFirstOrder/surfaceRenewalPseudoFirstOrder.H

@@ -88,7 +88,9 @@ public:
         (
             const dictionary& dict,
             const solvers::multicomponentFilm& film,
-            const label& filmSpecieID
+            const solvers::multicomponentFluid& fluid,
+            const label& filmSpecieID,
+            const label& bulkPatchID
         );