From eecbe11085d87204b69651e650d2d01a63535e4d Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 10 Apr 2013 12:15:47 +0100 Subject: [PATCH] CentredFitSnGrad: Change deltaCoeffs -> nonOrthDeltaCoeffs for very non-orthogonal meshes --- .../CentredFitSnGrad/CentredFitSnGradData.C | 4 +--- .../CentredFitSnGrad/CentredFitSnGradData.H | 3 ++- .../CentredFitSnGrad/CentredFitSnGradScheme.H | 23 ++++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C index 135deac4bf..36a363ea1f 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.C @@ -25,9 +25,7 @@ License #include "CentredFitSnGradData.H" #include "surfaceFields.H" -#include "volFields.H" #include "SVD.H" -#include "syncTools.H" #include "extendedCentredCellToFaceStencil.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -226,7 +224,7 @@ void Foam::CentredFitSnGradData::calcFit() // find the fit coefficients for every face in the mesh const surfaceScalarField& w = mesh.surfaceInterpolation::weights(); - const surfaceScalarField& dC = mesh.deltaCoeffs(); + const surfaceScalarField& dC = mesh.nonOrthDeltaCoeffs(); for (label facei = 0; facei < mesh.nInternalFaces(); facei++) { diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H index c025a17dd5..be834684a7 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H +++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradData.H @@ -25,7 +25,7 @@ Class Foam::CentredFitSnGradData Description - Data for the quadratic fit correction interpolation scheme + Data for centred fit snGrad schemes SourceFiles CentredFitSnGradData.C @@ -64,6 +64,7 @@ class CentredFitSnGradData // values of the stencil to obtain the gradient for each direction List coeffs_; + public: TypeName("CentredFitSnGradData"); diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H index ca307811e6..d92478c317 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H +++ b/src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H @@ -100,7 +100,7 @@ public: const GeometricField& ) const { - return this->mesh().deltaCoeffs(); + return this->mesh().nonOrthDeltaCoeffs(); } //- Return true if this scheme uses an explicit correction @@ -124,18 +124,18 @@ public: ); const CentredFitSnGradData& cfd = - CentredFitSnGradData::New - ( - mesh, - stencil, - linearLimitFactor_, - centralWeight_ - ); - - const List& f = cfd.coeffs(); + CentredFitSnGradData::New + ( + mesh, + stencil, + linearLimitFactor_, + centralWeight_ + ); tmp > sft - = stencil.weightedSum(vf, f); + ( + stencil.weightedSum(vf, cfd.coeffs()) + ); sft().dimensions() /= dimLength; @@ -143,6 +143,7 @@ public: } }; + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace fv