diff --git a/applications/test/fvc/Test-fvc.C b/applications/test/fvc/Test-fvc.C index 9851a9c9c54cbb8fd4238a661989df820f77d489..32c926eb01f88ccfb2c2160dedfdca6370d304b2 100644 --- a/applications/test/fvc/Test-fvc.C +++ b/applications/test/fvc/Test-fvc.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,21 +35,19 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" -# include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" -# include "createTime.H" -# include "createMesh.H" - - volScalarField fx(pow(mesh.C().component(vector::X), 2)); + volScalarField fx(pow(mesh.C().component(vector::X), 1)); fx.write(); volScalarField gradx4(fvc::grad(fx)().component(vector::X)); gradx4.write(); - //volVectorField curlC(fvc::curl(1.0*mesh.C())); - //curlC.write(); + volVectorField curlC(fvc::curl(1.0*mesh.C())); + curlC.write(); - /* surfaceScalarField xf(mesh.Cf().component(vector::X)); surfaceScalarField xf4(pow(xf, 4)); @@ -58,7 +56,6 @@ int main(int argc, char *argv[]) scalar gradx4a = (xf4[i] - xf4[i-1])/(xf[i] - xf[i-1]); Info<< (gradx4a - gradx4[i])/gradx4a << endl; } - */ Info<< "end" << endl; } diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index 1bcf42e5dcf7da150e804e99954d104aedfde001..14eb3f361629ec936af055375ec0b47ed009f11d 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -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) { diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C index ba7ddcf6fa46e62244908d007cdafa5a01a02a8e..56d087107e07e1c008615ee06261bc6db653dae3 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C @@ -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)) ); }