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);
     }