zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of develop.openfoam.com:Development/OpenFOAM-plus

Browse Source
This commit is contained in:
sergio
2019-07-30 08:49:57 -07:00
committed by Andrew Heather
parent 962e6f6318 8dd3c7f2bc
commit f95b67b565
7 changed files with 112 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
META-INFO/api-info
View File

@ -1,2 +1,2 @@
api=1906
patch=190708
patch=190724

23
etc/caseDicts/postProcessing/fields/lambVector Normal file
View File

@ -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;
// ************************************************************************* //

2
src/OpenFOAM/primitives/quaternion/quaternionI.H
View File

@ -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;

48
tutorials/incompressible/pimpleFoam/LES/channel395DFSEM/system/controlDict
View File

@ -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;
}
);
}

122
tutorials/incompressible/simpleFoam/bump2D/system/blockMeshDict
View File

@ -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
(
);
// ************************************************************************* //

2
tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kEpsilon/p
View File

@ -46,7 +46,7 @@ boundaryField
{
type zeroGradient;
}
bottomWall
{
type zeroGradient;

2
tutorials/incompressible/simpleFoam/turbulentFlatPlate/0.kOmegaSST/p
View File

@ -46,7 +46,7 @@ boundaryField
{
type zeroGradient;
}
bottomWall
{
type zeroGradient;