diff --git a/applications/test/volField/Test-volField.C b/applications/test/volField/Test-volField.C index a1de0535a3..25d8fbabff 100644 --- a/applications/test/volField/Test-volField.C +++ b/applications/test/volField/Test-volField.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 @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - volFieldTest + Test-volField \*---------------------------------------------------------------------------*/ @@ -52,8 +52,6 @@ int main(int argc, char *argv[]) mesh ); - //Info<< min(p, p); - Info<< "Reading field U\n" << endl; volVectorField U ( @@ -85,9 +83,12 @@ int main(int argc, char *argv[]) zeroGradientFvPatchSymmTensorField::typeName ); - //Info<< fvc::div(st) << endl; - - solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st)); + solve + ( + fvm::ddt(st) + + fvm::div(phi, st) + - fvm::laplacian(dimensionedScalar("D", sqr(dimLength)/dimTime, 1), st) + ); return 0; } diff --git a/applications/test/volField/cavity/system/fvSchemes b/applications/test/volField/cavity/system/fvSchemes index c311eb8961..f63c65fca6 100644 --- a/applications/test/volField/cavity/system/fvSchemes +++ b/applications/test/volField/cavity/system/fvSchemes @@ -23,26 +23,22 @@ ddtSchemes gradSchemes { default Gauss linear; - grad(p) Gauss linear; } divSchemes { default none; - div(phi,U) Gauss linear; + div(phi,st) Gauss linear; } laplacianSchemes { - default none; - laplacian(nu,U) Gauss linear orthogonal; - laplacian((1|A(U)),p) Gauss linear orthogonal; + default Gauss linear orthogonal; } interpolationSchemes { default linear; - interpolate(HbyA) linear; } snGradSchemes diff --git a/applications/test/volField/cavity/system/fvSolution b/applications/test/volField/cavity/system/fvSolution index cc4750f16c..d95ff952c0 100644 --- a/applications/test/volField/cavity/system/fvSolution +++ b/applications/test/volField/cavity/system/fvSolution @@ -17,15 +17,7 @@ FoamFile solvers { - p - { - solver PCG; - preconditioner DIC; - tolerance 1e-06; - relTol 0; - } - - U + st { solver PBiCG; preconditioner DILU; diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C index f60976510c..7007add44e 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C +++ b/src/OpenFOAM/dimensionedTypes/dimensionedSymmTensor/dimensionedSymmTensor.C @@ -128,7 +128,7 @@ dimensionedSymmTensor cof(const dimensionedSymmTensor& dt) return dimensionedSymmTensor ( "cof("+dt.name()+')', - dt.dimensions(), + pow(dt.dimensions(), symmTensor::dim - 1), cof(dt.value()) ); } diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.C b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.C index 8c56ef7aaa..50cbf00a7a 100644 --- a/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.C +++ b/src/OpenFOAM/dimensionedTypes/dimensionedTensor/dimensionedTensor.C @@ -95,7 +95,7 @@ dimensionedTensor cof(const dimensionedTensor& dt) return dimensionedTensor ( "cof("+dt.name()+')', - dt.dimensions(), + pow(dt.dimensions(), tensor::dim - 1), cof(dt.value()) ); } @@ -106,7 +106,7 @@ dimensionedTensor inv(const dimensionedTensor& dt) return dimensionedTensor ( "inv("+dt.name()+')', - dimless/dt.dimensions(), + inv(dt.dimensions()), inv(dt.value()) ); } diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.C index 88cd833cf3..a173aa7a77 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSphericalTensorField/DimensionedSphericalTensorField.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 @@ -37,7 +37,7 @@ namespace Foam UNARY_FUNCTION(scalar, sphericalTensor, tr, transform) UNARY_FUNCTION(sphericalTensor, sphericalTensor, sph, transform) -UNARY_FUNCTION(scalar, sphericalTensor, det, transform) +UNARY_FUNCTION(scalar, sphericalTensor, det, pow3) UNARY_FUNCTION(sphericalTensor, sphericalTensor, inv, inv) BINARY_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide) diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C index 29297c45d4..f92b103ad1 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedSymmTensorField/DimensionedSymmTensorField.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 @@ -44,8 +44,8 @@ UNARY_FUNCTION(symmTensor, symmTensor, symm, transform) UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform) UNARY_FUNCTION(symmTensor, symmTensor, dev, transform) UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform) -UNARY_FUNCTION(scalar, symmTensor, det, transform) -UNARY_FUNCTION(symmTensor, symmTensor, cof, cof) +UNARY_FUNCTION(scalar, symmTensor, det, pow3) +UNARY_FUNCTION(symmTensor, symmTensor, cof, pow2) UNARY_FUNCTION(symmTensor, symmTensor, inv, inv) diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C index ba11c8aed8..4a89640572 100644 --- a/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.C +++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedTensorField/DimensionedTensorField.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 @@ -43,8 +43,8 @@ UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform) UNARY_FUNCTION(tensor, tensor, skew, transform) UNARY_FUNCTION(tensor, tensor, dev, transform) UNARY_FUNCTION(tensor, tensor, dev2, transform) -UNARY_FUNCTION(scalar, tensor, det, transform) -UNARY_FUNCTION(tensor, tensor, cof, cof) +UNARY_FUNCTION(scalar, tensor, det, pow3) +UNARY_FUNCTION(tensor, tensor, cof, pow2) UNARY_FUNCTION(tensor, tensor, inv, inv) UNARY_FUNCTION(vector, tensor, eigenValues, transform) UNARY_FUNCTION(tensor, tensor, eigenVectors, sign) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.C index 4963844157..d8c9897b6b 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricSphericalTensorField/GeometricSphericalTensorField.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 @@ -37,7 +37,7 @@ namespace Foam UNARY_FUNCTION(scalar, sphericalTensor, tr, transform) UNARY_FUNCTION(sphericalTensor, sphericalTensor, sph, transform) -UNARY_FUNCTION(scalar, sphericalTensor, det, transform) +UNARY_FUNCTION(scalar, sphericalTensor, det, pow3) UNARY_FUNCTION(sphericalTensor, sphericalTensor, inv, inv) BINARY_OPERATOR(sphericalTensor, scalar, sphericalTensor, /, '|', divide) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C index 23b616aa79..1f5f054e92 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricSymmTensorField/GeometricSymmTensorField.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 @@ -44,8 +44,8 @@ UNARY_FUNCTION(symmTensor, symmTensor, symm, transform) UNARY_FUNCTION(symmTensor, symmTensor, twoSymm, transform) UNARY_FUNCTION(symmTensor, symmTensor, dev, transform) UNARY_FUNCTION(symmTensor, symmTensor, dev2, transform) -UNARY_FUNCTION(scalar, symmTensor, det, transform) -UNARY_FUNCTION(symmTensor, symmTensor, cof, cof) +UNARY_FUNCTION(scalar, symmTensor, det, pow3) +UNARY_FUNCTION(symmTensor, symmTensor, cof, pow2) UNARY_FUNCTION(symmTensor, symmTensor, inv, inv) diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C index 1ed11a7ed7..91ddb0f182 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricTensorField/GeometricTensorField.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 @@ -44,8 +44,8 @@ UNARY_FUNCTION(symmTensor, tensor, twoSymm, transform) UNARY_FUNCTION(tensor, tensor, skew, transform) UNARY_FUNCTION(tensor, tensor, dev, transform) UNARY_FUNCTION(tensor, tensor, dev2, transform) -UNARY_FUNCTION(scalar, tensor, det, transform) -UNARY_FUNCTION(tensor, tensor, cof, cof) +UNARY_FUNCTION(scalar, tensor, det, pow3) +UNARY_FUNCTION(tensor, tensor, cof, pow2) UNARY_FUNCTION(tensor, tensor, inv, inv) UNARY_FUNCTION(vector, tensor, eigenValues, transform) UNARY_FUNCTION(tensor, tensor, eigenVectors, sign)