Commit 740c4fa8 authored by mattijs's avatar mattijs
Browse files

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

parents 3b637a0d b2656aeb
......@@ -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;
}
......
......@@ -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)
{
......
......@@ -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))
);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment