updated to compatibility with OF1912

unicfdlab · Jan 29, 2020 · 1baf5a8 · 1baf5a8
1 parent 0dd818f
commit 1baf5a8
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 5 deletions.
diff --git a/Sources/pimpleCentral/centralMULES/centralMULES.C b/Sources/pimpleCentral/centralMULES/centralMULES.C
@@ -85,8 +85,8 @@ void Foam::mulesWithDiffusionImplicitLimiter
         rhoPhifCorr,
         zeroField(), //Sp
         Su,
-        1.0, //psiMax,
-        0.0 //psiMin,
+        oneField(), //psiMax,
+        zeroField() //psiMin,
     );
 
     Y.rename(Yname);
@@ -136,8 +136,8 @@ void Foam::mulesWithDiffusionImplicitLimiter
         rhoPhifCorr,
         zeroField(),
         Su,
-        1.0, //psiMax,
-        0.0 //psiMin,
+        oneField(), //psiMax,
+        zeroField() //psiMin,
     );
     Y.rename(Yname);
 }

diff --git a/Sources/pimpleCentral/compressibleTwoPhaseThermo/compressibleTwoPhaseMixtureThermo.C b/Sources/pimpleCentral/compressibleTwoPhaseThermo/compressibleTwoPhaseMixtureThermo.C
@@ -70,7 +70,13 @@ Foam::compressibleTwoPhaseMixtureThermo::compressibleTwoPhaseMixtureThermo
 :
     rhoThermo(mesh, word::null),
     compressibleTwoPhaseMixture(mesh, *this),
-    pMin_(this->lookup("pMin")),
+    pMin_
+    (
+        "pMin",
+        dimensionSet(1,-1,-2,0,0),
+        0.0,
+        *this
+    ),
     thermoLiq_(nullptr),
     thermoGas_(nullptr),
     he_
@@ -480,6 +486,18 @@ Foam::tmp<Foam::scalarField> Foam::compressibleTwoPhaseMixtureThermo::mu(const l
     return mu_.boundaryField()[patchi];
 }
 
+Foam::tmp<Foam::volScalarField> Foam::compressibleTwoPhaseMixtureThermo::alphahe() const
+{
+    return YLiq()*thermoLiq_->alpha() + YGas()*thermoGas_->alpha();
+}
+
+Foam::tmp<Foam::scalarField> Foam::compressibleTwoPhaseMixtureThermo::alphahe(const label patchi) const
+{
+    return
+        YLiq().boundaryField()[patchi]*thermoLiq_->alpha(patchi)
+      + YGas().boundaryField()[patchi]*thermoGas_->alpha(patchi);
+}
+
 Foam::tmp<Foam::volScalarField> Foam::compressibleTwoPhaseMixtureThermo::rho() const
 {
     return rhoEff_;

diff --git a/Sources/pimpleCentral/compressibleTwoPhaseThermo/compressibleTwoPhaseMixtureThermo.H b/Sources/pimpleCentral/compressibleTwoPhaseThermo/compressibleTwoPhaseMixtureThermo.H
@@ -299,6 +299,12 @@ public:
             //- Dynamic viscosity of mixture for patch [kg/m/s]
             virtual tmp<scalarField> mu(const label patchi) const;
 
+            //-  Enthalpy/energy diffusion coefficient of mixture [kg/m/s]
+            virtual tmp<volScalarField> alphahe() const;
+
+            //-  Enthalpy/energy diffusion coefficient of mixture for patch [kg/m/s]
+            virtual tmp<scalarField> alphahe(const label patchi) const;
+
             //- Mixture density
             virtual tmp<volScalarField> rho() const;
 

diff --git a/Sources/pimpleCentral/compressibleTwoPhaseThermo/simplePhasePsiThermo.H b/Sources/pimpleCentral/compressibleTwoPhaseThermo/simplePhasePsiThermo.H
@@ -316,6 +316,12 @@ public:
 	    return alpha_;
 	}
 
+	//-
+	const fvPatchField<scalar>& alpha(const label patchi) const
+	{
+	    return alpha_.boundaryField()[patchi];
+	}
+
 	volScalarField& rho()
 	{
 	    return rho_;