diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C index c4a23d3cf3..6c0fcbecec 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::Ergun::Ergun ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair) + dragModel(dict, pair, registerObject) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H index 91c8ded674..f8f29a8482 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Ergun/Ergun.H @@ -70,7 +70,8 @@ public: Ergun ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C index a03258b356..daaaf0bdc4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::Gibilaro::Gibilaro ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H index ef63e826a3..c2e103e911 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/Gibilaro/Gibilaro.H @@ -78,7 +78,8 @@ public: Gibilaro ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C index 8ef3232226..9eb46e5060 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.C @@ -46,16 +46,18 @@ namespace dragModels Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), Ergun_ ( new Ergun ( dict, - pair + pair, + false ) ), WenYu_ @@ -63,7 +65,8 @@ Foam::dragModels::GidaspowErgunWenYu::GidaspowErgunWenYu new WenYu ( dict, - pair + pair, + false ) ), residualRe_("residualRe", dimless, dict.lookup("residualRe")) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H index f796977c16..e29bc28dcb 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowErgunWenYu/GidaspowErgunWenYu.H @@ -85,7 +85,8 @@ public: GidaspowErgunWenYu ( const dictionary& interfaceDict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C index 3e389a7a6b..ce35a4ac25 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H index 9277781bc3..b14ccf06b6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.H @@ -85,7 +85,8 @@ public: GidaspowSchillerNaumann ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C index 7cfc98d298..5504d1a523 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::SchillerNaumann::SchillerNaumann ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H index 72d0d2c1b7..21d13358ca 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.H @@ -74,7 +74,8 @@ public: SchillerNaumann ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C index d2c0f800b1..fbf839178f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::SyamlalOBrien::SyamlalOBrien ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H index 652013aae2..4902997245 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SyamlalOBrien/SyamlalOBrien.H @@ -77,7 +77,8 @@ public: SyamlalOBrien ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C index 7770579a86..21a48c6673 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualEo_("residualEo", dimless, dict.lookup("residualEo")), residualE_("residualE", dimless, dict.lookup("residualE")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H index 7bb3a9c8c6..6c5b72fdca 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.H @@ -87,7 +87,8 @@ public: TomiyamaAnalytic ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C index c7b0eecae6..d01af7ac9d 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::TomiyamaCorrelated::TomiyamaCorrelated ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")), A_("A", dimless, dict.lookup("A")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H index b2a8b8b006..c779d3262e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.H @@ -87,7 +87,8 @@ public: TomiyamaCorrelated ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C index 707ce62683..41aeb231d6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::WenYu::WenYu ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H index e471c38546..48df2ae526 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.H @@ -88,7 +88,8 @@ public: WenYu ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C index b76d90e390..754931df12 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C @@ -42,7 +42,8 @@ const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0); Foam::dragModel::dragModel ( - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : regIOobject @@ -51,7 +52,10 @@ Foam::dragModel::dragModel ( IOobject::groupName(typeName, pair.name()), pair.phase1().mesh().time().timeName(), - pair.phase1().mesh() + pair.phase1().mesh(), + IOobject::NO_READ, + IOobject::NO_WRITE, + registerObject ) ), pair_(pair) @@ -61,7 +65,8 @@ Foam::dragModel::dragModel Foam::dragModel::dragModel ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : regIOobject @@ -70,7 +75,10 @@ Foam::dragModel::dragModel ( IOobject::groupName(typeName, pair.name()), pair.phase1().mesh().time().timeName(), - pair.phase1().mesh() + pair.phase1().mesh(), + IOobject::NO_READ, + IOobject::NO_WRITE, + registerObject ) ), pair_(pair), diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H index abaed5c530..ef0462e735 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H @@ -87,9 +87,10 @@ public: dictionary, ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ), - (dict, pair) + (dict, pair, registerObject) ); @@ -104,14 +105,16 @@ public: // Construct without residual constants dragModel ( - const phasePair& pair + const phasePair& pair, + const bool registerObject ); // Construct with residual constants dragModel ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C index b2c9657e4f..ce06feab07 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C @@ -52,7 +52,7 @@ Foam::autoPtr Foam::dragModel::New << exit(FatalError); } - return cstrIter()(dict, pair); + return cstrIter()(dict, pair, true); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C index f12e3bf972..f57979c349 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.C @@ -44,10 +44,11 @@ namespace dragModels Foam::dragModels::noDrag::noDrag ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(pair) + dragModel(pair, registerObject) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H index 356c08c438..74c30e6745 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/noDrag/noDrag.H @@ -66,7 +66,8 @@ public: noDrag ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C index 47016fb5c0..08b59fbf6b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -45,10 +45,11 @@ namespace dragModels Foam::dragModels::segregated::segregated ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - dragModel(dict, pair), + dragModel(dict, pair, registerObject), residualRe_("residualRe", dimless, dict.lookup("residualRe")), m_("m", dimless, dict.lookup("m")), n_("n", dimless, dict.lookup("n")) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H index 3e2925f87c..1b68d94d25 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.H @@ -88,7 +88,8 @@ public: segregated ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C index 9ddcc4e358..9e248c8bd8 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.C @@ -49,10 +49,11 @@ namespace virtualMassModels Foam::virtualMassModels::Lamb::Lamb ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - virtualMassModel(dict, pair) + virtualMassModel(dict, pair, registerObject) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H index 86f42ed3e1..2fe4e1647c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/Lamb/Lamb.H @@ -74,7 +74,8 @@ public: Lamb ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C index b76ec41c6c..bdf1ab08b4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C @@ -50,10 +50,11 @@ Foam::virtualMassModels::constantVirtualMassCoefficient:: constantVirtualMassCoefficient ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - virtualMassModel(dict, pair), + virtualMassModel(dict, pair, registerObject), Cvm_("Cvm", dimless, dict.lookup("Cvm")) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H index f8b1f5a3de..8ce2b691ad 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.H @@ -75,7 +75,8 @@ public: constantVirtualMassCoefficient ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C index 674bd63b9b..56d69ec77f 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.C @@ -44,10 +44,11 @@ namespace virtualMassModels Foam::virtualMassModels::noVirtualMass::noVirtualMass ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : - virtualMassModel(dict, pair) + virtualMassModel(dict, pair, registerObject) {} diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H index ca498c4606..a8733e5f43 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/noVirtualMass/noVirtualMass.H @@ -66,7 +66,8 @@ public: noVirtualMass ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C index d8df3a8b50..82b9b47f17 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C @@ -52,7 +52,7 @@ Foam::autoPtr Foam::virtualMassModel::New << exit(FatalError); } - return cstrIter()(dict, pair); + return cstrIter()(dict, pair, true); } diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C index ffdfb44a83..f709a092e4 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.C @@ -42,7 +42,8 @@ const Foam::dimensionSet Foam::virtualMassModel::dimK(dimDensity); Foam::virtualMassModel::virtualMassModel ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ) : regIOobject @@ -51,7 +52,10 @@ Foam::virtualMassModel::virtualMassModel ( IOobject::groupName(typeName, pair.name()), pair.phase1().mesh().time().timeName(), - pair.phase1().mesh() + pair.phase1().mesh(), + IOobject::NO_READ, + IOobject::NO_WRITE, + registerObject ) ), pair_(pair) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H index 90222e8f67..bfaf457345 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/virtualMassModel.H @@ -77,9 +77,10 @@ public: dictionary, ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject ), - (dict, pair) + (dict, pair, registerObject) ); @@ -95,7 +96,8 @@ public: virtualMassModel ( const dictionary& dict, - const phasePair& pair + const phasePair& pair, + const bool registerObject );