From 83f7e9aab2b7bce57abb532b7c23b593a403eb4f Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Tue, 20 Aug 2013 11:43:04 +0100 Subject: [PATCH] Mixing plane update --- .../fields/fvPatchFields/basic/mixed/mixedFvPatchField.C | 4 ++-- .../constraint/mixingPlane/mixingPlaneFvPatchField.C | 6 ++---- .../constraint/mixingPlane/mixingPlaneFvPatchField.H | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C index 3c036ef30..5ecac51ac 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/mixed/mixedFvPatchField.C @@ -180,7 +180,7 @@ tmp > mixedFvPatchField::valueInternalCoeffs const tmp& ) const { - return Type(pTraits::one)*(1.0 - valueFraction_); + return pTraits::one*(1.0 - valueFraction_); } @@ -200,7 +200,7 @@ tmp > mixedFvPatchField::valueBoundaryCoeffs template tmp > mixedFvPatchField::gradientInternalCoeffs() const { - return -Type(pTraits::one)*valueFraction_*this->patch().deltaCoeffs(); + return -pTraits::one*valueFraction_*this->patch().deltaCoeffs(); } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.C index e17d6c169..67a854eb0 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.C @@ -61,8 +61,6 @@ void mixingPlaneFvPatchField::readMixingType() const ( dict.lookup(fieldName) ); - Info<< "Custom mixing type for " << fieldName << ": " - << mixingPlaneInterpolation::mixingTypeNames_[mixing_] << endl; } else if (dict.found("default")) { @@ -615,7 +613,7 @@ tmp > mixingPlaneFvPatchField::valueBoundaryCoeffs // || mixing_ == mixingPlaneInterpolation::FLUX_AVERAGING // ) // { -// return -Type(pTraits::one)*this->patch().deltaCoeffs(); +// return -pTraits::one*this->patch().deltaCoeffs(); // } // else if (mixing_ == mixingPlaneInterpolation::ZERO_GRADIENT) // { @@ -761,7 +759,7 @@ void mixingPlaneFvPatchField::patchInterpolate ( this->patchInternalField() ) - + pY*this->patchNeighbourField(); + + pY*this->patchNeighbourField(); } else if (mixing_ == mixingPlaneInterpolation::ZERO_GRADIENT) { diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.H index c5da5cb20..1ed6ceddf 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/constraint/mixingPlane/mixingPlaneFvPatchField.H @@ -74,7 +74,7 @@ class mixingPlaneFvPatchField word phiName_; //- Flux mask for averaging. Size is equal to the number of bands - // Flux mask behaves live valueFraction: + // Flux mask behaves like valueFraction: // 1 = use interpolated value from mixing plane interpolator // 0 = use patch internal field to mimic zero gradient behaviour mutable scalarField fluxMask_;