BUG: twoPhaseEulerFoam: fixed multiple registering of blended drag and virtual mass models

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

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

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"))
 {}
 

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

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"))

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

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"))
 {}
 

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

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"))
 {}
 

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

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"))
 {}
 

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

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"))
 {}

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

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"))
 {}

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

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"))
 {}
 

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

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),

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

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C

@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(dict, pair);
+    return cstrIter()(dict, pair, true);
 }
 
 

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

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

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"))

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

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

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

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"))
 {}
 

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

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

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

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/virtualMassModel/newVirtualMassModel.C

@@ -52,7 +52,7 @@ Foam::autoPtr<Foam::virtualMassModel> Foam::virtualMassModel::New
             << exit(FatalError);
     }
 
-    return cstrIter()(dict, pair);
+    return cstrIter()(dict, pair, true);
 }
 
 

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)

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