From 2e1e8837c0411bf014e0f6918be7f2e97b97d4d9 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 6 Dec 2018 14:19:23 +0000 Subject: [PATCH] outletPhaseMeanVelocity: Renamed Umean to UnMean This is to make it clear that the value supplied is the scalar mean velocity normal to the patch, and to distinguish it from other instances of the keyword "UMean" which take a vector quantity. --- ...utletPhaseMeanVelocityFvPatchVectorField.C | 28 +++++++++---------- ...utletPhaseMeanVelocityFvPatchVectorField.H | 10 +++---- .../multiphase/interFoam/RAS/DTCHull/0/U | 6 ++-- .../interFoam/RAS/DTCHullMoving/0/U | 6 ++-- .../interFoam/RAS/DTCHullWave/0/U.orig | 8 +++--- .../interFoam/laminar/wave/0/U.orig | 2 +- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C index a85ff194ae..1880e8c8e7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.C @@ -39,7 +39,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField ) : mixedFvPatchField(p, iF), - Umean_(nullptr), + UnMean_(nullptr), alphaName_("none") { refValue() = Zero; @@ -58,7 +58,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField ) : mixedFvPatchField(ptf, p, iF, mapper), - Umean_(ptf.Umean_, false), + UnMean_(ptf.UnMean_, false), alphaName_(ptf.alphaName_) {} @@ -72,7 +72,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField ) : mixedFvPatchField(p, iF), - Umean_(Function1::New("Umean", dict)), + UnMean_(Function1::New("UnMean", dict)), alphaName_(dict.lookup("alpha")) { refValue() = Zero; @@ -100,7 +100,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField ) : mixedFvPatchField(ptf), - Umean_(ptf.Umean_, false), + UnMean_(ptf.UnMean_, false), alphaName_(ptf.alphaName_) {} @@ -113,7 +113,7 @@ Foam::outletPhaseMeanVelocityFvPatchVectorField ) : mixedFvPatchField(ptf, iF), - Umean_(ptf.Umean_, false), + UnMean_(ptf.UnMean_, false), alphaName_(ptf.alphaName_) {} @@ -138,23 +138,23 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::updateCoeffs() // Get the patchInternalField (zero-gradient field) vectorField Uzg(patchInternalField()); - // Calculate the phase mean zero-gradient velocity - scalar Uzgmean = + // Calculate the phase mean zero-gradient normal velocity + const scalar UnzgMean = gSum(alphap*(patch().Sf() & Uzg)) /gSum(alphap*patch().magSf()); // Set the refValue and valueFraction to adjust the boundary field - // such that the phase mean is Umean_ - const scalar Umean = Umean_->value(t); - if (Uzgmean >= Umean) + // such that the phase mean is UnMean_ + const scalar UnMean = UnMean_->value(t); + if (UnzgMean >= UnMean) { refValue() = Zero; - valueFraction() = 1.0 - Umean/Uzgmean; + valueFraction() = 1.0 - UnMean/UnzgMean; } else { - refValue() = (Umean + Uzgmean)*patch().nf(); - valueFraction() = 1.0 - Uzgmean/Umean; + refValue() = (UnMean + UnzgMean)*patch().nf(); + valueFraction() = 1.0 - UnzgMean/UnMean; } mixedFvPatchField::updateCoeffs(); @@ -168,7 +168,7 @@ void Foam::outletPhaseMeanVelocityFvPatchVectorField::write { fvPatchField::write(os); - Umean_->writeData(os); + UnMean_->writeData(os); os.writeKeyword("alpha") << alphaName_ << token::END_STATEMENT << nl; writeEntry("value", os); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H index 1e488ceb0e..cead0d6b92 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletPhaseMeanVelocity/outletPhaseMeanVelocityFvPatchVectorField.H @@ -35,7 +35,7 @@ Description Usage \table Property | Description | Required | Default value - Umean | mean velocity normal to the boundary [m/s] | yes | + UnMean | mean velocity normal to the boundary [m/s] | yes | alpha | phase-fraction field | yes | \endtable @@ -44,7 +44,7 @@ Usage { type outletPhaseMeanVelocity; - Umean 1.2; + UnMean 1.2; alpha alpha.water; value uniform (1.2 0 0); } @@ -70,7 +70,7 @@ SourceFiles namespace Foam { /*---------------------------------------------------------------------------*\ - Class outletPhaseMeanVelocityFvPatchVectorField Declaration + Class outletPhaseMeanVelocityFvPatchVectorField Declaration \*---------------------------------------------------------------------------*/ class outletPhaseMeanVelocityFvPatchVectorField @@ -79,8 +79,8 @@ class outletPhaseMeanVelocityFvPatchVectorField { // Private data - //- Inlet integral flow rate - autoPtr> Umean_; + //- Mean velocity normal to the boundary + autoPtr> UnMean_; //- Name of the phase-fraction field word alphaName_; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/0/U b/tutorials/multiphase/interFoam/RAS/DTCHull/0/U index 6aedda0111..f7f9b1f286 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/0/U +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/0/U @@ -15,11 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Umean 1.668; +UMean 1.668; dimensions [0 1 -1 0 0 0 0]; -internalField uniform (#neg $Umean 0 0); +internalField uniform (#neg $UMean 0 0); boundaryField { @@ -36,7 +36,7 @@ boundaryField { type outletPhaseMeanVelocity; alpha alpha.water; - Umean $Umean; + UnMean $UMean; value $internalField; } diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U index e7ccf9a4d8..a999a6b157 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/0/U @@ -15,11 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Umean 1.668; +UMean 1.668; dimensions [0 1 -1 0 0 0 0]; -internalField uniform (#neg $Umean 0 0); +internalField uniform (#neg $UMean 0 0); boundaryField { @@ -36,7 +36,7 @@ boundaryField { type outletPhaseMeanVelocity; alpha alpha.water; - Umean $Umean; + UnMean $UMean; value $internalField; } diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig index 4830e6dd92..9ed04308ef 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/0/U.orig @@ -15,11 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Umean 1.668; +UMean 1.668; dimensions [0 1 -1 0 0 0 0]; -internalField uniform (#neg $Umean 0 0); +internalField uniform (#neg $UMean 0 0); boundaryField { @@ -31,7 +31,7 @@ boundaryField type waveVelocity; origin (0 0 0.244); direction (-1 0 0); - speed $Umean; + speed $UMean; waves ( Stokes2 @@ -49,7 +49,7 @@ boundaryField { type outletPhaseMeanVelocity; alpha alpha.water; - Umean $Umean; + UnMean $UMean; value $internalField; } diff --git a/tutorials/multiphase/interFoam/laminar/wave/0/U.orig b/tutorials/multiphase/interFoam/laminar/wave/0/U.orig index 1d54922e4f..fbe501ec7c 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/0/U.orig +++ b/tutorials/multiphase/interFoam/laminar/wave/0/U.orig @@ -45,7 +45,7 @@ boundaryField right { type outletPhaseMeanVelocity; - Umean 2; + UnMean 2; alpha alpha.water; } top