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

This commit is contained in:
sergio
2016-12-12 10:36:33 -08:00
604 changed files with 10106 additions and 2368 deletions

View File

@ -17,9 +17,11 @@ FoamFile
#include "${FOAM_CASE}/constant/caseSettings"
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone rotatingZone;

View File

@ -26,8 +26,8 @@ boundaryField
type outletMappedUniformInletHeatAddition;
outletPatchName outlet1;
Q 5; // Heat addition in W
minTempLimit 300;
maxTempLimit 500;
TMin 300;
TMax 500;
value $internalField;
}

View File

@ -66,7 +66,7 @@ relaxationFactors
{
p 1;
U 0.9;
e 0.9;
e 0.8;
k 0.9;
epsilon 0.9;
}

View File

@ -27,9 +27,9 @@ beta [0 0 0 -1 0 0 0] 3e-03;
TRef [0 0 0 1 0 0 0] 300;
// Laminar Prandtl number
Pr [0 0 0 0 0 0 0] 0.9;
Pr [0 0 0 0 0 0 0] 0.7;
// Turbulent Prandtl number
Prt [0 0 0 0 0 0 0] 0.7;
Prt [0 0 0 0 0 0 0] 0.85;
// ************************************************************************* //

View File

@ -27,9 +27,9 @@ beta [0 0 0 -1 0 0 0] 3e-03;
TRef [0 0 0 1 0 0 0] 300;
// Laminar Prandtl number
Pr [0 0 0 0 0 0 0] 0.9;
Pr [0 0 0 0 0 0 0] 0.7;
// Turbulent Prandtl number
Prt [0 0 0 0 0 0 0] 0.7;
Prt [0 0 0 0 0 0 0] 0.85;
// ************************************************************************* //

View File

@ -27,9 +27,9 @@ beta [0 0 0 -1 0 0 0] 3e-03;
TRef [0 0 0 1 0 0 0] 300;
// Laminar Prandtl number
Pr [0 0 0 0 0 0 0] 0.9;
Pr [0 0 0 0 0 0 0] 0.7;
// Turbulent Prandtl number
Prt [0 0 0 0 0 0 0] 0.7;
Prt [0 0 0 0 0 0 0] 0.85;
// ************************************************************************* //

View File

@ -1,8 +1,6 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
set -x
m4 < system/blockMeshDict.m4 > system/blockMeshDict
blockMesh > log.blockMesh 2>&1

View File

@ -15,11 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solver solidBody;
solidBodyMotionFvMeshCoeffs
solidBodyCoeffs
{
cellZone rotor;
@ -32,5 +32,4 @@ solidBodyMotionFvMeshCoeffs
}
}
// ************************************************************************* //

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone inletChannel;

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone innerCylinderSmall;

View File

@ -15,7 +15,7 @@ runApplication blockMesh
runApplication decomposePar -decomposeParDict system/decomposeParDict.hierarchical
# \cp system/decomposeParDict.ptscotch system/decomposeParDict
runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -profiling -overwrite -parallel
runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -profiling -overwrite
find . -type f -iname "*level*" -exec rm {} \;

View File

@ -0,0 +1,9 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
#------------------------------------------------------------------------------

View File

@ -0,0 +1,9 @@
v -5 0.4 0
v -4 0.4 0
v -3 0.4 0.7
v -2.5 0.4 2
v -2 0.4 2
v -1 0.4 0.7
v -0.6 0.4 0
v 10 0.4 0
l 1 2 3 4 5 6 7 8

View File

@ -0,0 +1,13 @@
# vtk DataFile Version 4.0
vtk output
ASCII
DATASET POLYDATA
POINTS 17 double
-5.0437 0.4 -0.0159845 -4.54848 0.4 0.00946291 -4.30524 0.4 0.0219617
-4.11475 0.4 0.0317502 -3.65463 0.4 0.0664504 -3.42509 0.4 0.242198
-3.26981 0.4 0.570689 -3.04354 0.4 0.986036 -2.80622 0.4 1.28924
-2.45212 0.4 1.43367 -2.10187 0.4 1.42911 -1.8115 0.4 1.2018
-1.52708 0.4 0.866397 -1.30229 0.4 0.49514 -1.04633 0.4 0.189424
-0.5819 0.4 -5.75752e-05 4 0.4 0
LINES 1 18
17 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16

View File

