From a3bc9ffbf9f68c4748037515943b3b5411c21268 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Thu, 4 Aug 2011 14:21:22 +0100 Subject: [PATCH] Deffered 01 schemes --- .../DeferredCorrectionLimitedScheme.H | 8 ++++---- .../surfaceInterpolation/limitedSchemes/Gamma/Gamma.C | 11 +++++++++++ .../limitedSchemes/LimitedScheme/LimitedScheme.H | 2 +- .../limitedSchemes/vanLeer/vanLeer.C | 10 ++++++++++ 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H index 3772345ed..16f3c9b3d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/DeferredCorrectionLimitedScheme/DeferredCorrectionLimitedScheme.H @@ -203,16 +203,16 @@ limitedSurfaceInterpolationScheme::addMeshFluxConstructorToTable \ add##SS##LIMFUNC##TYPE##MeshFluxConstructorToLimitedTable_; -#define makeDeferredSurfaceInterpolationScheme(SS, LIMITER) \ +#define makeDeferredSurfaceInterpolationScheme(SS, LIMITER) \ \ -makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,scalar) \ -makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,vector) \ +makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,scalar) \ +makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,vector) \ makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,sphericalTensor) \ makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,symmTensor)\ makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDTVD,magSqr,tensor) -#define makeDeferredVSurfaceInterpolationScheme(SS, LIMITER) \ +#define makeDeferredVSurfaceInterpolationScheme(SS, LIMITER) \ makeDeferredSurfaceInterpolationTypeScheme(SS,LIMITER,NVDVTVDV,null,vector) diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.C index 69b125d16..aeb6fe307 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/Gamma/Gamma.C @@ -60,6 +60,17 @@ namespace Foam // Deferred correction schemes makeDeferredSurfaceInterpolationScheme(GammaDC, GammaLimiter) makeDeferredVSurfaceInterpolationScheme(GammaVDC, GammaLimiter) + + makeLDeferredSurfaceInterpolationTypeScheme + ( + Gamma01DC, + Limited01Limiter, + GammaLimiter, + NVDTVD, + magSqr, + scalar + ) + } // ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H index 241ae1d82..c011da3b4 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.H @@ -97,7 +97,7 @@ public: Limiter(weight) {} - //- Construct from mesh and Istream. + //- Construct from mesh and Istream // The name of the flux field is read from the Istream and looked-up // from the mesh objectRegistry LimitedScheme diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanLeer/vanLeer.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanLeer/vanLeer.C index ab4ecb7e0..7455bfa2a 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanLeer/vanLeer.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/vanLeer/vanLeer.C @@ -61,6 +61,16 @@ namespace Foam // Deferred correction schemes makeDeferredSurfaceInterpolationScheme(vanLeerDC, vanLeerLimiter) makeDeferredVSurfaceInterpolationScheme(vanLeerVDC, vanLeerLimiter) + + makeLDeferredSurfaceInterpolationTypeScheme + ( + vanLeer01DC, + Limited01Limiter, + vanLeerLimiter, + NVDTVD, + magSqr, + scalar + ) } // ************************************************************************* //