WIP: duplicate constructor entries (#2538)

WIP: Updated multiphaseEuler runtime constructor table names

WIP: Updated multiphaseInter runtime constructor table names

WIP: Updated reactingEuler runtime constructor table names

WIP: Updated twoPhaseEuler runtime constructor table names

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C

@@ -43,7 +43,7 @@ namespace diameterModels
     (
         diameterModel,
         constant,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C

@@ -35,7 +35,7 @@ namespace Foam
 namespace multiphaseEuler
 {
     defineTypeNameAndDebug(diameterModel, 0);
-    defineRunTimeSelectionTable(diameterModel, dictionary);
+    defineRunTimeSelectionTable(diameterModel, multiphaseEuler);
 }
 }
 
@@ -69,7 +69,7 @@ Foam::multiphaseEuler::diameterModel::New
         << ": "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -78,7 +78,7 @@ Foam::multiphaseEuler::diameterModel::New
             dict,
             "diameterModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseEulerConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H

@@ -76,7 +76,7 @@ public:
         (
             autoPtr,
             diameterModel,
-            dictionary,
+            multiphaseEuler,
             (
                 const dictionary& dict,
                 const phaseModel& phase

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C

@@ -43,7 +43,7 @@ namespace diameterModels
     (
         diameterModel,
         isothermal,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         Ergun,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         Gibilaro,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         GidaspowErgunWenYu,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         GidaspowSchillerNaumann,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         SchillerNaumann,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         SyamlalOBrien,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         WenYu,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         blended,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C

@@ -35,7 +35,7 @@ namespace Foam
 namespace multiphaseEuler
 {
     defineTypeNameAndDebug(dragModel, 0);
-    defineRunTimeSelectionTable(dragModel, dictionary);
+    defineRunTimeSelectionTable(dragModel, multiphaseEuler);
 }
 }
 
@@ -74,7 +74,7 @@ Foam::multiphaseEuler::dragModel::New
         << ": "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -83,7 +83,7 @@ Foam::multiphaseEuler::dragModel::New
             dict,
             "dragModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseEulerConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H

@@ -76,7 +76,7 @@ public:
         (
             autoPtr,
             dragModel,
-            dictionary,
+            multiphaseEuler,
             (
                 const dictionary& interfaceDict,
                 const phaseModel& phase1,

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C

@@ -43,7 +43,7 @@ namespace dragModels
     (
         dragModel,
         interface,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C

@@ -43,7 +43,7 @@ namespace heatTransferModels
     (
         heatTransferModel,
         RanzMarshall,
-        dictionary
+        multiphaseEuler
     );
 }
 }

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C

@@ -35,7 +35,7 @@ namespace Foam
 namespace multiphaseEuler
 {
     defineTypeNameAndDebug(heatTransferModel, 0);
-    defineRunTimeSelectionTable(heatTransferModel, dictionary);
+    defineRunTimeSelectionTable(heatTransferModel, multiphaseEuler);
 }
 }
 
@@ -78,7 +78,7 @@ Foam::multiphaseEuler::heatTransferModel::New
         << ": "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -87,7 +87,7 @@ Foam::multiphaseEuler::heatTransferModel::New
             dict,
             "heatTransferModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseEulerConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H

@@ -77,7 +77,7 @@ public:
         (
             autoPtr,
             heatTransferModel,
-            dictionary,
+            multiphaseEuler,
             (
                 const dictionary& dict,
                 const volScalarField& alpha1,

src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H

@@ -269,7 +269,7 @@ public:
     (                                                                          \
         interfaceCompositionModel,                                             \
         Type##Thermo##OtherThermo,                                             \
-        dictionary                                                             \
+        multiphaseInter                                                        \
     )
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C

@@ -36,7 +36,7 @@ namespace Foam
 namespace multiphaseInter
 {
     defineTypeNameAndDebug(interfaceCompositionModel, 0);
-    defineRunTimeSelectionTable(interfaceCompositionModel, dictionary);
+    defineRunTimeSelectionTable(interfaceCompositionModel, multiphaseInter);
 }
 }
 
@@ -99,7 +99,7 @@ Foam::multiphaseInter::interfaceCompositionModel::New
     Info<< "Selecting interfaceCompositionModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseInterConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -108,7 +108,7 @@ Foam::multiphaseInter::interfaceCompositionModel::New
             dict,
             "interfaceCompositionModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseInterConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H

@@ -113,7 +113,7 @@ public:
         (
             autoPtr,
             interfaceCompositionModel,
-            dictionary,
+            multiphaseInter,
             (
                 const dictionary& dict,
                 const phasePair& pair

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C

@@ -40,7 +40,7 @@ namespace porousModels
     (
         porousModel,
         VollerPrakash,
-        dictionary
+        multiphaseInter
     );
 }
 }

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C

@@ -33,7 +33,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(porousModel, 0);
-    defineRunTimeSelectionTable(porousModel, dictionary);
+    defineRunTimeSelectionTable(porousModel, multiphaseInter);
 }
 
 
@@ -74,7 +74,7 @@ Foam::porousModel::New
     Info<< "Selecting porousModel for "
         <<  ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseInterConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -83,7 +83,7 @@ Foam::porousModel::New
             dict,
             "porousModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseInterConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H

@@ -75,7 +75,7 @@ public:
     (
         autoPtr,
         porousModel,
-        dictionary,
+        multiphaseInter,
         (
             const dictionary& dict,
             const fvMesh& mesh

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C

@@ -42,7 +42,7 @@ namespace surfaceTensionModels
     (
         surfaceTensionModel,
         constantSurfaceTensionCoefficient,
-        dictionary
+        multiphaseInter
     );
 }
 }

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C

@@ -35,7 +35,7 @@ namespace Foam
 namespace multiphaseInter
 {
     defineTypeNameAndDebug(surfaceTensionModel, 0);
-    defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
+    defineRunTimeSelectionTable(surfaceTensionModel, multiphaseInter);
 }
 }
 
@@ -79,7 +79,7 @@ Foam::multiphaseInter::surfaceTensionModel::New
     Info<< "Selecting surfaceTensionModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = multiphaseInterConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -88,7 +88,7 @@ Foam::multiphaseInter::surfaceTensionModel::New
             dict,
             "surfaceTensionModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseInterConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H

@@ -78,7 +78,7 @@ public:
     (
         autoPtr,
         surfaceTensionModel,
-        dictionary,
+        multiphaseInter,
         (
             const dictionary& dict,
             const phasePair& pair,

src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C

@@ -51,7 +51,7 @@ namespace Foam
 namespace multiphaseInter
 {
     defineTypeNameAndDebug(multiphaseSystem, 0);
-    defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+    defineRunTimeSelectionTable(multiphaseSystem, multiphaseInter);
 }
 }
 

src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H

@@ -106,7 +106,7 @@ public:
         (
             autoPtr,
             multiphaseSystem,
-            dictionary,
+            multiphaseInter,
             (
                 const fvMesh& mesh
             ),

src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C

@@ -52,7 +52,7 @@ Foam::multiphaseInter::multiphaseSystem::New
 
     Info<< "Selecting multiphaseSystem " << systemType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(systemType);
+    auto* ctorPtr = multiphaseInterConstructorTable(systemType);
 
     if (!ctorPtr)
     {
@@ -61,7 +61,7 @@ Foam::multiphaseInter::multiphaseSystem::New
             dict,
             "multiphaseSystem",
             systemType,
-            *dictionaryConstructorTablePtr_
+            *multiphaseInterConstructorTablePtr_
         ) << exit(FatalIOError);
     }
 

src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C

@@ -43,7 +43,7 @@ namespace Foam
     (
         multiphaseSystem,
         massTransferMultiphaseSystem,
-        dictionary,
+        multiphaseInter,
         massTransferMultiphaseSystem
     );
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C

@@ -33,7 +33,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(blendingMethod, 0);
-    defineRunTimeSelectionTable(blendingMethod, dictionary);
+    defineRunTimeSelectionTable(blendingMethod, reactingEuler);
 }
 
 
@@ -61,7 +61,7 @@ Foam::blendingMethod::New
     Info<< "Selecting " << modelName << " blending method: "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -70,7 +70,7 @@ Foam::blendingMethod::New
             dict,
             "blendingMethod",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H

@@ -63,7 +63,7 @@ public:
     (
         autoPtr,
         blendingMethod,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict,
             const wordList& phaseNames

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C

@@ -40,7 +40,7 @@ namespace blendingMethods
     (
         blendingMethod,
         hyperbolic,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C

@@ -40,7 +40,7 @@ namespace blendingMethods
     (
         blendingMethod,
         linear,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C

@@ -41,7 +41,7 @@ namespace blendingMethods
     (
         blendingMethod,
         noBlending,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(CHFModel, 0);
-        defineRunTimeSelectionTable(CHFModel, dictionary);
+        defineRunTimeSelectionTable(CHFModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::CHFModel::New
 
     Info<< "Selecting CHFModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::CHFModel::New
             dict,
             "CHFModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H

@@ -68,7 +68,7 @@ public:
     (
         autoPtr,
         CHFModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C

@@ -44,7 +44,7 @@ namespace CHFModels
     (
         CHFModel,
         Zuber,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(CHFSubCoolModel, 0);
-        defineRunTimeSelectionTable(CHFSubCoolModel, dictionary);
+        defineRunTimeSelectionTable(CHFSubCoolModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::CHFSubCoolModel::New
 
     Info<< "Selecting CHFSubCoolModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::CHFSubCoolModel::New
             dict,
             "CHFSubCoolModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H

@@ -68,7 +68,7 @@ public:
     (
         autoPtr,
         CHFSubCoolModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C

@@ -44,7 +44,7 @@ namespace CHFModels
     (
         CHFSubCoolModel,
         HuaXu,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C

@@ -44,7 +44,7 @@ namespace CHFModels
     (
         CHFSubCoolModel,
         Tatsumoto,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(LeidenfrostModel, 0);
-        defineRunTimeSelectionTable(LeidenfrostModel, dictionary);
+        defineRunTimeSelectionTable(LeidenfrostModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::LeidenfrostModel::New
 
     Info<< "Selecting LeidenfrostModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::LeidenfrostModel::New
             dict,
             "LeidenfrostModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H

@@ -67,7 +67,7 @@ public:
     (
         autoPtr,
         LeidenfrostModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C

@@ -42,7 +42,7 @@ namespace LeidenfrostModels
     (
         LeidenfrostModel,
         Spiegler,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C

@@ -44,7 +44,7 @@ namespace CHFModels
     (
         MHFModel,
         Jeschar,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(MHFModel, 0);
-        defineRunTimeSelectionTable(MHFModel, dictionary);
+        defineRunTimeSelectionTable(MHFModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::MHFModel::New
 
     Info<< "Selecting MHFModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::MHFModel::New
             dict,
             "MHFModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H

@@ -67,7 +67,7 @@ public:
     (
         autoPtr,
         MHFModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C

@@ -44,7 +44,7 @@ namespace TDNBModels
     (
         TDNBModel,
         Schroeder,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C

@@ -41,7 +41,7 @@ namespace TDNBModels
     (
         TDNBModel,
         Shirai,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(TDNBModel, 0);
-        defineRunTimeSelectionTable(TDNBModel, dictionary);
+        defineRunTimeSelectionTable(TDNBModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::TDNBModel::New
 
     Info<< "Selecting TDNBModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::TDNBModel::New
             dict,
             "TDNBModelType",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H

@@ -67,7 +67,7 @@ public:
     (
         autoPtr,
         TDNBModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C

@@ -47,7 +47,7 @@ namespace departureDiameterModels
     (
         departureDiameterModel,
         KocamustafaogullariIshii,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C

@@ -42,7 +42,7 @@ namespace departureDiameterModels
     (
         departureDiameterModel,
         TolubinskiKostanchuk,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C

@@ -35,7 +35,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(departureDiameterModel, 0);
-        defineRunTimeSelectionTable(departureDiameterModel, dictionary);
+        defineRunTimeSelectionTable(departureDiameterModel, reactingEuler);
     }
 }
 
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::departureDiameterModel::New
 
     Info<< "Selecting departureDiameterModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::departureDiameterModel::New
             dict,
             "departureDiameterModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H

@@ -68,7 +68,7 @@ public:
     (
         autoPtr,
         departureDiameterModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C

@@ -46,7 +46,7 @@ namespace departureFrequencyModels
     (
         departureFrequencyModel,
         Cole,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C

@@ -35,7 +35,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(departureFrequencyModel, 0);
-        defineRunTimeSelectionTable(departureFrequencyModel, dictionary);
+        defineRunTimeSelectionTable(departureFrequencyModel, reactingEuler);
     }
 }
 
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New
 
     Info<< "Selecting departureFrequencyModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::departureFrequencyModel::New
             dict,
             "departureFrequencyModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H

@@ -68,7 +68,7 @@ public:
     (
         autoPtr,
         departureFrequencyModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C

@@ -44,7 +44,7 @@ namespace filmBoilingModels
     (
         filmBoilingModel,
         BreenWestwater,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C

@@ -45,7 +45,7 @@ namespace filmBoilingModels
     (
         filmBoilingModel,
         Bromley,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(filmBoilingModel, 0);
-        defineRunTimeSelectionTable(filmBoilingModel, dictionary);
+        defineRunTimeSelectionTable(filmBoilingModel, reactingEuler);
     }
 }
 
@@ -51,7 +51,7 @@ Foam::wallBoilingModels::filmBoilingModel::New
 
     Info<< "Selecting filmBoilingModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -60,7 +60,7 @@ Foam::wallBoilingModels::filmBoilingModel::New
             dict,
             "filmBoilingModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H

@@ -67,7 +67,7 @@ public:
     (
         autoPtr,
         filmBoilingModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C

@@ -44,7 +44,7 @@ namespace nucleateFluxModels
     (
         nucleateFluxModel,
         Kutadeladze,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C

@@ -44,7 +44,7 @@ namespace nucleateFluxModels
     (
         nucleateFluxModel,
         exponential,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C

@@ -34,7 +34,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(nucleateFluxModel, 0);
-        defineRunTimeSelectionTable(nucleateFluxModel, dictionary);
+        defineRunTimeSelectionTable(nucleateFluxModel, reactingEuler);
     }
 }
 
@@ -50,7 +50,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
 
     Info<< "Selecting nucleateFluxModel: " << modelType << endl;
 
-    auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
+    auto cstrIter = reactingEulerConstructorTablePtr_->cfind(modelType);
 
     if (!cstrIter.found())
     {
@@ -59,7 +59,7 @@ Foam::wallBoilingModels::nucleateFluxModel::New
             dict,
             "nucleateFluxModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H

@@ -65,7 +65,7 @@ public:
     (
         autoPtr,
         nucleateFluxModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C

@@ -42,7 +42,7 @@ namespace nucleationSiteModels
     (
         nucleationSiteModel,
         LemmertChawla,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C

@@ -35,7 +35,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(nucleationSiteModel, 0);
-        defineRunTimeSelectionTable(nucleationSiteModel, dictionary);
+        defineRunTimeSelectionTable(nucleationSiteModel, reactingEuler);
     }
 }
 
@@ -52,7 +52,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New
 
     Info<< "Selecting nucleationSiteModel: " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -61,7 +61,7 @@ Foam::wallBoilingModels::nucleationSiteModel::New
             dict,
             "nucleationSiteModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H

@@ -69,7 +69,7 @@ public:
     (
         autoPtr,
         nucleationSiteModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C

@@ -42,7 +42,7 @@ namespace partitioningModels
     (
         partitioningModel,
         Lavieville,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C

@@ -42,7 +42,7 @@ namespace partitioningModels
     (
         partitioningModel,
         cosine,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C

@@ -42,7 +42,7 @@ namespace partitioningModels
     (
         partitioningModel,
         linear,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C

@@ -35,7 +35,7 @@ namespace Foam
     namespace wallBoilingModels
     {
         defineTypeNameAndDebug(partitioningModel, 0);
-        defineRunTimeSelectionTable(partitioningModel, dictionary);
+        defineRunTimeSelectionTable(partitioningModel, reactingEuler);
     }
 }
 
@@ -53,7 +53,7 @@ Foam::wallBoilingModels::partitioningModel::New
     Info<< "Selecting partitioningModel: "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -62,7 +62,7 @@ Foam::wallBoilingModels::partitioningModel::New
             dict,
             "partitioningModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H

@@ -66,7 +66,7 @@ public:
     (
         autoPtr,
         partitioningModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict
         ),

src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C

@@ -42,7 +42,7 @@ namespace partitioningModels
     (
         partitioningModel,
         phaseFraction,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C

@@ -41,7 +41,7 @@ namespace diameterModels
     (
         diameterModel,
         constant,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C

@@ -33,7 +33,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(diameterModel, 0);
-    defineRunTimeSelectionTable(diameterModel, dictionary);
+    defineRunTimeSelectionTable(diameterModel, reactingEuler);
 }
 
 
@@ -66,7 +66,7 @@ Foam::diameterModel::New
         << ": "
         << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -75,7 +75,7 @@ Foam::diameterModel::New
             dict,
             "diameterModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H

@@ -74,7 +74,7 @@ public:
         (
             autoPtr,
             diameterModel,
-            dictionary,
+            reactingEuler,
             (
                 const dictionary& dict,
                 const phaseModel& phase

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C

@@ -41,7 +41,7 @@ namespace diameterModels
     (
         diameterModel,
         isothermal,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C

@@ -43,7 +43,7 @@ namespace diameterModels
     (
         diameterModel,
         linearTsub,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C

@@ -44,7 +44,7 @@ namespace diameterModels
     (
         diameterModel,
         velocityGroup,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H

@@ -203,7 +203,7 @@ public:
     (                                                                          \
         interfaceCompositionModel,                                             \
         Type##Thermo##OtherThermo,                                             \
-        dictionary                                                             \
+        reactingEuler                                                          \
     )
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C

@@ -35,7 +35,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(interfaceCompositionModel, 0);
-    defineRunTimeSelectionTable(interfaceCompositionModel, dictionary);
+    defineRunTimeSelectionTable(interfaceCompositionModel, reactingEuler);
 }
 
 
@@ -74,7 +74,7 @@ Foam::interfaceCompositionModel::New
     Info<< "Selecting interfaceCompositionModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -83,7 +83,7 @@ Foam::interfaceCompositionModel::New
             dict,
             "interfaceCompositionModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H

@@ -83,7 +83,7 @@ public:
         (
             autoPtr,
             interfaceCompositionModel,
-            dictionary,
+            reactingEuler,
             (
                 const dictionary& dict,
                 const phasePair& pair

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C

@@ -36,7 +36,7 @@ namespace Foam
 namespace massTransferModels
 {
     defineTypeNameAndDebug(Frossling, 0);
-    addToRunTimeSelectionTable(massTransferModel, Frossling, dictionary);
+    addToRunTimeSelectionTable(massTransferModel, Frossling, reactingEuler);
 }
 }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C

@@ -36,7 +36,7 @@ namespace Foam
 {
     defineTypeNameAndDebug(massTransferModel, 0);
     defineBlendedInterfacialModelTypeNameAndDebug(massTransferModel, 0);
-    defineRunTimeSelectionTable(massTransferModel, dictionary);
+    defineRunTimeSelectionTable(massTransferModel, reactingEuler);
 }
 
 const Foam::dimensionSet Foam::massTransferModel::dimK(0, -2, 0, 0, 0);
@@ -68,7 +68,7 @@ Foam::massTransferModel::New
     Info<< "Selecting massTransferModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -77,7 +77,7 @@ Foam::massTransferModel::New
             dict,
             "massTransferModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H

@@ -75,7 +75,7 @@ public:
         (
             autoPtr,
             massTransferModel,
-            dictionary,
+            reactingEuler,
             (
                 const dictionary& dict,
                 const phasePair& pair

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C

@@ -40,7 +40,7 @@ namespace massTransferModels
     (
         massTransferModel,
         sphericalMassTransfer,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C

@@ -43,7 +43,7 @@ namespace surfaceTensionModels
     (
         surfaceTensionModel,
         constantSurfaceTensionCoefficient,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C

@@ -36,7 +36,7 @@ namespace Foam
 namespace reactingMultiphaseEuler
 {
     defineTypeNameAndDebug(surfaceTensionModel, 0);
-    defineRunTimeSelectionTable(surfaceTensionModel, dictionary);
+    defineRunTimeSelectionTable(surfaceTensionModel, reactingEuler);
 }
 }
 
@@ -83,7 +83,7 @@ Foam::reactingMultiphaseEuler::surfaceTensionModel::New
     Info<< "Selecting surfaceTensionModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -92,7 +92,7 @@ Foam::reactingMultiphaseEuler::surfaceTensionModel::New
             dict,
             "surfaceTensionModel",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H

@@ -79,7 +79,7 @@ public:
     (
         autoPtr,
         surfaceTensionModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict,
             const phasePair& pair,

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C

@@ -40,7 +40,7 @@ namespace aspectRatioModels
     (
         aspectRatioModel,
         TomiyamaAspectRatio,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C

@@ -40,7 +40,7 @@ namespace aspectRatioModels
     (
         aspectRatioModel,
         VakhrushevEfremov,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C

@@ -40,7 +40,7 @@ namespace aspectRatioModels
     (
         aspectRatioModel,
         Wellek,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C

@@ -34,7 +34,7 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(aspectRatioModel, 0);
-    defineRunTimeSelectionTable(aspectRatioModel, dictionary);
+    defineRunTimeSelectionTable(aspectRatioModel, reactingEuler);
 }
 
 
@@ -64,7 +64,7 @@ Foam::aspectRatioModel::New
     Info<< "Selecting aspectRatioModel for "
         << pair << ": " << modelType << endl;
 
-    auto* ctorPtr = dictionaryConstructorTable(modelType);
+    auto* ctorPtr = reactingEulerConstructorTable(modelType);
 
     if (!ctorPtr)
     {
@@ -73,7 +73,7 @@ Foam::aspectRatioModel::New
             dict,
             "swarmCorrection",
             modelType,
-            *dictionaryConstructorTablePtr_
+            *reactingEulerConstructorTablePtr_
         ) << abort(FatalIOError);
     }
 

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H

@@ -74,7 +74,7 @@ public:
     (
         autoPtr,
         aspectRatioModel,
-        dictionary,
+        reactingEuler,
         (
             const dictionary& dict,
             const phasePair& pair

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C

@@ -40,7 +40,7 @@ namespace aspectRatioModels
     (
         aspectRatioModel,
         constantAspectRatio,
-        dictionary
+        reactingEuler
     );
 }
 }

src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C

@@ -37,7 +37,7 @@ namespace Foam
 namespace dragModels
 {
     defineTypeNameAndDebug(AttouFerschneider, 0);
-    addToRunTimeSelectionTable(dragModel, AttouFerschneider, dictionary);
+    addToRunTimeSelectionTable(dragModel, AttouFerschneider, reactingEuler);
 }
 }