@ -0,0 +1,177 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
geometry
{
cylinder
{
type searchableCylinder;
point1 (0 -4 0);
point2 (0 4 0);
radius 0.7;
}
cylinder3
{
type searchableCylinder;
point1 (-10 0.4 0);
point2 (10 0.4 0);
radius 0.5;
}
cylinder2
{
type searchableExtrudedCircle;
file "curve2.vtk";
radius 0.5;
}
inletPlane
{
type searchablePlate;
origin (-4 -50 -50);
span (0 100 100);
}
}
vertices
(
// Vertical cylinder
name v0 project (-1 -0.1 -1) (cylinder cylinder2)
name v1 project ( 1 -0.1 -1) (cylinder)
name v2 project ( 1 0.9 -1) (cylinder)
name v3 project (-1 0.9 -1) (cylinder cylinder2)
name v4 project (-1 -0.1 1) (cylinder cylinder2)
name v5 project ( 1 -0.1 1) (cylinder)
name v6 project ( 1 0.9 1) (cylinder)
name v7 project (-1 0.9 1) (cylinder cylinder2)
// Horizontal cylinder
name v8 project (-4 0 -0.5) (cylinder2 inletPlane)
name v9 project (-4 1 -0.5) (cylinder2 inletPlane)
name v10 project (-4 0 0.5) (cylinder2 inletPlane)
name v11 project (-4 1 0.5) (cylinder2 inletPlane)
// On top of vertical cylinder
name v12 project (-1 2 -1) (cylinder)
name v13 project ( 1 2 -1) (cylinder)
name v14 project ( 1 2 1) (cylinder)
name v15 project (-1 2 1) (cylinder)
// Below vertical cylinder
name v16 project (-1 -1 -1) (cylinder)
name v17 project ( 1 -1 -1) (cylinder)
name v18 project ( 1 -1 1) (cylinder)
name v19 project (-1 -1 1) (cylinder)
);
blocks
(
hex (v0 v1 v2 v3 v4 v5 v6 v7) (8 8 8) simpleGrading (1 1 1)
name sideBlock hex (v0 v3 v9 v8 v4 v7 v11 v10) (8 20 8)
simpleGrading (1 1 1)
hex ( v7 v6 v2 v3 v15 v14 v13 v12) (8 8 8) simpleGrading (1 1 1)
hex (v16 v19 v18 v17 v0 v4 v5 v1) (8 8 8) simpleGrading (1 1 1)
);
edges
(
project v0 v1 (cylinder)
project v1 v2 (cylinder)
project v2 v3 (cylinder)
project v1 v5 (cylinder)
project v2 v6 (cylinder)
project v4 v5 (cylinder)
project v5 v6 (cylinder)
project v6 v7 (cylinder)
// Common face
project v3 v0 (cylinder cylinder2)
project v3 v7 (cylinder cylinder2)
project v7 v4 (cylinder cylinder2)
project v0 v4 (cylinder cylinder2)
// Inlet
project v8 v10 (cylinder2 inletPlane)
project v10 v11 (cylinder2 inletPlane)
project v11 v9 (cylinder2 inletPlane)
project v9 v8 (cylinder2 inletPlane)
// Sides of horizontal cylinder. Use projectCurve to do interpolation
// for radial direction to keep points along edges at constant radial
// direction.
projectCurve v8 v0 (cylinder2)
projectCurve v9 v3 (cylinder2)
projectCurve v11 v7 (cylinder2)
projectCurve v10 v4 (cylinder2)
// Top cylinder
project v12 v15 (cylinder)
project v15 v14 (cylinder)
project v14 v13 (cylinder)
project v13 v12 (cylinder)
// Bottom cylinder
project v16 v17 (cylinder)
project v17 v18 (cylinder)
project v18 v19 (cylinder)
project v19 v16 (cylinder)
);
faces
(
// Common face
project (v0 v4 v7 v3) cylinder
project (v8 v0 v4 v10) cylinder2
project (v10 v4 v7 v11) cylinder2
project (v11 v7 v3 v9) cylinder2
project (v8 v9 v3 v0) cylinder2
);
defaultPatch
{
name walls;
type wall;
}
boundary
(
side
{
type patch;
faces ((sideBlock 3)); //((v8 v10 v11 v9));
}
inlet
{
type patch;
faces ((v17 v18 v19 v16));
}
outlet
{
type patch;
faces ((v12 v15 v14 v13));
}
);
// ************************************************************************* //

View File

@ -0,0 +1,58 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libblockMesh.so");
DebugSwitches
{
// project 1;
// searchableExtrudedCircle 1;
// projectCurve 1;
}
application blockMesh;
startFrom startTime;
startTime 0;
stopAt endTime;
endTime 0;
deltaT 0;
writeControl timeStep;
writeInterval 1;
purgeWrite 0;
writeFormat ascii;
writePrecision 6;
writeCompression off;
timeFormat general;
timePrecision 6;
runTimeModifiable true;
// ************************************************************************* //

View File

@ -0,0 +1,37 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSchemes;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
ddtSchemes
{}
gradSchemes
{}
divSchemes
{}
laplacianSchemes
{}
interpolationSchemes
{}
snGradSchemes
{}
// ************************************************************************* //

View File

@ -0,0 +1,18 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object fvSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// ************************************************************************* //

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone rotating;

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction SDA;
SDACoeffs

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone rotating;

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction SDA;
SDACoeffs

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction SDA;
SDACoeffs

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction SDA;
SDACoeffs

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction SDA;
SDACoeffs

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction tabulated6DoFMotion;
tabulated6DoFMotionCoeffs

View File

@ -15,9 +15,11 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
solidBodyMotionFunction multiMotion;

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone innerCylinderSmall;

View File

@ -15,11 +15,13 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dynamicFvMesh solidBodyMotionFvMesh;
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ( "libfvMotionSolvers.so" );
solidBodyMotionFvMeshCoeffs
solver solidBody;
solidBodyCoeffs
{
cellZone rotor;

View File

@ -10,7 +10,7 @@ runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5'
runApplication -a $(getApplication)
fi

View File

@ -10,7 +10,7 @@ runApplication $(getApplication)
if ! isTest $@
then
foamDictionary system/controlDict -entry endTime -set 5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 1e5
foamDictionary 2/T.liquid -entry boundaryField.wall2.q -set 'uniform 1e5'
runApplication -a $(getApplication)
fi