diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
index d3667c5204dd6d8aada4066069085768afc1784c..95ed9e57a1e86cd2f687f5520d577a5bb92fb1cf 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
index 976ec0569b3f856190f5d8e9f34d0167a6f1f781..d3802d7bf202bd63ab6b92bd8d0bcb88e3723914 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
index 485cf7102169fcc01855b86879bc45793b5a6bb6..c92de6e449568393a8c74c613a743482082c4ac0 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index fb455ea84bf1966e8adb26a5ac15e7ee3e696ac9..90fe725ebff312835457d24b5181778ae379859e 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index 2253ff6af64edd2e4352219002f05eca55598dd5..260eb5f29a380912167e46c848bc1922f0cc88ba 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
Ergun,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index 4adb0956ac990bb9659ba95ace59a4024230887b..e6013078669acd5a04f4b7ecdfa2b2ffa0b21999 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
Gibilaro,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index c1193fdd28edbbd396903f118b6ce487272696e4..ff0aeacd1960d14cd78a5d275d90cdb4e944ac4e 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
GidaspowErgunWenYu,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index db2659ade9e8c1b82abe7f9d2922a8be9afe25ef..aa11b0cfc90e6c31639a6371e75c6eb00f6bd9f3 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
GidaspowSchillerNaumann,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 0190f746f8e55489406591de7ef7491b9db5013d..4438ab2268c00c1f22bcdb59bf55cff0b037912c 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
SchillerNaumann,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 8c29ad32b19ca722c142cd1d72f51e19e202afdd..db52065cad053460ba2721ada65a35f3f3cafe85 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
SyamlalOBrien,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index 4b6722a8e6c9816797afed284111d0e2db9a5828..fae18b5075c6669aaf2f8b99ede195cd4160b0e0 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
WenYu,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
index c54bf672b8f0ab984f56d0418074b96cde972f6c..d8c266ecd56d793b3e67bd67eb4c659357a62e10 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/blended/blended.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
blended,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 29ad59478c615c31711bacee944f6692082a6b3a..5606c32b1cfcf149fc4c960e884adaa7a556c67f 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 54c21a876d99b4fc4f846b377a1954c4e808533b..ebae3e3f35574112faa0c6ea224a311da570140a 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& interfaceDict,
const phaseModel& phase1,
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
index 24f6c4afb2baf6117fdf155ee138217b3827d175..8d4ab0f270c376dc28656b2f5c9959777ebe97bf 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/dragModels/interface/interface.C
@@ -43,7 +43,7 @@ namespace dragModels
(
dragModel,
interface,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index c8b1c26167251ce7206e00833575919201ed087a..6a1949ce9dca5a032244a39758f4ced40108f62e 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -43,7 +43,7 @@ namespace heatTransferModels
(
heatTransferModel,
RanzMarshall,
- dictionary
+ multiphaseEuler
);
}
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 4a310001b77084106591180cea8afb4c4ce9f490..d378df187d73df160273d041eaf523e49c334803 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index f1e8cb7c278d0b5d289e77d656c1e32f81d2a011..6374998dc450118f8302c5ad60516d6ccf7e32f6 100644
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ multiphaseEuler,
(
const dictionary& dict,
const volScalarField& alpha1,
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
index 0e3171b3b39703637f2fea98410aa85447b93194..87759896f36893e593cdfdd18b219956c0c16ddf 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -269,7 +269,7 @@ public:
( \
interfaceCompositionModel, \
Type##Thermo##OtherThermo, \
- dictionary \
+ multiphaseInter \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C
index d457dff34466ce0aa6f919be3bf961b8adb10864..68a11df470ab154ab7b1c5d21ba16d4240481f0c 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
index 3b6d64641c1fc37d0fd87ffde7c697ed9ad491f6..e0e7756a51832bfca4949045c4d691d4ee50d26d 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceCompositionModel/interfaceCompositionModel.H
@@ -113,7 +113,7 @@ public:
(
autoPtr,
interfaceCompositionModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
index 2771f3bc0c4e86f4ae481e37890f93fdf66c78d6..f09693fc2f679f0636a4061abd0013b90aa442eb 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/VollerPrakash/VollerPrakash.C
@@ -40,7 +40,7 @@ namespace porousModels
(
porousModel,
VollerPrakash,
- dictionary
+ multiphaseInter
);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C
index 8a22281d4720399819e063e90a2054beb294be5a..b450e23a23efdcdb8f1e7de87b7e5614dbef4227 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
index 3fb3aa332df44f110953e05f518ddd3de64ca4bb..ffa0e28ea1c7b4151cbb74d238df3f72422c1cbb 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/porousModels/porousModel/porousModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
porousModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const fvMesh& mesh
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index bb4970e78fee42d8d6f174f2d9fcec06665c18fa..668a3b7c71cd764b0865b80cbc17c549d2a49584 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -42,7 +42,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
- dictionary
+ multiphaseInter
);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
index 9f6a0c68fc1a3bfe8f27fcf233e1583d69e67b63..e46d8c8790855f68d708f0250a12be28de96e540 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 1d7bce291a214db4e9c659bfe3b04cff4beffc95..5eeb5446ea3ed691f72e80e874ec9b9b57653859 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/interfaceModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
surfaceTensionModel,
- dictionary,
+ multiphaseInter,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
index ffda1f535a1361be079435dfcd868b7d8df88de5..9ace95d827e0f6cb9fc5a7b98524f7be279ed6bc 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.C
@@ -51,7 +51,7 @@ namespace Foam
namespace multiphaseInter
{
defineTypeNameAndDebug(multiphaseSystem, 0);
- defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+ defineRunTimeSelectionTable(multiphaseSystem, multiphaseInter);
}
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
index 4cf77007c784ae9d8fc178a62fdf9482cbecba70..48cc6791832e237f7be4b63ee7036488cd335d4c 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystem.H
@@ -106,7 +106,7 @@ public:
(
autoPtr,
multiphaseSystem,
- dictionary,
+ multiphaseInter,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
index 191af99c2ecb93f7543ccc70a124ff51a211ae58..cd3e26f90cb9dd067fac9eb4a45afbf2c682586b 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
index f772cbb8343a6bbd853f9de8d3f533f93036fff0..9f4ca5935fea2517abc9537fe7a8438e1cb07fba 100644
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseSystem/multiphaseSystems.C
@@ -43,7 +43,7 @@ namespace Foam
(
multiphaseSystem,
massTransferMultiphaseSystem,
- dictionary,
+ multiphaseInter,
massTransferMultiphaseSystem
);
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
index ce807a4c35a05c2e7c68fba31e48e49dbe8920ed..87d63b5760e155a3a92a46d9cc2ddd0bfe8b7da5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
index 0a47d158d96f8c5d591515bceffd972cb627caf0..8d5aa0817ba01139c23e55b0b8d3c8c6c737c2e7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
@@ -63,7 +63,7 @@ public:
(
autoPtr,
blendingMethod,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const wordList& phaseNames
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
index a1c01f11064eafa18990a65e10ebfed0d5a823dd..498e895042e35d213a8600694609b93e46aa7fde 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
hyperbolic,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index 78a3dcc6d0f405d155863e6d77631f038c2c38ab..e2f3c8c3b12158fcd80814810f37272c5d303f42 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
index 9057336a1591d7175f97364922c81ad49c41db76..e53b5d654e09280b053eb6c5b3d334a24efec8c8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
@@ -41,7 +41,7 @@ namespace blendingMethods
(
blendingMethod,
noBlending,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C
index 3e2d745b44f8be80f735f282ac482b9c65cff80a..884112810c4855a5af3de68a1e4e08d30009376f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
index de4010aef2f91ae8a5ea553a91816c411127b794..1cb6c7ade6f0c60c36936d0f1855422e3efa9195 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/CHFModel/CHFModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
CHFModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
index 78740a8ec5c6a75cd83fbae02d83e7bb14304040..38bd957323c3385a5ea12e4a65acb3286e90104a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFModels/Zuber/Zuber.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFModel,
Zuber,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C
index e4572905196c0146880ea8975be541d239e4d0c1..7db3d29c673e85477b28a70710cd933733ab43b6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
index cc6f66ec9dcbcdd303f1afba6e9a0378eb922fd0..8587856437f61d71cfb245d75fea38deeb415eb9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/CHFSubCoolModel/CHFSubCoolModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
CHFSubCoolModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
index 2e6448ccdad0140d82b2f0bd839012f2786cdc65..f7a5ad1c67b2f364e9e06eb8c48b632aef4e2896 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/HuaXu/HuaXu.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFSubCoolModel,
HuaXu,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
index d516e27152afe56b361e0595573cbc79267eb5dd..fb6c9580ea2b607ad950b4da19d611d538ff46fe 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/CHFSubCoolModels/Tatsumoto/Tatsumoto.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
CHFSubCoolModel,
Tatsumoto,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C
index f9135c58144ba1d23c372e199a909ab12b723722..9f6a1a7d84acefaca19a7f9de1bd01507ff22401 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
index 95c65bf0e34e6b9c68d452149b47e63b3ea50ed5..b25de923d220cbed302b9cd2b429692e1f688592 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/LeidenfrostModel/LeidenfrostModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
LeidenfrostModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
index 7ced6beb024e21b6d2fe6dcb12892aa2558c6312..fe43305f5dc48f60912acf0b1734cf5f6efefda7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/LeidenfrostModels/Spiegler/Spiegler.C
@@ -42,7 +42,7 @@ namespace LeidenfrostModels
(
LeidenfrostModel,
Spiegler,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
index e0c929f6dd97e5912937cc33b45b0ec2955cc311..6e12bd506155c75150dd7c02c145e5b6de7b9f52 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/Jeschar/Jeschar.C
@@ -44,7 +44,7 @@ namespace CHFModels
(
MHFModel,
Jeschar,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C
index 268109c4c81be6a5f91bb0f2858d25e01e8874fa..6f48e9ea1e26c2d71884f5a88548977b0bfe4458 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
index db0ac6fba722417610d26b9dfd1aa9480bfc6ee9..da16226e42876a4e4ab9348dea5aa26159fd9428 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/MHFModels/MHFModel/MHFModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
MHFModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
index f2b9d9e5c8d378501da9ad2c103dcc286904a3a7..3477968d49beb1db8287627af18e5a6c6a46beb7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Schroeder/Schroeder.C
@@ -44,7 +44,7 @@ namespace TDNBModels
(
TDNBModel,
Schroeder,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
index d8e1700687c1ca4272a8f25781726e9b796067cc..caabe4d4158dd2889a5732f12d422ee31ebf7b12 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/Shirai/Shirai.C
@@ -41,7 +41,7 @@ namespace TDNBModels
(
TDNBModel,
Shirai,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C
index ac8277cb2edca4e9db6af37a89bd04fa44281f76..0f4358d724f8afec63c63564cf25619edf04f683 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
index af7a30c6580786a959b5f9be547a3b7f2abbdb3f..082cc063630a02f4d2da14c8e2cf904cbd4601d9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/TDNBModels/TDNBModel/TDNBModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
TDNBModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
index ef3bbfe84b2258215123e3f76b5ae06058ea6e05..c337c0732efc8a21191f4ed701847119e34cf347 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/KocamustafaogullariIshii/KocamustafaogullariIshii.C
@@ -47,7 +47,7 @@ namespace departureDiameterModels
(
departureDiameterModel,
KocamustafaogullariIshii,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
index 9ee761d9387b77f7c5d024b4b1c8a4d521c5f3b3..6e0d872f8e7a8d790a618f60ed356daa912c1773 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/TolubinskiKostanchuk/TolubinskiKostanchuk.C
@@ -42,7 +42,7 @@ namespace departureDiameterModels
(
departureDiameterModel,
TolubinskiKostanchuk,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
index 0636fd64a1dce8a07863c89b78d62e23f3c210fe..3d678d37c7fe230438cf2e7a1ce82347175e7a21 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
index 8570a1ab778b5e232d50424cfc699893f79e54de..271bb55792bd96c71005b336c4cd56e8ea0d8712 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureDiameterModels/departureDiameterModel/departureDiameterModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
departureDiameterModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
index 3369122593ac39c68bac3bfcff030aadcbedc299..06cd733dda33bd90c7690ba93479ccf914031b52 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/Cole/Cole.C
@@ -46,7 +46,7 @@ namespace departureFrequencyModels
(
departureFrequencyModel,
Cole,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
index 70109170303c9231bf5f5858aedb9fc0ba77c498..0b546df39736ccdeab42dad3b89fe4fff2278f35 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
index 6a013cda496a4b67fce79d4b6ec6258d2c43669c..bf2df7e4c662f5cba5ec8ebc3668e4e5418ef023 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/departureFrequencyModels/departureFrequencyModel/departureFrequencyModel.H
@@ -68,7 +68,7 @@ public:
(
autoPtr,
departureFrequencyModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
index c916bdc05ccb2d38fd8c93d751021bcde82774ce..15a187f86b0ae4d1d7b3c03d468ee16823456a20 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/BreenWestwater/BreenWestwater.C
@@ -44,7 +44,7 @@ namespace filmBoilingModels
(
filmBoilingModel,
BreenWestwater,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
index ca421a779e4a0a52366ab3a5ef120680b04f183e..bc46e4eda7079e3e732a7a19dbed318614858933 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/Bromley/Bromley.C
@@ -45,7 +45,7 @@ namespace filmBoilingModels
(
filmBoilingModel,
Bromley,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C
index 2ffcfea4d9887d5aaa566d60a080948c8323c992..7812c6e6b3402b29afc6a5b1a4e31c1752d1e228 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
index 83a3f2a4a3ac1bda857fb5eda5610551ba38b367..ee819f8d9f9709da7bb674968915839b91a727e9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/filmBoilingModels/filmBoilingModel/filmBoilingModel.H
@@ -67,7 +67,7 @@ public:
(
autoPtr,
filmBoilingModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
index f30f59a0e784da593996ddff0cf2d6eef1af9147..c21411b5dc91e47ac30b5397cda9db51fbd7953c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/Kutadeladze/Kutadeladze.C
@@ -44,7 +44,7 @@ namespace nucleateFluxModels
(
nucleateFluxModel,
Kutadeladze,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
index 5ebf3142286b8e7ef9776a24878bb5f8d60a1bdc..d6b91853d4f260a129c453962e558f4046d25437 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/exponential/exponential.C
@@ -44,7 +44,7 @@ namespace nucleateFluxModels
(
nucleateFluxModel,
exponential,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
index d50e7e4ed929a7682fe2a0c74b48e2d8f9ae0752..c32fea24dd7ce264c40ba7b7793ce461ead1f017 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
index 952c3d75ac7a00727945d91ac275ea5cb9170ea5..1cc7da2fdff9546c58f68a7205ee4b0405d5b99f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleateFluxModels/nucleateFluxModel/nucleateFluxModel.H
@@ -65,7 +65,7 @@ public:
(
autoPtr,
nucleateFluxModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
index 8090158f85ee6722652287a8a173823a0659ac44..861a722b6ddbb341d40a424ad67e89f176d6258b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/LemmertChawla/LemmertChawla.C
@@ -42,7 +42,7 @@ namespace nucleationSiteModels
(
nucleationSiteModel,
LemmertChawla,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
index e6cf913c11986ec71f21b1dabf533edc7675cc58..fdd647e47137c07a304ee478c1300f79d48c5cc7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
index 3c35468fd2e2523b80a55d654c6d7229abd70437..79d7bb3b8696bc655627c76097460a5b2d5e2d20 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/nucleationSiteModels/nucleationSiteModel/nucleationSiteModel.H
@@ -69,7 +69,7 @@ public:
(
autoPtr,
nucleationSiteModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
index 7eafe8cfe48dfae32bc2381f5283cc491f2445f7..a8ef4e1b5d407906d471b3b0cc6c3be90d51c852 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/Lavieville/Lavieville.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
Lavieville,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
index 38882a966e50ab46608ffea9d48facdb5c41aa6f..0fabffeeffbd0599d49db833f5fe6afe8ff50623 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/cosine/cosine.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
cosine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
index 05228fafd60e58441764b8873d6474410f7ddef3..c34002182f7ab7e86d7638a28cf9fb3eed003744 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/linear/linear.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
index c56b69db71cb1201c6b153329b28dc8095548b79..af8643d59c184b66cd0b9aae7abafa2cdbdc89a6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
index 1de2bf75483c1fa11bd8327217794673b963d5cd..81f0aedf816955a7fb4b40133952cce408cd9959 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/partitioningModel/partitioningModel.H
@@ -66,7 +66,7 @@ public:
(
autoPtr,
partitioningModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
index 8530ea3098ee9492777f51725c65f424d535e07d..e227a27380c50f9edf8ec7f0a98bb3ec02797952 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/wallBoilingSubModels/partitioningModels/phaseFraction/phaseFraction.C
@@ -42,7 +42,7 @@ namespace partitioningModels
(
partitioningModel,
phaseFraction,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
index 8ec8a8be023cbb26768f7a151bc689a4faa2ae19..ce51e12c38cdda83b3b7d39f13ab10d9b655a7cc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -41,7 +41,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
index 02d716b849e9856810f1a78dbea062b2e10bc192..aebbaf9391bde10b3296da6244eaf5720a83535e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
index 8923468bfd59ba030c3aad9eadc6bfb8cb58d494..50d509c308fc8d7fcabeff65bb0c48058e2db49a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index 69880fb9c70b0dcf9cefaefbf1ebfbcdd9b4bd67..7eaa8f91176f3e6c52ffa200a77b10bda6572035 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -41,7 +41,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
index fb914231371653e45790267580ac9d34b4111187..86521740f13ee9c056ba80158406d83717de54fd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/linearTsubDiameter/linearTsubDiameter.C
@@ -43,7 +43,7 @@ namespace diameterModels
(
diameterModel,
linearTsub,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
index 15e50d8b8f1b1883820450aa6d96021593206efe..8864d4ae5ff756552df80c58c08de6ac9638b1a5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/diameterModels/velocityGroup/velocityGroup.C
@@ -44,7 +44,7 @@ namespace diameterModels
(
diameterModel,
velocityGroup,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
index f87c7e51b0f4cc6ac54d4dcdff084e59529d88b7..7db54d54ebad9982062be5cb065b787782849870 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.H
@@ -203,7 +203,7 @@ public:
( \
interfaceCompositionModel, \
Type##Thermo##OtherThermo, \
- dictionary \
+ reactingEuler \
)
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
index 9b4281099948da8bd31f034d8fcdc76ad3898af0..292d1409347fdc880072c2593c989b5c890aa304 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
index b0472ecc1d58717ec765b60a674a5fb8b87414b8..9b21cdec5a9167845c42f13358d139a989c0fadd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.H
@@ -83,7 +83,7 @@ public:
(
autoPtr,
interfaceCompositionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
index 895e27ccf078d538ecfde41d00f8628229f89369..4565cce0937a82367cd0348683ed350b986c90c4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
+++ b/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);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
index 8486fd836d73376ee7e4e4cf987e1d7bf9a777a1..0cdcb766db19a197a5a7b7a2e16ccdf038444b3c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
index 7ae44c25f74080b63c50a56318cf8055382ff8ff..a1d3451e4828f56a73c131d0c58e3d0ad72bfacb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/massTransferModel/massTransferModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
massTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
index f13ddc17195ec784f2749624bb8a6dc11a2a3097..59f382bf57a076acaea8137367920884842833e9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
@@ -40,7 +40,7 @@ namespace massTransferModels
(
massTransferModel,
sphericalMassTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index 56e7d5541249023256d2f87ceb98ff7664cbad34..566193b12986c5ce23676072194406aed8685af5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -43,7 +43,7 @@ namespace surfaceTensionModels
(
surfaceTensionModel,
constantSurfaceTensionCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
index 4d4e05ce699259dfec1702bf7765a131118c647c..20e3b43d760084ebdc0d31688d3bb12c5b524334 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
index 29b27e9529eb3a5bd0fc88907a216017010b346f..429aa2ab864a60ac52a44bb1d8b545a52bf958ce 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.H
@@ -79,7 +79,7 @@ public:
(
autoPtr,
surfaceTensionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
index 17d4bc91c0271b77c727d3de758d33efc8d4a180..183608f58e450e9feb0bdd0cc5722f91066a2213 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
TomiyamaAspectRatio,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
index cba225f22e8797cc7196df5f703fb49811677882..9c6dfabc80395180cb79116ccc0554955258f03b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
VakhrushevEfremov,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
index eb657ceaae79f264776106cae1164e77805afbef..d1695769cc10ca01f0aa3d796bc8776b3d637b4f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
Wellek,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
index 7eb974d5f7b9b6fd3f55f00f52a5b3519621d5b3..fe466f18eae03143035745762c2746357fcd093c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
+++ b/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);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
index 65f55286c674cb7a286103ccc43cb5fecf068154..258c8d8740c74fe4501c991d822cf9cc58ec96e6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
aspectRatioModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index 9b38688cdc9649b4f72c18d84f7c4b19949b8217..afdfbbcb9bcb944a0ac2dd19cee02a2a9a473c3e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
constantAspectRatio,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C
index 35ebf46c5df49312117c49f64ee2cad55315b47d..fa333d242a211af8509db9f77504ea2c69ae60f6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/AttouFerschneider/AttouFerschneider.C
+++ b/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);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
index 180ff487fddaa4876004aa57fa67439c41c40bfc..7e4e3817dd1b893ee5fc60aa32b6d7054663eb5f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Beetstra/Beetstra.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Beetstra, 0);
- addToRunTimeSelectionTable(dragModel, Beetstra, dictionary);
+ addToRunTimeSelectionTable(dragModel, Beetstra, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index fdf321291bd9b212900922abba72ef8f278e2ae6..798ded342a95f2abc3bd8fc9ed530306bb66024e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Ergun, 0);
- addToRunTimeSelectionTable(dragModel, Ergun, dictionary);
+ addToRunTimeSelectionTable(dragModel, Ergun, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index cda3832579a6959db1a0f2d6f7a792a0f93761cf..0ce9b1ea1c58191a030d80d4edf6ac555973bc10 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Gibilaro, 0);
- addToRunTimeSelectionTable(dragModel, Gibilaro, dictionary);
+ addToRunTimeSelectionTable(dragModel, Gibilaro, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index c8ee872db5ed68f7f093c3e6a98bb591d52055d3..6d876441c66667dbdadaae0d1bddfd24ed361410 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -38,7 +38,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowErgunWenYu, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index a1ec93ee354d5cf8235bad51adc7cf5653423b80..6f577e932cc9e1ab910f22a18805f4668c02dd22 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowSchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 8946f1093d47b9ca5713296c5fd5d242c446bc90..c32df4136228cd3780dcbead2734ed8aab8e8e5a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(IshiiZuber, 0);
- addToRunTimeSelectionTable(dragModel, IshiiZuber, dictionary);
+ addToRunTimeSelectionTable(dragModel, IshiiZuber, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
index 08e5cc32f291fb08083a38150c27edf97c9ecf54..d861ed45bcda4f0c72cc22b89c7a1f031c4ce7cd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Lain/Lain.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Lain, 0);
- addToRunTimeSelectionTable(dragModel, Lain, dictionary);
+ addToRunTimeSelectionTable(dragModel, Lain, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 40217ede5b3e2794c841edd20975af8673a4c8cf..57dfba953d5abe8c8316d5ecdcbcadd93b929532 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, SchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, SchillerNaumann, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index e50dce981ba762260829af10548aaa22de3d3661..1d624c27211872881122749a1500d4d71f890910 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SyamlalOBrien, 0);
- addToRunTimeSelectionTable(dragModel, SyamlalOBrien, dictionary);
+ addToRunTimeSelectionTable(dragModel, SyamlalOBrien, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
index 14f98df7c5cd6820efcab1cfa2448458099cfff1..67122b8f0982316fa42afb475da795c43eb5f1f0 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/Tenneti/Tenneti.C
@@ -37,7 +37,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Tenneti, 0);
- addToRunTimeSelectionTable(dragModel, Tenneti, dictionary);
+ addToRunTimeSelectionTable(dragModel, Tenneti, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index d7fd59103c33876aa5e768f0387ad6da0917f276..7f42bc48f50fde818755ea82b8e8d3ae8e295aef 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaAnalytic, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index 1863f9e38a7f142056ec0f0b34a1e17f3da2cab1..02246547f11ee2d79d3591d829fe664739bc522d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaCorrelated, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
index abd95bbb979bccc4a55dcfb41a77d6714fd6be3d..6d2ecb75de82e52120d241b455c0362478eba9d8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/TomiyamaKataokaZunSakaguchi/TomiyamaKataokaZunSakaguchi.C
@@ -40,7 +40,7 @@ namespace dragModels
(
dragModel,
TomiyamaKataokaZunSakaguchi,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index b60bafd71da8b63af5ca946141d4d511fb97fae8..99340ce1ddd8b0f01431f17ecc8b84964aa867bc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(WenYu, 0);
- addToRunTimeSelectionTable(dragModel, WenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, WenYu, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 27eaf3b0d9a58bc7674b264011ef2a364c3b5655..caf31f478ccdef22b0188711c2506f22775b14a1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
@@ -38,7 +38,7 @@ namespace Foam
{
defineTypeNameAndDebug(dragModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(dragModel, 0);
- defineRunTimeSelectionTable(dragModel, dictionary);
+ defineRunTimeSelectionTable(dragModel, reactingEuler);
}
const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0);
@@ -113,7 +113,7 @@ Foam::dragModel::New
Info<< "Selecting dragModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -122,7 +122,7 @@ Foam::dragModel::New
dict,
"dragModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 660662e2ef270b7bfebd1fc61b787dd0591106bc..f8d568d26e7e607aeb3cf12f3825a13f08544924 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
index 3f96b5353e774852d55c9a4d31ef7d3a6247522d..0b03aa84526d498647de7d6ba46b2c1595d30b1d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -39,7 +39,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(segregated, 0);
- addToRunTimeSelectionTable(dragModel, segregated, dictionary);
+ addToRunTimeSelectionTable(dragModel, segregated, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index e87d53306c7b8c1b71ef480b5fdef791436bbb9e..b6bf5761b8b31c680a6300b860dfc5403f82dfaa 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -36,7 +36,7 @@ namespace Foam
namespace heatTransferModels
{
defineTypeNameAndDebug(RanzMarshall, 0);
- addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, dictionary);
+ addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
index 47bab24e7842270c6e114d9c5ecd13402a1150a3..505aee53acf903478060182742c175ba64e13839 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/constantNu/constantNuHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
constantNuHeatTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index 4dfa443d59cc1fc533e1966352b299abd59e2e15..f820d913dca2b5825635ac430e5728d6f35af695 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -36,7 +36,7 @@ namespace Foam
{
defineTypeNameAndDebug(heatTransferModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(heatTransferModel, 0);
- defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineRunTimeSelectionTable(heatTransferModel, reactingEuler);
}
const Foam::dimensionSet Foam::heatTransferModel::dimK(1, -1, -3, -1, 0);
@@ -79,7 +79,7 @@ Foam::heatTransferModel::New
Info<< "Selecting heatTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -88,7 +88,7 @@ Foam::heatTransferModel::New
dict,
"heatTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 396e715d6c43df5c45481c18fe9401f3d4141468..664bd8afe570fc42b075289d23f0dbd3179a4975 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
index f2a50da86772d817bcd9dcaa51da405ef7cef11d..1e3b488e0d69cacacbc232b02e6e938472b0805c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
sphericalHeatTransfer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 793266b26082887f178ccfb6fdcef7d40726414b..c72be52b75e03944c201499e30050c360ceb6a44 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(LegendreMagnaudet, 0);
- addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, dictionary);
+ addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 97364b5fe888abb1ef31830fb9c59a0fcab97e85..48523236301526967ea3fb5f302c2365ddb4c865 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(Moraga, 0);
- addToRunTimeSelectionTable(liftModel, Moraga, dictionary);
+ addToRunTimeSelectionTable(liftModel, Moraga, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
index 763827cae15c7f94c3855056ad85d6fa5ac76851..3589e99e696f7b945471a466ff11fa944b0f362b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(TomiyamaLift, 0);
- addToRunTimeSelectionTable(liftModel, TomiyamaLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, TomiyamaLift, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index f9344d6816c8e639b7b0bef12af81e954f946ae3..be58edfc7f2822d2993973fef61f9ae16079e3e1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(constantLiftCoefficient, 0);
- addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, dictionary);
+ addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
index dd275ac18a733ff4116cc31ba29319f2d27ae92d..f1334f23dc0e05fd6c72fbe99317dfdbb99448fb 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
@@ -39,7 +39,7 @@ namespace Foam
{
defineTypeNameAndDebug(liftModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(liftModel, 0);
- defineRunTimeSelectionTable(liftModel, dictionary);
+ defineRunTimeSelectionTable(liftModel, reactingEuler);
}
const Foam::dimensionSet Foam::liftModel::dimF(1, -2, -2, 0, 0);
@@ -71,7 +71,7 @@ Foam::liftModel::New
Info<< "Selecting liftModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -80,7 +80,7 @@ Foam::liftModel::New
dict,
"liftModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
index a71a843f8151919e78bdc1e1f84c8ea486f5f471..6de8c375f723e565205cd8045aec7be266350a63 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
liftModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
index 1305b838170610e8dbd8856be8e3080cac8b3a8b..7e2956f5ef169f87173d471caf116c3bf9959186 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/noLift/noLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(noLift, 0);
- addToRunTimeSelectionTable(liftModel, noLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, noLift, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
index 4c4d87ee4181384acf6c20ef01e457e762c1d7e5..fba63d273341b2f32bf807503cff44fa211d3f5b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/liftModels/wallDampedLift/wallDampedLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(wallDamped, 0);
- addToRunTimeSelectionTable(liftModel, wallDamped, dictionary);
+ addToRunTimeSelectionTable(liftModel, wallDamped, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
index c29471d7afa9505ce328989eccca5be7adcaa9e9..2a65878a7ea6f9d98985fe5642028215655e8084 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/deposition/deposition.C
@@ -38,7 +38,7 @@ namespace Foam
namespace phaseTransferModels
{
defineTypeNameAndDebug(deposition, 0);
- addToRunTimeSelectionTable(phaseTransferModel, deposition, dictionary);
+ addToRunTimeSelectionTable(phaseTransferModel, deposition, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
index 0dceccfc0d3aa7b9203db70c7e9aaa3e224ce807..0389c6827e4b99f20535387e818d4b2b5b124618 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.C
@@ -36,7 +36,7 @@ namespace Foam
{
defineTypeNameAndDebug(phaseTransferModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(phaseTransferModel, 0);
- defineRunTimeSelectionTable(phaseTransferModel, dictionary);
+ defineRunTimeSelectionTable(phaseTransferModel, reactingEuler);
}
const Foam::dimensionSet Foam::phaseTransferModel::dimDmdt =
@@ -69,7 +69,7 @@ Foam::phaseTransferModel::New
Info<< "Selecting phaseTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::phaseTransferModel::New
dict,
"phaseTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
index b3ae79a3ce4035a50e0f3c9ffaa4459260b62713..94d2b5fc66431a7cd692d28fa21ed30061d03365 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/phaseTransferModels/phaseTransferModel/phaseTransferModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
phaseTransferModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index d322ef21a4c568fcb9b85c4c258e429a6bbec09c..40bf30189f51bcafdc679851abe4949ac8f7b6f3 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -40,7 +40,7 @@ namespace swarmCorrections
(
swarmCorrection,
TomiyamaSwarm,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
index 89c08a4583b615b64347ec012703ce3c4d4f3af7..a269e6639c6cf44e856b081efb398755abe74a21 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
@@ -36,7 +36,7 @@ namespace Foam
namespace swarmCorrections
{
defineTypeNameAndDebug(noSwarm, 0);
- addToRunTimeSelectionTable(swarmCorrection, noSwarm, dictionary);
+ addToRunTimeSelectionTable(swarmCorrection, noSwarm, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
index 490e7d68bb63213dba4fe6b2aba9fcce2db3aa59..78753c6a06f2ece34e25e15a0779c9574d24996e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(swarmCorrection, 0);
- defineRunTimeSelectionTable(swarmCorrection, dictionary);
+ defineRunTimeSelectionTable(swarmCorrection, reactingEuler);
}
@@ -64,7 +64,7 @@ Foam::swarmCorrection::New
Info<< "Selecting swarmCorrection for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::swarmCorrection::New
dict,
"swarmCorrection",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
index 51dfa89d54de434bed13280643849882af86fab6..35ceaf90e87c1b9b0522a351863700afcffb86ec 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
swarmCorrection,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index a691e6f3dd8047dcf76e71dc90b2e6a6f8d7a6aa..8f6b7f479e5d544b342d446bc69477083a71c1e9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Burns,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index 90d7abbf3903585d2c5e5fabd9745c90ca43784b..fb0b9b0b46ecde245098b37aa1000696900aeb75 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -42,7 +42,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Gosman,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index 27d010d6b09e53558010356f11ece51def1824cc..19efe0a00b9bbb6623e7b6fc3dfdd51166e39517 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
LopezDeBertodano,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 80cb059ffbecd77c75a909e4d2b0b73afa083b19..e8134030df65ed6727b30246a672c1d1116e1093 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
constantTurbulentDispersionCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 9c7b63ffd11adec407b8c4511342acb5e20ef999..42f0369db166773a746680af01f069968b22a5bc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -40,7 +40,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
noTurbulentDispersion,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
index dbd9b38247b009609eb443f66e69b43c753b57c8..fd8c2c377bfb7a20a5137a462186ac8e2aa79093 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
@@ -40,7 +40,7 @@ namespace Foam
{
defineTypeNameAndDebug(turbulentDispersionModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(turbulentDispersionModel, 0);
- defineRunTimeSelectionTable(turbulentDispersionModel, dictionary);
+ defineRunTimeSelectionTable(turbulentDispersionModel, reactingEuler);
}
const Foam::dimensionSet Foam::turbulentDispersionModel::dimD(1, -1, -2, 0, 0);
@@ -73,7 +73,7 @@ Foam::turbulentDispersionModel::New
Info<< "Selecting turbulentDispersionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -82,7 +82,7 @@ Foam::turbulentDispersionModel::New
dict,
"turbulentDispersionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
index 7150b01ccae8b01d8544d6aaf22de760fe678fb5..a8b8371a1439d09e85aa8f6d62da215adf841f8e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
turbulentDispersionModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index ee9c252ce47fdf5334a4a54ea3f93dc3471cc581..a538d5402d1f2d423da9f08050a9d3eeb96aad6c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
Lamb,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 47b1612dabc3e7328e6b88b6b04db6375032415d..4c1625e994a961fd73b4fea4e17b75c05db40898 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
constantVirtualMassCoefficient,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
index 10f3c281ae9c8a42725ca01a2f12e7900fb6f09b..fe438884b76cb56dd1be475efafc56f71a5de2fd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
@@ -36,7 +36,7 @@ namespace Foam
namespace virtualMassModels
{
defineTypeNameAndDebug(noVirtualMass, 0);
- addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, dictionary);
+ addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
index aeccb73157ff8126603db8caa380cdc97d1b9367..fc3fec55e94c00416bb7ba272be792bcd61c34db 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
@@ -37,7 +37,7 @@ namespace Foam
{
defineTypeNameAndDebug(virtualMassModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(virtualMassModel, 0);
- defineRunTimeSelectionTable(virtualMassModel, dictionary);
+ defineRunTimeSelectionTable(virtualMassModel, reactingEuler);
}
const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity);
@@ -82,7 +82,7 @@ Foam::virtualMassModel::New
Info<< "Selecting virtualMassModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -91,7 +91,7 @@ Foam::virtualMassModel::New
dict,
"virtualMassModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
index 10ad757b1ca9549652b617cb070f401019df52ae..cd926224e297bbc389b9f5e1793b631fdb0d1f20 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
virtualMassModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
index 25424120f9de383d52ccbb01ce06988c308ac9f8..d3250f0827e5b9efcba587409e4c8be2d47ec962 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/cosine/cosineWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
cosine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
index 90ead6f53e3ed984ef1cfdf83ab6f41737de039d..602d89eaa6b067cc9a97d3f80a97696db3c490ea 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/linear/linearWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
linear,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
index 9f9152bfc6664917914d410120b2e99240741e65..749353677c70556d86853450a8f2c973f38c0e50 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/noWallDamping/noWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
noWallDamping,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
index 12937e9e56ae1cc2992a27130a13002ea1b5d163..edc18ab3a4731a05a51aa22f45c9688c567c0e69 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/sine/sineWallDamping.C
@@ -40,7 +40,7 @@ namespace wallDampingModels
(
wallDampingModel,
sine,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
index 0b057d833435a382f5d572c13511aec082e87ada..5dd075ff8f8254d8aaa98f13fd52e725795f6c06 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(wallDampingModel, 0);
- defineRunTimeSelectionTable(wallDampingModel, dictionary);
+ defineRunTimeSelectionTable(wallDampingModel, reactingEuler);
}
const Foam::dimensionSet Foam::wallDampingModel::dimF(1, -2, -2, 0, 0);
@@ -67,7 +67,7 @@ Foam::wallDampingModel::New
Info<< "Selecting wallDampingModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -76,7 +76,7 @@ Foam::wallDampingModel::New
dict,
"wallDampingModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
index 56a089a2748f0ddacebbc49b87bf602a7e36bf41..41d6ac51803972b6466b4696c6199b43d42d09dd 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallDampingModels/wallDampingModel/wallDampingModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
wallDampingModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
index 819604f9af2bf1a8d668b76edf4edfdabc5a4bc4..3123e62595cdaa6ecce9bfbc998fdae8d6bc75d6 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Antal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
index 7553a761059961c16bf5ba7047453482901f7ed7..cef8c4ddea7bdd3529e3af41adfc03513f6c630b 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -41,7 +41,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Frank,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index 1bd56ddea00d922180cb3b87f1be39be833e4570..d90e60134454703dcbf706eddaf40643eff0d525 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
TomiyamaWallLubrication,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index e4f019b446feb007aa04e55681963717d9669b86..d559ed148d6d39a53370c37a1a66b98907f34f55 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
noWallLubrication,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index c8f7622dc20ec952e4011f689e93fa2e6b57dc97..f106220b6caffbe8bd62064d4c30827ea550d42e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -39,7 +39,7 @@ namespace Foam
{
defineTypeNameAndDebug(wallLubricationModel, 0);
defineBlendedInterfacialModelTypeNameAndDebug(wallLubricationModel, 0);
- defineRunTimeSelectionTable(wallLubricationModel, dictionary);
+ defineRunTimeSelectionTable(wallLubricationModel, reactingEuler);
}
const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0);
@@ -97,7 +97,7 @@ Foam::wallLubricationModel::New
Info<< "Selecting wallLubricationModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -106,7 +106,7 @@ Foam::wallLubricationModel::New
dict,
"wallLubricationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
index 2c72fd0505e6f3f5c1f8e402686695e86d5ba2f1..40f064165d17be51eb3355d922c24d0f25126b7d 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
@@ -84,7 +84,7 @@ public:
(
autoPtr,
wallLubricationModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
index 3b795194c94d114791fc303de771c4702f77f097..f0686351df8354722acade3031478a7d5b835235 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.C
@@ -51,7 +51,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(multiphaseSystem, 0);
- defineRunTimeSelectionTable(multiphaseSystem, dictionary);
+ defineRunTimeSelectionTable(multiphaseSystem, reactingEuler);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
index 3652477d3cb79bd9ca89f4bf07f824642f3a45e6..14cecfecb22486b4d12772bc0857f3e2e02aa0de 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystem.H
@@ -134,7 +134,7 @@ public:
(
autoPtr,
multiphaseSystem,
- dictionary,
+ reactingEuler,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
index 3baa96c41ad5e7c2a0184988dcccfd51988b08aa..59fbeb46e2b4c88157abd1497191faef1c1c27ba 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystemNew.C
@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
Info<< "Selecting multiphaseSystem " << systemType << endl;
- auto* ctorPtr = dictionaryConstructorTable(systemType);
+ auto* ctorPtr = reactingEulerConstructorTable(systemType);
if (!ctorPtr)
{
@@ -61,7 +61,7 @@ Foam::autoPtr<Foam::multiphaseSystem> Foam::multiphaseSystem::New
dict,
"multiphaseSystem",
systemType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
index 4d8c5bb70cb737c4dd60347c8a085d4ad72b0ac9..5a9b4f99397e2328fbfac15c41487f4b086a0463 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/multiphaseSystem/multiphaseSystems.C
@@ -55,7 +55,7 @@ namespace Foam
(
multiphaseSystem,
basicMultiphaseSystem,
- dictionary,
+ reactingEuler,
basicMultiphaseSystem
);
@@ -76,7 +76,7 @@ namespace Foam
(
multiphaseSystem,
interfaceCompositionPhaseChangeMultiphaseSystem,
- dictionary,
+ reactingEuler,
interfaceCompositionPhaseChangeMultiphaseSystem
);
@@ -97,7 +97,7 @@ namespace Foam
(
multiphaseSystem,
thermalPhaseChangeMultiphaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangeMultiphaseSystem
);
@@ -118,7 +118,7 @@ namespace Foam
(
multiphaseSystem,
populationBalanceMultiphaseSystem,
- dictionary,
+ reactingEuler,
populationBalanceMultiphaseSystem
);
@@ -142,7 +142,7 @@ namespace Foam
(
multiphaseSystem,
thermalPhaseChangePopulationBalanceMultiphaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangePopulationBalanceMultiphaseSystem
);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
index 05bc9e6bd12b4777a6a5d15a72559db524f17a06..73a4481010f401caba90f63e2ea7f866a45cbaec 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LehrMilliesMewes/LehrMilliesMewes.C
@@ -43,7 +43,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
LehrMilliesMewes,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
index 479b083bab344e60ecc3b217fcdafad3f903ae01..ec4bf1fda5bde677150cd3bae63d61858f145e3c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/LuoSvendsen/LuoSvendsen.C
@@ -45,7 +45,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
LuoSvendsen,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
index 16402433fe9f7dd8f3cd533acf99d7be2f5f3059..548fd9cf1ff7b9f95240e34ce9b277eca238c27c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(binaryBreakupModel, 0);
- defineRunTimeSelectionTable(binaryBreakupModel, dictionary);
+ defineRunTimeSelectionTable(binaryBreakupModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::binaryBreakupModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::binaryBreakupModel::New
dict,
"binary breakup model",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
index 8f65770a2312ca9e51a721d79c0a80c22a50aeee..99cba053ea48bb424a6f33248b0eff4bdbfc88df 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/binaryBreakupModel/binaryBreakupModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
binaryBreakupModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
index 3e646900b9fcf6d17681826f3794faaff0081fbb..a858679c30dc9eee9841fe3d076dcba9478e9295 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/binaryBreakupModels/powerLawUniformBinary/powerLawUniformBinary.C
@@ -42,7 +42,7 @@ namespace binaryBreakupModels
(
binaryBreakupModel,
powerLawUniformBinary,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
index 66753fcc72ca234faa8814a7fd0d1f5583142290..4b97659ea178c0f2c08bdfa2753b315b8bd2a1e2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/LaakkonenAlopaeusAittamaa/LaakkonenAlopaeusAittamaa.C
@@ -43,7 +43,7 @@ namespace breakupModels
(
breakupModel,
LaakkonenAlopaeusAittamaa,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
index a06980b7a8e48a9f44104e5997b950ed78bcd912..b43345d0b10f57631aa6df9a7edecda563c61b86 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(breakupModel, 0);
- defineRunTimeSelectionTable(breakupModel, dictionary);
+ defineRunTimeSelectionTable(breakupModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::breakupModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::breakupModel::New
dict,
"breakupModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
index af13733e9ceb4d16fddd9a2e4c9cfe9bc7223b9f..d9f38524ea4300c9ac4f96ec0edd827c53e7fde5 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/breakupModel/breakupModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
breakupModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
index 419c307a00b65af5f0efbaebbacc0ea713c4b67e..859705a2d566170ba8d33313d4783443cd6e1d6c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/exponential/exponential.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace breakupModels
{
defineTypeNameAndDebug(exponential, 0);
- addToRunTimeSelectionTable(breakupModel, exponential, dictionary);
+ addToRunTimeSelectionTable(breakupModel, exponential, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
index 7d9f682d1208f9dd9f12ad3f09212d0b738efe1d..40b88d0b187d73905a52a431d5c9c0d3729f30b8 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/breakupModels/powerLaw/powerLaw.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace breakupModels
{
defineTypeNameAndDebug(powerLaw, 0);
- addToRunTimeSelectionTable(breakupModel, powerLaw, dictionary);
+ addToRunTimeSelectionTable(breakupModel, powerLaw, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
index 80e028f0814b2a3772a5ee2db40c86c9a8726544..24568b594e36bc2004a1b57464f6c61337651c21 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/CoulaloglouTavlaridesCoalescence/CoulaloglouTavlaridesCoalescence.C
@@ -43,7 +43,7 @@ namespace coalescenceModels
(
coalescenceModel,
CoulaloglouTavlaridesCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
index 249a3d6ee19654375f7d33d6d11cb040185a1517..4a36d56efff5f04eb887ca0a7796d51b464ec134 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/LehrMilliesMewesCoalescence/LehrMilliesMewesCoalescence.C
@@ -44,7 +44,7 @@ namespace coalescenceModels
(
coalescenceModel,
LehrMilliesMewesCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
index c77a0b3b58068652e6fbbf39a81cc2e4389f2da7..35221cfa7031d8e32f5984e3b888f5abbce2f378 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/Luo/Luo.C
@@ -46,7 +46,7 @@ namespace coalescenceModels
(
coalescenceModel,
Luo,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
index a5d37ce8110472cf8efcb2ca5b3d9889d2657fb4..2145e7c651ca24940a01b60c9d3d92484094cf2e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/PrinceBlanch/PrinceBlanch.C
@@ -44,7 +44,7 @@ namespace coalescenceModels
(
coalescenceModel,
PrinceBlanch,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
index 069eb6b19edf56c78415db8fa5b5fff1fffba12e..58e2bd555596db2c86ad2cb6fa49d75fd17cbd2f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(coalescenceModel, 0);
- defineRunTimeSelectionTable(coalescenceModel, dictionary);
+ defineRunTimeSelectionTable(coalescenceModel, reactingEuler);
}
}
@@ -50,7 +50,7 @@ Foam::diameterModels::coalescenceModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -59,7 +59,7 @@ Foam::diameterModels::coalescenceModel::New
dict,
"coalescenceModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
index c6edeb9f8b8a43065e7594fc18f00859924abd37..f694004130b7aa3b18e5d1cbd20ce0d2f6fef00e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/coalescenceModel/coalescenceModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
coalescenceModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
index 54117da5cbf6e663b5e78802c4fa8c3b423b0002..799fe258af32627dabe3ceca54ba3166d5863dbc 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/constantCoalescence/constantCoalescence.C
@@ -41,7 +41,7 @@ namespace coalescenceModels
(
coalescenceModel,
constantCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
index 77d642afab153601605f2d4b01c53518f9eecd93..f9d915fdc82c89e12a17f409efe2339ccb847e84 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/coalescenceModels/hydrodynamic/hydrodynamic.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace coalescenceModels
{
defineTypeNameAndDebug(hydrodynamic, 0);
- addToRunTimeSelectionTable(coalescenceModel, hydrodynamic, dictionary);
+ addToRunTimeSelectionTable(coalescenceModel, hydrodynamic, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
index 8d9b02628b0baff04aa72e2a72b059ff26f50bab..b12560769c03be4118ebcbaeec9560c2d0df0fb9 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/LaakkonenAlopaeusAittamaaDsd/LaakkonenAlopaeusAittamaaDsd.C
@@ -42,7 +42,7 @@ namespace daughterSizeDistributionModels
(
daughterSizeDistributionModel,
LaakkonenAlopaeusAittamaaDsd,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
index ae986a9542932a5b21aee5e810c5984c885fa9b2..b451a91ddee4dae08f6192fb8ef4286113abf437 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(daughterSizeDistributionModel, 0);
- defineRunTimeSelectionTable(daughterSizeDistributionModel, dictionary);
+ defineRunTimeSelectionTable(daughterSizeDistributionModel, reactingEuler);
}
}
@@ -55,7 +55,7 @@ Foam::diameterModels::daughterSizeDistributionModel::New
dict.get<word>("daughterSizeDistributionModel")
);
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -64,7 +64,7 @@ Foam::diameterModels::daughterSizeDistributionModel::New
dict,
"daughterSizeDistributionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
index 0fef7e6228093ddb794b6a203641f89e854e4690..3725d1853e64b13a04e0126fd7c4d1f37d436715 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/daughterSizeDistributionModel/daughterSizeDistributionModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
daughterSizeDistributionModel,
- dictionary,
+ reactingEuler,
(
const breakupModel& breakup,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
index d2e20c2ac99a399e12d438226e4d3a5278677c4e..867dfb29cb2ddddb1fc3057edbf8b4246df8575c 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/daughterSizeDistributionModels/uniformBinary/uniformBinary.C
@@ -42,7 +42,7 @@ namespace daughterSizeDistributionModels
(
daughterSizeDistributionModel,
uniformBinary,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
index 52c0b298f3d740b3c08919b515eb64908d1930dd..d3a32d735c83e4591e9d66d30c05c9a98f3325a2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/constantDrift/constantDrift.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(constantDrift, 0);
- addToRunTimeSelectionTable(driftModel, constantDrift, dictionary);
+ addToRunTimeSelectionTable(driftModel, constantDrift, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
index 1da26a322c17d0a73ffd46d90bd66835a85d4f37..9c122669cd4f6388185d5688b7e967f399ad1b8a 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/densityChange/densityChange.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(densityChangeDrift, 0);
- addToRunTimeSelectionTable(driftModel, densityChangeDrift, dictionary);
+ addToRunTimeSelectionTable(driftModel, densityChangeDrift, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
index 98e775c0146228e92c8f2a8e94495ed589c77212..46b251688d193ae766c05cf573f93a27e8a64b1f 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(driftModel, 0);
- defineRunTimeSelectionTable(driftModel, dictionary);
+ defineRunTimeSelectionTable(driftModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::diameterModels::driftModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::diameterModels::driftModel::New
dict,
"driftModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
index 9162874c984d925948b149ecb60de273a1c3fcc2..93ac7b0df0c2584cdc0c847881cdcccc2e44fc11 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/driftModel/driftModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
driftModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
index 4ec234f049589c78e6d48b973e491dfdae34f4a2..9eba89b5ac8ae68d6a3925a0402e201b446d5fa7 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/driftModels/phaseChange/phaseChange.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace driftModels
{
defineTypeNameAndDebug(phaseChange, 0);
- addToRunTimeSelectionTable(driftModel, phaseChange, dictionary);
+ addToRunTimeSelectionTable(driftModel, phaseChange, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
index 9f5f5fce9886c92cce77e0b22ac410344afdabb2..1cebecd022067e66166167d61311c55ac0e4a8c1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/constantNucleation/constantNucleation.C
@@ -42,7 +42,7 @@ namespace nucleationModels
(
nucleationModel,
constantNucleation,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
index d36d90d34d8cb40d9fe6968adfa5ddd45b296b7c..c970a3d626f274c4e735111c53ca45c6b3631d9e 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.C
@@ -36,7 +36,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(nucleationModel, 0);
- defineRunTimeSelectionTable(nucleationModel, dictionary);
+ defineRunTimeSelectionTable(nucleationModel, reactingEuler);
}
}
@@ -51,7 +51,7 @@ Foam::diameterModels::nucleationModel::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -60,7 +60,7 @@ Foam::diameterModels::nucleationModel::New
dict,
"nucleationModel",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
index aeec5d539666931ecb181bb57ae9f1dc44662c19..cd7658ab9741180f9a7f624628b8d0698b9773e2 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/nucleationModel/nucleationModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
nucleationModel,
- dictionary,
+ reactingEuler,
(
const populationBalanceModel& popBal,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
index a38aaa2824bb864e5826ae35a0e4afabd7e62e33..586a229f6bb38bd75781aa2c28d4258020a86bc1 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/populationBalanceModel/nucleationModels/wallBoiling/wallBoiling.C
@@ -43,7 +43,7 @@ namespace nucleationModels
(
nucleationModel,
wallBoiling,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C b/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
index fe4c0a81f16aa9fdfeeeb25b0ea98929944f53c4..814631ee98b3231fbe24d51a56a78a8096210363 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/Antoine/Antoine.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(Antoine, 0);
- addToRunTimeSelectionTable(saturationModel, Antoine, dictionary);
+ addToRunTimeSelectionTable(saturationModel, Antoine, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C b/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
index aea431c57d71cf8cc3177d3aa41a85de2adbbde8..6de9fc401d9795ff0bc30074a68aba14c82906d6 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/AntoineExtended/AntoineExtended.C
@@ -39,7 +39,7 @@ namespace saturationModels
(
saturationModel,
AntoineExtended,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C b/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
index 63ecafc4a17113a37a23c9a63974ba5b17824de4..6159d0eb4b0ed4c3ca2b2fd51b3145087788460c 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/ArdenBuck/ArdenBuck.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(ArdenBuck, 0);
- addToRunTimeSelectionTable(saturationModel, ArdenBuck, dictionary);
+ addToRunTimeSelectionTable(saturationModel, ArdenBuck, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
index b0c2dcfc801aba207cf5ea90d7372d49d141ddef..ec3fcebeaba6092e79180be9a3701789b83c4147 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/constantSaturationConditions/constantSaturationConditions.C
@@ -39,7 +39,7 @@ namespace saturationModels
(
saturationModel,
constantSaturationConditions,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C b/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
index 5fe61e9f828b43aa16f883a05320a7bf9fb2d560..4eae6f827c07b3157ce8e436b402f2c48c67c007 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/function1/function1.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(function1, 0);
- addToRunTimeSelectionTable(saturationModel, function1, dictionary);
+ addToRunTimeSelectionTable(saturationModel, function1, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C b/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
index 265722cf31476fddb252deec5abb7922ba497ed4..677a94519fff72179e42ccfdddd35e528a9079fe 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/polynomial/polynomial.C
@@ -35,7 +35,7 @@ namespace Foam
namespace saturationModels
{
defineTypeNameAndDebug(polynomial, 0);
- addToRunTimeSelectionTable(saturationModel, polynomial, dictionary);
+ addToRunTimeSelectionTable(saturationModel, polynomial, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
index a540e3fcceda29623d143b28d2ff408d3a96c012..66b9bed3302f9589a3f1e93fadf45fa592180fab 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(saturationModel, 0);
- defineRunTimeSelectionTable(saturationModel, dictionary);
+ defineRunTimeSelectionTable(saturationModel, reactingEuler);
}
@@ -66,7 +66,7 @@ Foam::saturationModel::New
Info<< "Selecting saturationModel: " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -75,7 +75,7 @@ Foam::saturationModel::New
dict,
"saturationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
index 7944a2eb77cd5b03478996c40ec2568061aaf0ff..977174d360db3d9555c4aad44ee207f59c7da28e 100644
--- a/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
+++ b/src/phaseSystemModels/reactingEuler/saturationModels/saturationModel/saturationModel.H
@@ -75,9 +75,10 @@ public:
(
autoPtr,
saturationModel,
- dictionary,
+ reactingEuler,
(
- const dictionary& dict, const objectRegistry& db
+ const dictionary& dict,
+ const objectRegistry& db
),
(dict, db)
);
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 1dd0e3c1596f6fe2d1de97f6ae6b32a78246c8ec..3cf47543d4766f412f404763e17d3228d6f33790 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Gidaspow,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index 0355b93453c2f861b6349199ab9890180c0f596e..2dbdac0ddfda6e4d74352f31e06ecc4e6712e64c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
HrenyaSinclair,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 6a5546e4c89c86a452e2ea0142525cc2e1b83be0..6f67a5150b33fbed933bdfa93593e8fbc054150c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Syamlal,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
index d0121826f31e166d6ff7742bbb9ffbe6cfee09ab..71b6ff08949045d779e6d2e25e75f3634f16958b 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(conductivityModel, 0);
- defineRunTimeSelectionTable(conductivityModel, dictionary);
+ defineRunTimeSelectionTable(conductivityModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::conductivityModel::New
Info<< "Selecting conductivityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::conductivityModel::New
dict,
"conductivityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 41bb50e42093332ffca8f273262a4b1714a830f8..024e026d4de4f9e706a4aabc293e728a91c03082 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
conductivityModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 175dcee2acfa458c16cfb1ab255b0db84f7f389c..7f7805241ec57c462817bccbefbdee11f81e5c22 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJackson,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4bde1a14c053a7461c5267183fb96eaa7b1b41a7..562d4741847356ede00fbb55d405eb96cc949e62 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJacksonSchaeffer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index c1851d54a2e130e67046d4cfd002c43c249518ba..5e5ed5ec1f3c3fe7de9833042e0ba3d104dcb904 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
Schaeffer,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
index 41681fae71d4b57e21a8e4f70331c11c2c2de9d1..e9b0ecb5fb20538e759b8334e4223044db5f572e 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(frictionalStressModel, 0);
- defineRunTimeSelectionTable(frictionalStressModel, dictionary);
+ defineRunTimeSelectionTable(frictionalStressModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
Info<< "Selecting frictionalStressModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
dict,
"frictionalStressModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index 1f00793cf7f104f4c7b67aadad88f99728fc7b20..c6af9f0f70957567e973c94483dbebc655c2907f 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
frictionalStressModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 686843eb99f3bf357b830f606b858585a3eaae7d..8c8c9b5dd6c42408d4d4bcf0d7d508f5615ad7b5 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
Lun,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index efb3fdfe4593e38d33aa4c04ccb49f6fdc24c0e0..012740e670444d17710a31f3aacbddf31040bbd4 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
SyamlalRogersOBrien,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
index 3714dde3a232a3060df79698b42e47764a12e51d..f3033ba45ab7d51b69c8b368bb7c7e950d4f7e1c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(granularPressureModel, 0);
- defineRunTimeSelectionTable(granularPressureModel, dictionary);
+ defineRunTimeSelectionTable(granularPressureModel, reactingEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
Info<< "Selecting granularPressureModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
dict,
"granularPressureModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 783a498ae87c31c204a986b8d9f2ad748bf0e36e..7398669df650c29e5d57394f8c26de7cc71251dc 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
granularPressureModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index cc62a8ec666b27e7a967f436948a9f15ee277564..b9b55cfb46e024f308b3a74140cc24bdf2b7cec2 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
CarnahanStarling,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 7cdfee59e1e0b1058b35bac1f24b6cf0a153c1d1..494a60ef70ee29b4a3259c0a459b63abdf4514fa 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
LunSavage,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index 4e7ffdb7c1e0cc89087c41c762b6457d4ee43c96..e7e4a9634a93fc609433166ca73f643dc6ace42a 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
SinclairJackson,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
index 714167849b005b231a998dec5a49eba832c3cf05..eb50116f99cb23f5afa56064c44f86e9a3b7a19d 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(radialModel, 0);
- defineRunTimeSelectionTable(radialModel, dictionary);
+ defineRunTimeSelectionTable(radialModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::radialModel::New
Info<< "Selecting radialModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::radialModel::New
dict,
"radialModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index f84ccca6cb47025c083b50c6c6b48aa15206f45b..02860dace938e0580dd40f8ac779a654b13bcd46 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
radialModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index d7fc0f4477a68bbb94ac32fa3e7d352021e67883..37945bd1485552a467d1c3c608279c2d65bc9885 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Gidaspow, 0);
- addToRunTimeSelectionTable(viscosityModel, Gidaspow, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Gidaspow, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index 936019f264675f341745b87a593d4c40c7fee71e..1159764ec924d8b3ced3fee71707ad1ac2686e8b 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -43,7 +43,7 @@ namespace viscosityModels
(
viscosityModel,
HrenyaSinclair,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index 5903d0adc020fada6660f30d0c01ce65aaeb7320..711789658816ceaaab341bf9c8bda5d2aae7908e 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Syamlal, 0);
- addToRunTimeSelectionTable(viscosityModel, Syamlal, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Syamlal, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index e75fbf72c145cb67efa960f2b423c57613f4ffea..365d75efc94fd19c852c1e8aa21b07780cfc2ded 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(noneViscosity, 0);
- addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, noneViscosity, reactingEuler);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index 339ab1331dc1727bc57915f7c78f04cee8eb657c..fd5b1d5f8a2933a9205da70c14da54f4c0668cb7 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(viscosityModel, 0);
- defineRunTimeSelectionTable(viscosityModel, dictionary);
+ defineRunTimeSelectionTable(viscosityModel, reactingEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::viscosityModel::New
Info<< "Selecting viscosityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = reactingEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::viscosityModel::New
dict,
"viscosityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << abort(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index 0ac77ec88033f94fdeb2c270ed58e1c650cbd5fe..5db37874c07013a90646732f6266798b3472c126 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
viscosityModel,
- dictionary,
+ reactingEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
index e9b00fa0b495ac492155a65cfc6effb137cba647..49549677bb6ebe220b81ebed8f6c310a37619ebc 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -51,7 +51,7 @@ namespace diameterModels
(
diameterModel,
IATE,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index cdb0561a4d689bd3448e3402bce471cbc475e546..fe6aff9808a9af2ffc0c6aba19b6a6327d2c073c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -38,7 +38,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(IATEsource, 0);
- defineRunTimeSelectionTable(IATEsource, dictionary);
+ defineRunTimeSelectionTable(IATEsource, reactingEuler);
}
}
@@ -53,7 +53,7 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = reactingEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -62,7 +62,7 @@ Foam::diameterModels::IATEsource::New
dict,
"IATEsource",
type,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index 26ac11e7544a3e917aa22480ad4a5fd6f6a67a71..bff0ab7197e99a1eda45c23a5a0dcfd81141c361 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
IATEsource,
- dictionary,
+ reactingEuler,
(
const IATE& iate,
const dictionary& dict
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
index 881f2af85f2c47cd16d76a3f83a60676bd063225..5b20ee352e573db6f67003e7c559a29d2ccd72ad 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/phaseChange/phaseChange.C
@@ -42,7 +42,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(phaseChange, 0);
- addToRunTimeSelectionTable(IATEsource, phaseChange, dictionary);
+ addToRunTimeSelectionTable(IATEsource, phaseChange, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index 3da9baf91ac9e2ee515f0b01400556b2d3127331..1f0d9c9d6cab62be8d1571de65144e2f08b9bcc1 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(randomCoalescence, 0);
- addToRunTimeSelectionTable(IATEsource, randomCoalescence, dictionary);
+ addToRunTimeSelectionTable(IATEsource, randomCoalescence, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 14ada7771dec0321f6fd440d748ee660f6921623..372b38a58be6a08f515a5b10c4eb2bbb92c725f2 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -38,7 +38,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(turbulentBreakUp, 0);
- addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, dictionary);
+ addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index 7e0ffef0959b460e80004aa310c877e0cd54f3ad..1ba05f97ee1dcea6f57c367a947b23a5d0f52fdb 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -42,7 +42,7 @@ namespace IATEsources
(
IATEsource,
wakeEntrainmentCoalescence,
- dictionary
+ reactingEuler
);
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
index e0b87ac0a9c6de88fd21e03e92edd3781a406767..0ef6cf01f9566cd0a7b853d76f721be29d90ab5c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wallBoiling/wallBoiling.C
@@ -40,7 +40,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(wallBoiling, 0);
- addToRunTimeSelectionTable(IATEsource, wallBoiling, dictionary);
+ addToRunTimeSelectionTable(IATEsource, wallBoiling, reactingEuler);
}
}
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
index c52aae49ed619069dca66d16c8fdd44def60a950..992c42c596478b6fd4e976f3ed564dc3b47990bb 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.C
@@ -49,7 +49,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(twoPhaseSystem, 0);
- defineRunTimeSelectionTable(twoPhaseSystem, dictionary);
+ defineRunTimeSelectionTable(twoPhaseSystem, reactingEuler);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
index c4a6632822b210251c422c61774fc6d42ea66aa7..2f48033cbceb5da625e5011c6e12fb3236d95cfe 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystem.H
@@ -96,7 +96,7 @@ public:
(
autoPtr,
twoPhaseSystem,
- dictionary,
+ reactingEuler,
(
const fvMesh& mesh
),
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
index a5a759abf3d41055c7424e0caf83bd50c0ee063e..65fa775a3c2ffb57e55d02fa78f2d3c435aa0f51 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystemNew.C
@@ -53,7 +53,7 @@ Foam::twoPhaseSystem::New
Info<< "Selecting twoPhaseSystem " << systemType << endl;
- auto* ctorPtr = dictionaryConstructorTable(systemType);
+ auto* ctorPtr = reactingEulerConstructorTable(systemType);
if (!ctorPtr)
{
@@ -62,7 +62,7 @@ Foam::twoPhaseSystem::New
dict,
"twoPhaseSystem",
systemType,
- *dictionaryConstructorTablePtr_
+ *reactingEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
index 064ccb8ef7624b43ee75b904605ec1cf9a1cd8ec..9f8d36e767d874c4db64697972263f4bb3f6c11c 100644
--- a/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
+++ b/src/phaseSystemModels/reactingEuler/twoPhaseSystem/twoPhaseSystems.C
@@ -55,7 +55,7 @@ namespace Foam
(
twoPhaseSystem,
basicTwoPhaseSystem,
- dictionary,
+ reactingEuler,
basicTwoPhaseSystem
);
@@ -76,7 +76,7 @@ namespace Foam
(
twoPhaseSystem,
interfaceCompositionPhaseChangeTwoPhaseSystem,
- dictionary,
+ reactingEuler,
interfaceCompositionPhaseChangeTwoPhaseSystem
);
@@ -97,7 +97,7 @@ namespace Foam
(
twoPhaseSystem,
thermalPhaseChangeTwoPhaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangeTwoPhaseSystem
);
@@ -118,7 +118,7 @@ namespace Foam
(
twoPhaseSystem,
populationBalanceTwoPhaseSystem,
- dictionary,
+ reactingEuler,
populationBalanceTwoPhaseSystem
);
@@ -142,7 +142,7 @@ namespace Foam
(
twoPhaseSystem,
thermalPhaseChangePopulationBalanceTwoPhaseSystem,
- dictionary,
+ reactingEuler,
thermalPhaseChangePopulationBalanceTwoPhaseSystem
);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
index 578467008f58c8c70c2369e62ca462c915d6f966..0f5a23d1636ceb5c4815b97f39281118ff0a352c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Gidaspow/GidaspowConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Gidaspow,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index d2191c1073f60db26e1d3ebfe1b3a28a4bce0132..75cad09e8827c558199f75e4fa78d23b21518f30 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
HrenyaSinclair,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
index 1f12390bfc3ceb7376d564062fc6089f91f7c65b..8012f85a3072eac2f6e58cfbd1ec65d44d6f9897 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/Syamlal/SyamlalConductivity.C
@@ -43,7 +43,7 @@ namespace conductivityModels
(
conductivityModel,
Syamlal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
index 53fe02cb4dfe8ccc6e8686f506616b314f03ec28..60ae24bfe6a379e99cd7d55102a90d43dcbcace0 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(conductivityModel, 0);
- defineRunTimeSelectionTable(conductivityModel, dictionary);
+ defineRunTimeSelectionTable(conductivityModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::conductivityModel::New
Info<< "Selecting conductivityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::conductivityModel::New
dict,
"conductivityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
index 6b4fd317b8b7a3f0432a801ff3dcf6946f1ea584..28b05156aa82e4185a21cf367d28f4f012df8aae 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/conductivityModel/conductivityModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
conductivityModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 54dc26145289a2fcaea68f0cac001f551e59256a..52f96fdb0a646f51c9f77470fb4b6fbda9a5ad1c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJackson,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
index 4d7c1adafb675b16b12f9133348ebb4b85c68045..cccc4c814049d21a14db5303a0a1ab8610ca9615 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJacksonSchaeffer/JohnsonJacksonSchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
JohnsonJacksonSchaeffer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index cf14452f2ebab80fa6ddd9b636f9191ad8f81b2d..61a3e1a5dd325b2d2160e5f3b366b4ce4e96d6d7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -44,7 +44,7 @@ namespace frictionalStressModels
(
frictionalStressModel,
Schaeffer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
index 553af9553e87605e42924d5453da3ab9defd7735..7daa13e810479af2e63a623d78a0ca8fc8fc4d96 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(frictionalStressModel, 0);
- defineRunTimeSelectionTable(frictionalStressModel, dictionary);
+ defineRunTimeSelectionTable(frictionalStressModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
Info<< "Selecting frictionalStressModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::frictionalStressModel::New
dict,
"frictionalStressModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
index ce009b2c5fa2eef0d9dace9d87295fa827970e9a..de3036406b46d88167e33ce4f665132c705498f8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/frictionalStressModel/frictionalStressModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
frictionalStressModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
index 7262afa5ebedf08870b3022225051adc33cc8268..6b639eca4341d1c593501dff8b9ad0456093a08a 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/Lun/LunPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
Lun,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
index 8c9d3c85a35f088d3a3f3f7af57524be77eb826f..c116c162e3bc32acbb16dcf03ae6412c2a84f933 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/SyamlalRogersOBrien/SyamlalRogersOBrienPressure.C
@@ -42,7 +42,7 @@ namespace granularPressureModels
(
granularPressureModel,
SyamlalRogersOBrien,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
index b4eefd3fe6cb9b653d26b0aaa94be83d3d9d9787..91043b5d58f632ca05dd666688435ff0be75d8a8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(granularPressureModel, 0);
- defineRunTimeSelectionTable(granularPressureModel, dictionary);
+ defineRunTimeSelectionTable(granularPressureModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
Info<< "Selecting granularPressureModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::granularPressureModel::New
dict,
"granularPressureModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
index 3898eab3c612c09c3ab542a14a4452cac25d643f..b0fa98d1a6bef4281fedacf3f4a8f48d9a24f86f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/granularPressureModel/granularPressureModel/granularPressureModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
granularPressureModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
index 889b6694701ad0e0a0e9ba4ee830cd157b717efc..16210933330a5a5a32f5ffb8194f31ee3edc17a7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/CarnahanStarling/CarnahanStarlingRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
CarnahanStarling,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
index 80ecbf0ce27e7a75fa72d1ef36d120939dc667ca..5f8cadb5c8b10f5b8262ab69c26ae3db715c2a76 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/LunSavage/LunSavageRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
LunSavage,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
index d8560e28a1a772bddc52df331e54e6e76a9b7d3c..da2722cd6bb641a969a12c401776d0971268dba8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/SinclairJackson/SinclairJacksonRadial.C
@@ -42,7 +42,7 @@ namespace radialModels
(
radialModel,
SinclairJackson,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
index 756e1cd5decaf45b1d0707ce5b4937a4fdf667e8..61b254ec86649e1a0ad9aa4bfaad388681cb4582 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.C
@@ -36,7 +36,7 @@ namespace kineticTheoryModels
{
defineTypeNameAndDebug(radialModel, 0);
- defineRunTimeSelectionTable(radialModel, dictionary);
+ defineRunTimeSelectionTable(radialModel, twoPhaseEuler);
}
}
@@ -64,7 +64,7 @@ Foam::kineticTheoryModels::radialModel::New
Info<< "Selecting radialModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::kineticTheoryModels::radialModel::New
dict,
"radialModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
index 51c4f12d89bbb63b684a8a83f926d53d1b652149..dd1f39431de082d3313cc7dd991e6897aab79e77 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/radialModel/radialModel/radialModel.H
@@ -70,7 +70,7 @@ public:
(
autoPtr,
radialModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
index 79831b02d38ef30c48753a772fbfb5e0ddb0ada5..ba173fbdb735047d72031032d2d6993abec18ed8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Gidaspow, 0);
- addToRunTimeSelectionTable(viscosityModel, Gidaspow, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Gidaspow, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index bdf131077331efcf7375a41c14c32d6ce9891660..aeb3e13557386b6442a39dc2ab9f2cca9847f0c8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -43,7 +43,7 @@ namespace viscosityModels
(
viscosityModel,
HrenyaSinclair,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
index cd39611b79bf326a1b9d59ca5aa2002ca3e8f251..4a7f35a8797e1c979875d8a2e32c0c1f9d2f4507 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C
@@ -38,7 +38,7 @@ namespace kineticTheoryModels
namespace viscosityModels
{
defineTypeNameAndDebug(Syamlal, 0);
- addToRunTimeSelectionTable(viscosityModel, Syamlal, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, Syamlal, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
index 831f4be8319bce0f31839eff390f3f1ec612ef38..0b1e518de7a7108c80925b213e9dc0ba5a591c5e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/none/noneViscosity.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(noneViscosity, 0);
- addToRunTimeSelectionTable(viscosityModel, noneViscosity, dictionary);
+ addToRunTimeSelectionTable(viscosityModel, noneViscosity, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
index 304108524b23bf68031f1fce56c7759bec1beeca..f78b821377b727221cebe89ebf7d948791acf0ac 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.C
@@ -35,7 +35,7 @@ namespace Foam
namespace kineticTheoryModels
{
defineTypeNameAndDebug(viscosityModel, 0);
- defineRunTimeSelectionTable(viscosityModel, dictionary);
+ defineRunTimeSelectionTable(viscosityModel, twoPhaseEuler);
}
}
@@ -63,7 +63,7 @@ Foam::kineticTheoryModels::viscosityModel::New
Info<< "Selecting viscosityModel " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -72,7 +72,7 @@ Foam::kineticTheoryModels::viscosityModel::New
dict,
"viscosityModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
index d8d5f6877f41d0ad5dd43b84697d0bfa03bd5da9..395d9ac627ee492be535963d97e7a6e550d85f60 100644
--- a/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/viscosityModel/viscosityModel.H
@@ -72,7 +72,7 @@ public:
(
autoPtr,
viscosityModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict
),
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
index bfc787c37616297426892ddeff5f9a97f0f8974e..53a0fdd6bba502fe5c41aea2d1cc0268c8face2b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(blendingMethod, 0);
- defineRunTimeSelectionTable(blendingMethod, dictionary);
+ defineRunTimeSelectionTable(blendingMethod, twoPhaseEuler);
}
@@ -60,7 +60,7 @@ Foam::blendingMethod::New
Info<< "Selecting " << dict.dictName() << " blending method: "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -69,7 +69,7 @@ Foam::blendingMethod::New
dict,
"blendingMethod",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
index 92896a8fe3e20b7963fa4cacff6b85eca92366d6..035eb9c7af7c679d668fdcef399ecac8d409199e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.H
@@ -63,7 +63,7 @@ public:
(
autoPtr,
blendingMethod,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const wordList& phaseNames
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
index 735033c1ceb512d90de227ca1a1aa6236510fa9d..6cf4d30f63bf4a1c1205c96abb8ed600d45d6238 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/hyperbolic/hyperbolic.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
hyperbolic,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
index d2b15241bf0fb6714a3200964d741ea82d8f28c8..558b01e3fbb08bfd76a837f7b660c02932795219 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/linear/linear.C
@@ -40,7 +40,7 @@ namespace blendingMethods
(
blendingMethod,
linear,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
index 3f3dfe09aac99d29f469722b93e3e2612069fc8b..23df176b6d8d2eac4d432ee12733ceedc0b29e9c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/BlendedInterfacialModel/blendingMethods/noBlending/noBlending.C
@@ -41,7 +41,7 @@ namespace blendingMethods
(
blendingMethod,
noBlending,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
index 0707091f7bf04e0aa3c3c8b5cc5fe4d3bc6e9b76..8f34d714e468486a16d0a3a4be05b2a70f8e23b4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -51,7 +51,7 @@ namespace diameterModels
(
diameterModel,
IATE,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
index 943e66153c5fe89b62d53f5fad9f82ad140a7f2b..057dbdfe54bba164a399acefb2ae8d01ef0e48ac 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.C
@@ -39,7 +39,7 @@ namespace Foam
namespace diameterModels
{
defineTypeNameAndDebug(IATEsource, 0);
- defineRunTimeSelectionTable(IATEsource, dictionary);
+ defineRunTimeSelectionTable(IATEsource, twoPhaseEuler);
}
}
@@ -54,7 +54,7 @@ Foam::diameterModels::IATEsource::New
const dictionary& dict
)
{
- auto* ctorPtr = dictionaryConstructorTable(type);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(type);
if (!ctorPtr)
{
@@ -63,7 +63,7 @@ Foam::diameterModels::IATEsource::New
dict,
"IATEsource",
type,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
index b5c928ec3491a872f863fbe17fcf7e82756b49b3..a3c8241ad33c310faa87688fcaec6c94b62d7a4b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/IATEsource/IATEsource.H
@@ -76,7 +76,7 @@ public:
(
autoPtr,
IATEsource,
- dictionary,
+ twoPhaseEuler,
(
const IATE& iate,
const dictionary& dict
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index 39ee3276dbb064c65d259e42b833e3a260facb02..db823309ac1c0e08aeb09aa27908136585cacef4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(randomCoalescence, 0);
- addToRunTimeSelectionTable(IATEsource, randomCoalescence, dictionary);
+ addToRunTimeSelectionTable(IATEsource, randomCoalescence, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 36d077fae2e857a80518ea4fdfda401fdacead25..bf6483c01dd25a927e76f63eaf92036e3fb1d9a7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -37,7 +37,7 @@ namespace diameterModels
namespace IATEsources
{
defineTypeNameAndDebug(turbulentBreakUp, 0);
- addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, dictionary);
+ addToRunTimeSelectionTable(IATEsource, turbulentBreakUp, twoPhaseEuler);
}
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index 80633ce06ec24a308b5cbb313dd74ee2000fdbb7..2cdc1270e0ecdd207dfeb9225f29df70c553b206 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -41,7 +41,7 @@ namespace IATEsources
(
IATEsource,
wakeEntrainmentCoalescence,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
index cc3026fac32ea2b645a2f4649148b9b5e54af41a..1dddfc44cd49913274c3d180e9cd0590457e1f7c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -40,7 +40,7 @@ namespace diameterModels
(
diameterModel,
constant,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
index 69a5aea3bdbe51fcb277ca3f1b49cd64c3f691ba..5bbe2b4691dc1d99d385e70be4b5f33531c92841 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.C
@@ -33,7 +33,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(diameterModel, 0);
- defineRunTimeSelectionTable(diameterModel, dictionary);
+ defineRunTimeSelectionTable(diameterModel, twoPhaseEuler);
}
@@ -66,7 +66,7 @@ Foam::diameterModel::New
<< ": "
<< modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -75,7 +75,7 @@ Foam::diameterModel::New
dict,
"diameterModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
index 5de204431b6a38c716f0b2dce4eeeda75ee60b59..aabf222f25ebb5f1a12a9b5a172f5ae4057de7a4 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/diameterModel/diameterModel.H
@@ -73,7 +73,7 @@ public:
(
autoPtr,
diameterModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phaseModel& phase
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index 0dc52c5a43d40989b351aec306680d52e2993614..74cd4ae1046bf3c32283fde9d613e76f1e0bae45 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -40,7 +40,7 @@ namespace diameterModels
(
diameterModel,
isothermal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
index 3d9243833355b3026d3a8dde4b8fb540b10f17b7..a0b9f9563a5087bd5be343f5bf34c8a368177369 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/TomiyamaAspectRatio/TomiyamaAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
TomiyamaAspectRatio,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
index 9544d238a61f98c3683764553eb9ee8c484093d8..0a85765031cfa35ebbdda550db9a9f6b55cc9a22 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/VakhrushevEfremov/VakhrushevEfremov.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
VakhrushevEfremov,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
index ccb4e2eeb267302d0271d75cf77e40296ae2e1c3..484ffb84b972fe49fd0280be6dc0ea1cd248b143 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/Wellek/Wellek.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
Wellek,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
index 37d73220bf5bc2d098f531533f929df507f871d4..a2bb0fb44d85998ae6d429faad86e565f1de20bf 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(aspectRatioModel, 0);
- defineRunTimeSelectionTable(aspectRatioModel, dictionary);
+ defineRunTimeSelectionTable(aspectRatioModel, twoPhaseEuler);
}
@@ -64,7 +64,7 @@ Foam::aspectRatioModel::New
Info<< "Selecting aspectRatioModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::aspectRatioModel::New
dict,
"aspectRatioModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
index 3ad0dd2f8f8d82af598b0fddcfed4765f4f8adf8..1ec9bd55497ece953ac8e64e423f6750f115da6e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/aspectRatioModel/aspectRatioModel.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
aspectRatioModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index 790c071fcab592eb383ba9ae757f67f3a5580b1b..c0d3f079b31086d048047ab0ec9b720aacd5f01e 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -40,7 +40,7 @@ namespace aspectRatioModels
(
aspectRatioModel,
constantAspectRatio,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
index 1096203290584da79f97742545ba190fe9df7b21..e75c3cb43b28c762ecb439662c00a9be5b98cf52 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Ergun/Ergun.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Ergun, 0);
- addToRunTimeSelectionTable(dragModel, Ergun, dictionary);
+ addToRunTimeSelectionTable(dragModel, Ergun, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
index e1cec4a4554717f616c43393e15461019a8b295b..34c45e860a94e45e737f14359d22c40cce19d62f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Gibilaro/Gibilaro.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Gibilaro, 0);
- addToRunTimeSelectionTable(dragModel, Gibilaro, dictionary);
+ addToRunTimeSelectionTable(dragModel, Gibilaro, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
index a5fd22e309889c322341cac71d15be3813755ee3..eb5d5e09dbbb732a6c098bee487a46367f54270d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C
@@ -38,7 +38,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowErgunWenYu, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowErgunWenYu, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index d4aa66225cd858642f88ac57c7bc60753d92d296..8fe8b549e3eba5cb8cd849d653e819d2429763af 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(GidaspowSchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, GidaspowSchillerNaumann, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
index 96288f39d0fc6af31d0172d9ccc8d15ccfae9a04..927095c5ac93d600c0d798a867ff68eb155b591a 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(IshiiZuber, 0);
- addToRunTimeSelectionTable(dragModel, IshiiZuber, dictionary);
+ addToRunTimeSelectionTable(dragModel, IshiiZuber, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
index 41fbca38d130ac5710739c7fcb10b705dad770b2..4ddd3f1c86cf6e17e3682abb3d201bb4e8b9ab17 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/Lain/Lain.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(Lain, 0);
- addToRunTimeSelectionTable(dragModel, Lain, dictionary);
+ addToRunTimeSelectionTable(dragModel, Lain, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 441a858f075f0e560989d8ab61e4911d8974c7e3..30da177c2b4cd7a86f4d2c301166d8d9af810865 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SchillerNaumann, 0);
- addToRunTimeSelectionTable(dragModel, SchillerNaumann, dictionary);
+ addToRunTimeSelectionTable(dragModel, SchillerNaumann, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
index 96a51810c7c578fb539fce2fc9a7aae716dcbb4a..d31d8430d9cf88d7ad993b803a2db638e4909e75 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(SyamlalOBrien, 0);
- addToRunTimeSelectionTable(dragModel, SyamlalOBrien, dictionary);
+ addToRunTimeSelectionTable(dragModel, SyamlalOBrien, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index 2abb778209139e84fc35c2f0ad8894e98a3112a1..846f227185104588f5ea3ef8b94e6dd0242c93d7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaAnalytic, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaAnalytic, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index 41148695d6de2da54ddf028f3654b9eb55db5f5b..274fbfa231626bac91c8671120de27df1fe71737 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(TomiyamaCorrelated, 0);
- addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, dictionary);
+ addToRunTimeSelectionTable(dragModel, TomiyamaCorrelated, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
index e3130b9de4c83a11d6b1a3ad1e566c4b9833d971..f5336243c7ff8cc97804deaef294a99fa4e15e38 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/WenYu/WenYu.C
@@ -36,7 +36,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(WenYu, 0);
- addToRunTimeSelectionTable(dragModel, WenYu, dictionary);
+ addToRunTimeSelectionTable(dragModel, WenYu, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
index 1d98c2e9c6b0d5c68f159463b2712b570a4327f1..e37937a9860a54222e284e14312a782e81b3e0f2 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.C
@@ -36,7 +36,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(dragModel, 0);
- defineRunTimeSelectionTable(dragModel, dictionary);
+ defineRunTimeSelectionTable(dragModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0);
@@ -111,7 +111,7 @@ Foam::dragModel::New
Info<< "Selecting dragModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -120,7 +120,7 @@ Foam::dragModel::New
dict,
"dragModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
index 2663b42430b5745fcee0dcb97c115cc874646c5d..7e0f991eaf1cfc23fe2e6e58f415e0fc55aefd8c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/dragModel/dragModel.H
@@ -81,7 +81,7 @@ public:
(
autoPtr,
dragModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
index aa9860f0dafc18b8007b3021efbf8598f19fedb0..2efb3ac0e9580b488e415a9ce54d9f5c41046b3c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/dragModels/segregated/segregated.C
@@ -39,7 +39,7 @@ namespace Foam
namespace dragModels
{
defineTypeNameAndDebug(segregated, 0);
- addToRunTimeSelectionTable(dragModel, segregated, dictionary);
+ addToRunTimeSelectionTable(dragModel, segregated, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
index c20c59d2032c349e11c2b8c040922c12c1627d8e..825fc48c7f35ec8ee73682a4e68a134a97d6a350 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/RanzMarshall/RanzMarshall.C
@@ -36,7 +36,7 @@ namespace Foam
namespace heatTransferModels
{
defineTypeNameAndDebug(RanzMarshall, 0);
- addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, dictionary);
+ addToRunTimeSelectionTable(heatTransferModel, RanzMarshall, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
index de6a5408bb721e942f7761467ffc2fd2e9a77bea..ebdbe60e414b1b4963c34456d033df3cdde51d0b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(heatTransferModel, 0);
- defineRunTimeSelectionTable(heatTransferModel, dictionary);
+ defineRunTimeSelectionTable(heatTransferModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::heatTransferModel::dimK(1, -1, -3, -1, 0);
@@ -73,7 +73,7 @@ Foam::heatTransferModel::New
Info<< "Selecting heatTransferModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -82,7 +82,7 @@ Foam::heatTransferModel::New
dict,
"heatTransferModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
index 58898646379f4d249be35ab48572f3d9db31957e..7525e52513ce5ee9408259f8064ba9e2364b2981 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
heatTransferModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
index 4885380778e0292bd0dbca59f0973ba2602c84ae..ad6644a3e86693f06bcd7cfe61414949758804a2 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/heatTransferModels/sphericalHeatTransfer/sphericalHeatTransfer.C
@@ -40,7 +40,7 @@ namespace heatTransferModels
(
heatTransferModel,
sphericalHeatTransfer,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 93cd5da80cbd2dc943603de664e909989563260b..af7b1a4cf5e88afa15fd8cbd2f4d8a0693b6d216 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(LegendreMagnaudet, 0);
- addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, dictionary);
+ addToRunTimeSelectionTable(liftModel, LegendreMagnaudet, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
index 8064581e6fbb8c882de353dba8737e6797e22ff6..43ac0aae8d5f4dd617c496dcc37726d3e75e7f1f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/Moraga/Moraga.C
@@ -37,7 +37,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(Moraga, 0);
- addToRunTimeSelectionTable(liftModel, Moraga, dictionary);
+ addToRunTimeSelectionTable(liftModel, Moraga, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
index d6f551a8a653d62e697d36d4001d59ebc574374e..daf82866db74041cc90a4a05b8af333fb90221f0 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/TomiyamaLift/TomiyamaLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(TomiyamaLift, 0);
- addToRunTimeSelectionTable(liftModel, TomiyamaLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, TomiyamaLift, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index d606d0dc6af17d0b3905b27ac0547f2e89b8d326..4f117fcb0fe427242fe1f4f45bfd1f660a7cb06f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(constantLiftCoefficient, 0);
- addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, dictionary);
+ addToRunTimeSelectionTable(liftModel, constantLiftCoefficient, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
index dec06b3e50afc4b04e15be101fe7dadf0adc8c77..d7db689b9a035259b5399a3574f474fa6d9496e7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.C
@@ -37,7 +37,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(liftModel, 0);
- defineRunTimeSelectionTable(liftModel, dictionary);
+ defineRunTimeSelectionTable(liftModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::liftModel::dimF(1, -2, -2, 0, 0);
@@ -69,7 +69,7 @@ Foam::liftModel::New
Info<< "Selecting liftModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::liftModel::New
dict,
"liftModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
index 7d4358205c860939da69c21b8cf602e50df93c1d..3ce76540d901d8874c910b94aee6699d199cc667 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/liftModel/liftModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
liftModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
index c3bfe748743d8f79f86c2bd5ec62e76c2e073e72..d574ffdc1e73a5cc873e9916c739e17ddbc49360 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/liftModels/noLift/noLift.C
@@ -36,7 +36,7 @@ namespace Foam
namespace liftModels
{
defineTypeNameAndDebug(noLift, 0);
- addToRunTimeSelectionTable(liftModel, noLift, dictionary);
+ addToRunTimeSelectionTable(liftModel, noLift, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index 61aa9c6907c09b07b1a371db912481b284b479da..fc9ac45fae1f3fe237519d7f935c1857c3e796b7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -40,7 +40,7 @@ namespace swarmCorrections
(
swarmCorrection,
TomiyamaSwarm,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
index e799cca4473326c3f85dba00d50477fe293835d3..d214872d6743889eaeb86fc47971434917967507 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/noSwarm/noSwarm.C
@@ -36,7 +36,7 @@ namespace Foam
namespace swarmCorrections
{
defineTypeNameAndDebug(noSwarm, 0);
- addToRunTimeSelectionTable(swarmCorrection, noSwarm, dictionary);
+ addToRunTimeSelectionTable(swarmCorrection, noSwarm, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
index dc71b45a078df35f1abcb70f1bb8633307a0be21..ab8b546127947b4a907b77d63f858f27394e134c 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.C
@@ -34,7 +34,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(swarmCorrection, 0);
- defineRunTimeSelectionTable(swarmCorrection, dictionary);
+ defineRunTimeSelectionTable(swarmCorrection, twoPhaseEuler);
}
@@ -64,7 +64,7 @@ Foam::swarmCorrection::New
Info<< "Selecting swarmCorrection for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -73,7 +73,7 @@ Foam::swarmCorrection::New
dict,
"swarmCorrection",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
index 6e70533e50a73778cf1480d32131bf960dde7c11..c0bc09f36f5e298931855c88791a644d22ad2e9f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/swarmCorrections/swarmCorrection/swarmCorrection.H
@@ -74,7 +74,7 @@ public:
(
autoPtr,
swarmCorrection,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index c1d89aba3721c98b11c8c880852439460a9b61ac..56e97768ebb3e6236285058ca599ae14770a36ee 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Burns,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index bd817480fb33ea61defe31f82a7511d58137c116..0c1e40346db016a6461750aa64a36942139f54df 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -43,7 +43,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
Gosman,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index a4a46fa13af0be79dcfb4e270f36ffd4c8236ef9..4ee4b956fbc20cf6104f1aeee8c5135f688da21f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
LopezDeBertodano,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 90cf09f812fdb55fd603c27e02f69f7b3f12ee15..c950712deb9144141a3970e9e69054065f7e367d 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -41,7 +41,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
constantTurbulentDispersionCoefficient,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
index 83e7f5628dd667daee0250a9c32c8dd308ddec20..e5b4a9467266226120fa332e6ec0ab09074b23a9 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/noTurbulentDispersion/noTurbulentDispersion.C
@@ -40,7 +40,7 @@ namespace turbulentDispersionModels
(
turbulentDispersionModel,
noTurbulentDispersion,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
index de9f0cce22346e87229df02887929049e846bffc..86bb1f88b830314d96b5fc7a034f1a9eac3d59f5 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(turbulentDispersionModel, 0);
- defineRunTimeSelectionTable(turbulentDispersionModel, dictionary);
+ defineRunTimeSelectionTable(turbulentDispersionModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::turbulentDispersionModel::dimD(1, -1, -2, 0, 0);
@@ -68,7 +68,7 @@ Foam::turbulentDispersionModel::New
Info<< "Selecting turbulentDispersionModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -77,7 +77,7 @@ Foam::turbulentDispersionModel::New
dict,
"turbulentDispersionModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
index fe2b467d9cc208d79041cd088b10d971137cfdbc..01852a1adc8d82caca7d23c1629cefc944b3cc32 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/turbulentDispersionModels/turbulentDispersionModel/turbulentDispersionModel.H
@@ -75,7 +75,7 @@ public:
(
autoPtr,
turbulentDispersionModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
index c08f64a2327ba8a7daf6343f1f596c68d6b3e8d4..daea3844515de8eedd5d556f999681924edb2f26 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/Lamb/Lamb.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
Lamb,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 5436d22970f39e503a6e9b9f3144783adbfc7734..8ca3e9c020e51b89673bd320ed35f29ee4cb749f 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -40,7 +40,7 @@ namespace virtualMassModels
(
virtualMassModel,
constantVirtualMassCoefficient,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
index a135d5d88774df680ff7407eee00ba73ae7a5a90..027187de959c09c0aff8a0e8e5760067f3d154f3 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C
@@ -36,7 +36,7 @@ namespace Foam
namespace virtualMassModels
{
defineTypeNameAndDebug(noVirtualMass, 0);
- addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, dictionary);
+ addToRunTimeSelectionTable(virtualMassModel, noVirtualMass, twoPhaseEuler);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
index d13e1502fcd9740a5a604d58838b727df397e24e..7c4220bd8049c8c8c9e7319cab0407c890691b0b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C
@@ -35,7 +35,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(virtualMassModel, 0);
- defineRunTimeSelectionTable(virtualMassModel, dictionary);
+ defineRunTimeSelectionTable(virtualMassModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity);
@@ -80,7 +80,7 @@ Foam::virtualMassModel::New
Info<< "Selecting virtualMassModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -89,7 +89,7 @@ Foam::virtualMassModel::New
dict,
"virtualMassModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
index 91b5656fe0700646554960f3979f2e3c93476f21..29bf73dbd430722a432ffcff999d265934d7c5f7 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H
@@ -77,7 +77,7 @@ public:
(
autoPtr,
virtualMassModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair,
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
index 15f8784f4bea4450e8801640b3e442fdb499b317..ef4779239db3b71c22f3eb744fba07cb48e4da13 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Antal,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
index 8e2b051448c3d1bcf8d6bb6ea6f0bc14bb1d79b7..46f69079ce2565b9eb6d003ab0ab7cd022cc6d4b 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
Frank,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index cfc8f5a2092c55009650dda1e9d9ad18da2c09c2..f6b78238f80029e695f511e60aad5732523dde68 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
TomiyamaWallLubrication,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
index 5f61de5d47bdf3d5c41a7c90b2eadee696b5f404..59f4146f1d1a2c210ff877201ec2f20ea8fda1fe 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/noWallLubrication/noWallLubrication.C
@@ -40,7 +40,7 @@ namespace wallLubricationModels
(
wallLubricationModel,
noWallLubrication,
- dictionary
+ twoPhaseEuler
);
}
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
index 4b6cdb6d5f9daaf1e4d650046497513cd9545c81..c1a5d29c6d7b6d59e1ca04f6aac7dae97b2864aa 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.C
@@ -36,7 +36,7 @@ License
namespace Foam
{
defineTypeNameAndDebug(wallLubricationModel, 0);
- defineRunTimeSelectionTable(wallLubricationModel, dictionary);
+ defineRunTimeSelectionTable(wallLubricationModel, twoPhaseEuler);
}
const Foam::dimensionSet Foam::wallLubricationModel::dimF(1, -2, -2, 0, 0);
@@ -69,7 +69,7 @@ Foam::wallLubricationModel::New
Info<< "Selecting wallLubricationModel for "
<< pair << ": " << modelType << endl;
- auto* ctorPtr = dictionaryConstructorTable(modelType);
+ auto* ctorPtr = twoPhaseEulerConstructorTable(modelType);
if (!ctorPtr)
{
@@ -78,7 +78,7 @@ Foam::wallLubricationModel::New
dict,
"wallLubricationModel",
modelType,
- *dictionaryConstructorTablePtr_
+ *twoPhaseEulerConstructorTablePtr_
) << exit(FatalIOError);
}
diff --git a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
index a2de5064221e4acff3a5e5785ecf14964307f7f3..af4e0a9ec108d45b079ddc8f34a4f8f62a4b69e8 100644
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/interfacialModels/wallLubricationModels/wallLubricationModel/wallLubricationModel.H
@@ -78,7 +78,7 @@ public:
(
autoPtr,
wallLubricationModel,
- dictionary,
+ twoPhaseEuler,
(
const dictionary& dict,
const phasePair& pair