Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
mattijs
2013-01-17 14:55:28 +00:00
3 changed files with 14 additions and 30 deletions

View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -334,7 +334,7 @@ Foam::Time::Time
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
runTimeModifiable_(true),
runTimeModifiable_(false),
functionObjects_(*this, enableFunctionObjects)
{
@ -427,7 +427,7 @@ Foam::Time::Time
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
runTimeModifiable_(true),
runTimeModifiable_(false),
functionObjects_(*this, !args.optionFound("noFunctionObjects"))
{
@ -523,7 +523,7 @@ Foam::Time::Time
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
runTimeModifiable_(true),
runTimeModifiable_(false),
functionObjects_(*this, enableFunctionObjects)
{
@ -619,7 +619,7 @@ Foam::Time::Time
writeVersion_(IOstream::currentVersion),
writeCompression_(IOstream::UNCOMPRESSED),
graphFormat_("raw"),
runTimeModifiable_(true),
runTimeModifiable_(false),
functionObjects_(*this, enableFunctionObjects)
{

View File

@ -98,21 +98,8 @@ Foam::fv::correctedSnGrad<Type>::correction
ssf.replace
(
cmpt,
mesh.nonOrthCorrectionVectors()
& linear
<
typename
outerProduct<vector, typename pTraits<Type>::cmptType>::type
>(mesh).interpolate
(
gradScheme<typename pTraits<Type>::cmptType>::New
(
mesh,
mesh.gradScheme("grad(" + ssf.name() + ')')
)()
//gaussGrad<typename pTraits<Type>::cmptType>(mesh)
.grad(vf.component(cmpt))
)
correctedSnGrad<typename pTraits<Type>::cmptType>(mesh)
.fullGradCorrection(vf.component(cmpt))
);
}