diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/VenkatakrishnanGradientLimiter.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/VenkatakrishnanGradientLimiter.H index c5aa5a005..ece67cb60 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/VenkatakrishnanGradientLimiter.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/VenkatakrishnanGradientLimiter.H @@ -83,13 +83,18 @@ class Venkatakrishnan public: - Venkatakrishnan(Istream&) - {} + // Constructors - inline scalar limiter(const scalar r) const - { - return (sqr(r) + 2*r)/(sqr(r) + r + 2); - } + Venkatakrishnan(Istream&) + {} + + + // Member Functions + + inline scalar limiter(const scalar r) const + { + return (sqr(r) + 2*r)/(sqr(r) + r + 2); + } }; diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H index 0ecb5752a..9270d1b6d 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/cubicGradientLimiter.H @@ -80,40 +80,54 @@ namespace gradientLimiters class cubic { - const scalar rt_; - const scalar a_; - const scalar b_; + // Private Data + + //- Limiter transition point at which the limiter function -> 1 + // Must be > 1 + const scalar rt_; + + //- Coefficient of the r^3 term (evaluated from rt) + const scalar a_; + + // - Coefficient of the r^2 term (evaluated from rt) + const scalar b_; + public: - cubic(Istream& schemeData) - : - rt_(readScalar(schemeData)), - a_(2.0/sqr(rt_) - 2.0/pow3(rt_)), - b_(-(3.0/2.0)*a_*rt_) - { - if (rt_ < 1) - { - FatalIOErrorInFunction - ( - schemeData - ) << "coefficient = " << rt_ - << " should be > 1" - << exit(FatalIOError); - } - } + // Constructors - inline scalar limiter(const scalar r) const - { - if (r < rt_) + cubic(Istream& schemeData) + : + rt_(readScalar(schemeData)), + a_(2.0/sqr(rt_) - 2.0/pow3(rt_)), + b_(-(3.0/2.0)*a_*rt_) { - return ((a_*r + b_)*r + 1)*r; + if (rt_ < 1) + { + FatalIOErrorInFunction + ( + schemeData + ) << "coefficient = " << rt_ + << " should be > 1" + << exit(FatalIOError); + } } - else + + + // Member Functions + + inline scalar limiter(const scalar r) const { - return 1; + if (r < rt_) + { + return ((a_*r + b_)*r + 1)*r; + } + else + { + return 1; + } } - } }; diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/minmodGradientLimiter.H b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/minmodGradientLimiter.H index 3088c5a9e..33e898447 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/minmodGradientLimiter.H +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/gradientLimiters/minmodGradientLimiter.H @@ -69,13 +69,18 @@ class minmod public: - minmod(Istream&) - {} + // Constructors - inline scalar limiter(const scalar r) const - { - return min(r, 1); - } + minmod(Istream&) + {} + + + // Member Functions + + inline scalar limiter(const scalar r) const + { + return min(r, 1); + } };