From b0a1a3fd0b2ae6b9830db117546df76814fa3410 Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Wed, 24 Jul 2019 09:37:38 +0100 Subject: [PATCH 1/4] BUG: quaternion - corrected construction from rotation tensor. Fixes #1348 --- src/OpenFOAM/primitives/quaternion/quaternionI.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H index e692707c30..3c550b8de7 100644 --- a/src/OpenFOAM/primitives/quaternion/quaternionI.H +++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H @@ -259,7 +259,7 @@ inline Foam::quaternion::quaternion - rotationTensor.zz() ); - w_ = (rotationTensor.xz() - rotationTensor.xz())/s; + w_ = (rotationTensor.xz() - rotationTensor.zx())/s; v_[0] = (rotationTensor.xy() + rotationTensor.yx())/s; v_[1] = 0.25*s; v_[2] = (rotationTensor.yz() + rotationTensor.zy())/s; From 5767a7773290bdb01138670819eea1ac0f7c4768 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 24 Jul 2019 09:52:18 +0100 Subject: [PATCH 2/4] TUT: remove trailing space - use git show --ignore-space-change when examining --- .../LES/channel395DFSEM/system/controlDict | 48 +++---- .../simpleFoam/bump2D/system/blockMeshDict | 122 +++++++++--------- .../turbulentFlatPlate/0.kEpsilon/p | 2 +- .../turbulentFlatPlate/0.kOmegaSST/p | 2 +- 4 files changed, 87 insertions(+), 87 deletions(-) diff --git a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict index 2f213c30b5..09dc505710 100644 --- a/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict +++ b/tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict @@ -65,19 +65,19 @@ functions libs ("libfieldFunctionObjects.so"); writeControl writeTime; } - lambVector1 - { - type lambVector; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; - field U; - } - div1 - { - type div; - libs ("libfieldFunctionObjects.so"); - writeControl writeTime; - field lambVector; + lambVector1 + { + type lambVector; + libs ("libfieldFunctionObjects.so"); + writeControl writeTime; + field U; + } + div1 + { + type div; + libs ("libfieldFunctionObjects.so"); + writeControl writeTime; + field lambVector; } fieldAverage1 { @@ -102,18 +102,18 @@ functions base time; } - lambVector - { - mean on; - prime2Mean off; - base time; - } + lambVector + { + mean on; + prime2Mean off; + base time; + } - div(lambVector) - { - mean on; - prime2Mean off; - base time; + div(lambVector) + { + mean on; + prime2Mean off; + base time; } ); } diff --git a/tutorials/incompressible/simpleFoam/bump2D/system/blockMeshDict b/tutorials/incompressible/simpleFoam/bump2D/system/blockMeshDict index d50ac76078..8fc430b236 100644 --- a/tutorials/incompressible/simpleFoam/bump2D/system/blockMeshDict +++ b/tutorials/incompressible/simpleFoam/bump2D/system/blockMeshDict @@ -1,23 +1,23 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: v1906 | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object blockMeshDict; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + object blockMeshDict; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -scale 1; +scale 1; -vertices -( +vertices +( ( -25.0 0 1 ) // 0 ( 0 0 1 ) // 1 ( 0.3 0 1 ) // 2 @@ -45,10 +45,10 @@ vertices ( 0.3 5 -1 ) // 21 ( 0 5 -1 ) // 22 ( -25.0 5 -1 ) // 23 -); +); -blocks -( +blocks +( // Medium level for tutorial hex ( 0 1 13 12 11 10 22 23) (30 1 81) simpleGrading (0.002 1 20000) hex ( 1 2 14 13 10 9 21 22) (25 1 81) simpleGrading (2 1 20000) @@ -62,7 +62,7 @@ blocks //hex ( 2 3 15 14 9 8 20 21) (480 1 648) simpleGrading (1 1 20000) //hex ( 3 4 16 15 8 7 19 20) (200 1 648) simpleGrading (0.5 1 20000) //hex ( 4 5 17 16 7 6 18 19) (240 1 648) simpleGrading (500 1 20000) -); +); edges #codeStream { @@ -101,37 +101,37 @@ edges #codeStream }; -boundary -( - inlet - { - type patch; - faces - ( - (0 11 23 12) - ); - } +boundary +( + inlet + { + type patch; + faces + ( + (0 11 23 12) + ); + } - outlet - { - type patch; - faces - ( + outlet + { + type patch; + faces + ( (17 18 6 5) - ); - } + ); + } - top - { - type symmetryPlane; - faces - ( - (11 10 22 23) + top + { + type symmetryPlane; + faces + ( + (11 10 22 23) (10 9 21 22) ( 9 8 20 21) ( 8 7 19 20) ( 7 6 18 19) - ); + ); } symUp @@ -143,15 +143,15 @@ boundary ); } - bump - { - type wall; - faces - ( - ( 1 13 14 2) + bump + { + type wall; + faces + ( + ( 1 13 14 2) ( 2 14 15 3) ( 3 15 16 4) - ); + ); } symDown @@ -161,7 +161,7 @@ boundary ( ( 4 16 17 5) ); - } + } frontAndBack { @@ -180,12 +180,12 @@ boundary ( 3 8 7 4) ( 4 7 6 5) ); - } + } -); - -mergePatchPairs -( -); - -// ************************************************************************* // +); + +mergePatchPairs +( +); + +// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/p b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/p index 6e98f45d8b..21d3f0ab96 100644 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/p +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/p @@ -46,7 +46,7 @@ boundaryField { type zeroGradient; } - + bottomWall { type zeroGradient; diff --git a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/p b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/p index 6e98f45d8b..21d3f0ab96 100644 --- a/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/p +++ b/tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/p @@ -46,7 +46,7 @@ boundaryField { type zeroGradient; } - + bottomWall { type zeroGradient; From b2f6e60a11b51601df896db9e414af37d5c123a2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 24 Jul 2019 09:52:18 +0100 Subject: [PATCH 3/4] CONFIG: bump patch level --- META-INFO/api-info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/META-INFO/api-info b/META-INFO/api-info index cf3497f429..dedb008f68 100644 --- a/META-INFO/api-info +++ b/META-INFO/api-info @@ -1,2 +1,2 @@ api=1906 -patch=190708 +patch=190724 From 8dd3c7f2bc878b83494588278b96a538bd3c6467 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 29 Jul 2019 10:06:26 +0200 Subject: [PATCH 4/4] CONFIG: add postProcessing/fields/lambVector template (fixes #1386) --- .../postProcessing/fields/lambVector | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 etc/caseDicts/postProcessing/fields/lambVector diff --git a/etc/caseDicts/postProcessing/fields/lambVector b/etc/caseDicts/postProcessing/fields/lambVector new file mode 100644 index 0000000000..f8692fd715 --- /dev/null +++ b/etc/caseDicts/postProcessing/fields/lambVector @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Version: v1906 + \\ / A nd | Web: www.OpenFOAM.com + \\/ M anipulation | +------------------------------------------------------------------------------- +Description + Calculates and writes the second largest eigenvalue of the sum of the + square of the symmetrical and anti-symmetrical parts of the velocity + gradient tensor. + +\*---------------------------------------------------------------------------*/ + +type lambVector; +libs ("libfieldFunctionObjects.so"); + +field U; + +executeControl writeTime; +writeControl writeTime; + +// ************************************************************************* //