From 38038c110865044488172c4abfad6bf1f81bfd0b Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Dec 2013 14:26:19 +0000 Subject: [PATCH 1/2] Corrected object name --- tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org | 2 +- .../MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water | 2 +- .../interFoam/laminar/capillaryRise/0/alpha.water.org | 2 +- .../multiphase/interFoam/ras/waterChannel/0/alpha.water.org | 2 +- .../twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org index dbef449a2f..d722029120 100644 --- a/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org +++ b/tutorials/multiphase/LTSInterFoam/wigleyHull/0/alpha.water.org @@ -11,7 +11,7 @@ FoamFile format ascii; class volScalarField; location "0"; - object alpha; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water index 0f3dcd4639..e1483e3c1e 100644 --- a/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water +++ b/tutorials/multiphase/MRFMultiphaseInterFoam/mixerVessel2D/0.org/alpha.water @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alpha1; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org index f4ef030951..67a10a49fd 100644 --- a/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org +++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/0/alpha.water.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alpha; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org index 914cb9ee1a..d5b5bc0ce7 100644 --- a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org +++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha.water.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alpha; + object alpha.water; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air index 637ebed0e8..b995d77c16 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air +++ b/tutorials/multiphase/twoPhaseEulerFoam/laminar/mixerVessel2D/0/alpha.air @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object alpha1; + object alpha.air; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From 5d94a4bfd2e68708054b9b10467f086bbc0d474c Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 5 Dec 2013 14:26:39 +0000 Subject: [PATCH 2/2] HrenyaSinclairConductivity: added missing g0 --- .../HrenyaSinclair/HrenyaSinclairConductivity.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C index 2d2e1f6551..179903b082 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C @@ -91,7 +91,7 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::kappa return da*sqrt(Theta)* ( 2.0*sqr(alpha1)*g0*(1.0 + e)/sqrtPi - + (9.0/8.0)*sqrtPi*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1) + + (9.0/8.0)*sqrtPi*g0*0.25*sqr(1.0 + e)*(2.0*e - 1.0)*sqr(alpha1) /(49.0/16.0 - 33.0*e/16.0) + (15.0/16.0)*sqrtPi*alpha1*(0.5*sqr(e) + 0.25*e - 0.75 + lamda) /((49.0/16.0 - 33.0*e/16.0)*lamda)