Merge branch 'master' of ssh://dm/home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2013-06-20 10:45:19 +01:00
169 changed files with 2674 additions and 1659 deletions

View File

@ -38,7 +38,7 @@ boundaryField
}
outlet
{
type fixedFluxPressure;
type fixedValue;
value $internalField;
}
fixedWalls

View File

@ -41,7 +41,7 @@ boundaryField
value $internalField;
}
"motorBike_.*"
motorBikeGroup
{
type fixedValue;
value uniform (0 0 0);

View File

@ -41,7 +41,7 @@ boundaryField
value $internalField;
}
"motorBike_.*"
motorBikeGroup
{
type kqRWallFunction;
value $internalField;

View File

@ -54,7 +54,7 @@ boundaryField
value uniform 0;
}
"motorBike_.*"
motorBikeGroup
{
type nutkWallFunction;
value uniform 0;

View File

@ -40,7 +40,7 @@ boundaryField
value $internalField;
}
"motorBike_.*"
motorBikeGroup
{
type omegaWallFunction;
value $internalField;

View File

@ -41,7 +41,7 @@ boundaryField
type zeroGradient;
}
"motorBike_.*"
motorBikeGroup
{
type zeroGradient;
}

View File

@ -3,8 +3,10 @@
# Source tutorial clean functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
# remove surface
# remove surface and features
\rm -f constant/triSurface/motorBike.obj.gz
\rm -rf constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/motorBike.eMesh
rm -rf 0 > /dev/null 2>&1

View File

@ -12,12 +12,11 @@ forceCoeffs1
functionObjectLibs ( "libforces.so" );
outputControl timeStep;
outputInterval 1;
outputControl outputTime;
log yes;
patches ( "motorBike.*" );
patches ( motorBikeGroup );
pName p;
UName U;
rhoName rhoInf; // Indicates incompressible
@ -31,6 +30,7 @@ forceCoeffs1
lRef 1.42; // Wheelbase length
Aref 0.75; // Estimated
/* - Uncomment to have forceCoeffs calculated in 20 bins
binData
{
nBin 20; // output data into 20 bins
@ -38,6 +38,7 @@ forceCoeffs1
format gnuplot;
cumulative yes;
}
*/
}

View File

@ -22,6 +22,7 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) cellLimited Gauss linear 1;
}
divSchemes

View File

@ -20,7 +20,7 @@ solvers
{
solver GAMG;
tolerance 1e-7;
relTol 0.1;
relTol 0.01;
smoother GaussSeidel;
nPreSweeps 0;
nPostSweeps 2;

View File

@ -92,7 +92,7 @@ castellatedMeshControls
(
{
file "motorBike.eMesh";
level 0;
level 6;
}
);
@ -119,7 +119,7 @@ castellatedMeshControls
patchInfo
{
type wall;
inGroups (motorBike);
inGroups (motorBikeGroup);
}
}
}
@ -180,10 +180,10 @@ snapControls
//- Relative distance for points to be attracted by surface feature point
// or edge. True distance is this factor times local
// maximum edge length.
tolerance 4.0;
tolerance 2.0;
//- Number of mesh displacement relaxation iterations.
nSolveIter 0;
nSolveIter 30;
//- Maximum number of snapping relaxation iterations. Should stop
// before upon reaching a correct mesh.
@ -193,14 +193,14 @@ snapControls
//- Number of feature edge snapping iterations.
// Leave out altogether to disable.
nFeatureSnapIter 0;
nFeatureSnapIter 10;
//- Detect (geometric only) features by sampling the surface
// (default=false).
implicitFeatureSnap false;
//- Use castellatedMeshControls::features (default = true)
explicitFeatureSnap false;
explicitFeatureSnap true;
//- Detect points on multiple surfaces (only for explicitFeatureSnap)
multiRegionFeatureSnap false;

View File

@ -16,7 +16,6 @@ near
// Output every
outputControl outputTime;
//outputInterval 1;
// Fields to be sampled. Per field original name and mapped field to
// create.
@ -27,7 +26,7 @@ near
);
// Patches/groups to sample (regular expressions)
patches (motorBike);
patches (motorBikeGroup);
// Distance to sample
distance 0.001;
@ -42,7 +41,6 @@ wallBoundedStreamLines
// Output every
outputControl outputTime;
// outputInterval 10;
setFormat vtk; //gnuplot; //xmgr; //raw; //jplot;
@ -87,7 +85,7 @@ wallBoundedStreamLines
patchSeedCoeffs
{
type patchSeed;
patches (motorBike);
patches (motorBikeGroup);
axis x; //distance;
maxPoints 20000;
}

View File

@ -40,7 +40,7 @@ boundaryField
walls
{
type epsilonWallFunction;
value uniform 0;
value $internalField;
}
}

View File

@ -1,64 +0,0 @@
/*--------------------------------*- 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 polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
inlet
{
type patch;
nFaces 28;
startFace 4422;
}
outlet
{
type patch;
nFaces 28;
startFace 4450;
}
side1
{
type cyclicAMI;
inGroups 1(cyclicAMI);
nFaces 400;
startFace 4478;
matchTolerance 0.0001;
transform rotational;
neighbourPatch side2;
rotationAxis (1 0 0);
rotationCentre (0 0 0);
}
side2
{
type cyclicAMI;
inGroups 1(cyclicAMI);
nFaces 250;
startFace 4878;
matchTolerance 0.0001;
transform rotational;
neighbourPatch side1;
rotationAxis (1 0 0);
rotationCentre (0 0 0);
}
walls
{
type wall;
nFaces 250;
startFace 5128;
}
)
// ************************************************************************* //

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object reactingCloud1Properties;
object kinematicCloudProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -48,8 +48,6 @@ constantProperties
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;
constantVolume false;
}
@ -66,18 +64,12 @@ subModels
dispersionModel none;
patchInteractionModel standardWallInteraction;
heatTransferModel none;
stochasticCollisionModel none;
patchInteractionModel none;
surfaceFilmModel none;
collisionModel pairCollision;
radiation off;
pairCollisionCoeffs
{
// Maximum possible particle diameter expected at any time
@ -123,11 +115,6 @@ subModels
}
};
}
standardWallInteractionCoeffs
{
type rebound;
}
}

View File

@ -11,7 +11,7 @@ FoamFile
format ascii;
class dictionary;
location "constant";
object reactingCloud1Properties;
object kinematicCloudProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -40,8 +40,6 @@ constantProperties
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;
constantVolume false;
}
subModels
@ -76,18 +74,12 @@ subModels
dispersionModel none;
patchInteractionModel standardWallInteraction;
heatTransferModel none;
stochasticCollisionModel none;
patchInteractionModel none;
surfaceFilmModel none;
collisionModel pairCollision;
radiation off;
pairCollisionCoeffs
{
// Maximum possible particle diameter expected at any time
@ -133,11 +125,6 @@ subModels
}
};
}
standardWallInteractionCoeffs
{
type rebound;
}
}

View File

@ -10,8 +10,8 @@ nProc=$(getNumberOfProcessors)
# copy flange surface from resources folder
cp $FOAM_TUTORIALS/resources/geometry/blob.stl.gz constant/triSurface/
runApplication blockMesh
runApplication decomposePar
runApplication blockMesh -region backgroundMeshDecomposition
runApplication decomposePar -region backgroundMeshDecomposition
runParallel foamyHexMesh $nProc
runParallel collapseEdges $nProc -latestTime -collapseFaces

View File

@ -9,44 +9,39 @@ FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
class dictionary;
location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
frontAndBack
{
type patch;
nFaces 320;
startFace 3456;
}
inlet
{
type patch;
nFaces 64;
startFace 3776;
}
outlet
{
type patch;
nFaces 64;
startFace 3840;
}
lowerWall
{
type wall;
nFaces 160;
startFace 3904;
}
upperWall
{
type patch;
nFaces 160;
startFace 4064;
}
)
numberOfSubdomains 2;
method scotch;
//method ptscotch;
// method hierarchical;
simpleCoeffs
{
n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 1 1 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -0,0 +1 @@
../fvSchemes

View File

@ -0,0 +1 @@
../fvSolution

View File

@ -1,47 +0,0 @@
/*--------------------------------*- 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 decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 2;
method scotch;
//method ptscotch;
// method hierarchical;
simpleCoeffs
{
n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 1 1 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -0,0 +1 @@
backgroundMeshDecomposition/decomposeParDict

View File

@ -11,12 +11,8 @@ nProc=$(getNumberOfProcessors)
cp $FOAM_TUTORIALS/resources/geometry/flange.stl.gz constant/triSurface/
# Create tight-fitting background mesh
runApplication blockMesh
runApplication topoSet -dict system/topoSetDict-background
mv log.topoSet log.topoSet.background
runApplication subsetMesh background -patch walls -overwrite
runApplication decomposePar
runApplication blockMesh -region backgroundMeshDecomposition
runApplication decomposePar -region backgroundMeshDecomposition
runParallel foamyHexMesh $nProc
runParallel collapseEdges $nProc -latestTime -collapseFaces

View File

@ -9,20 +9,38 @@ FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
class dictionary;
location "system";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
1
(
walls
{
type wall;
nFaces 126;
startFace 207;
}
)
numberOfSubdomains 8;
//method scotch;
method hierarchical;
simpleCoeffs
{
n ( 2 2 2 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 2 2 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -0,0 +1 @@
../fvSchemes

View File

@ -0,0 +1 @@
../fvSolution

View File

@ -1,46 +0,0 @@
/*--------------------------------*- 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 decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 8;
//method scotch;
method hierarchical;
simpleCoeffs
{
n ( 2 2 2 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 2 2 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -0,0 +1 @@
backgroundMeshDecomposition/decomposeParDict

View File

@ -43,8 +43,8 @@ mv log.surfaceBooleanFeatures log.surfaceBooleanFeatures.stirrer_shaftRotating
runApplication surfaceFeatureExtract
runApplication blockMesh
runApplication decomposePar
runApplication blockMesh -region backgroundMeshDecomposition
runApplication decomposePar -region backgroundMeshDecomposition
runParallel foamyHexMesh $nProcs

View File

@ -0,0 +1,47 @@
/*--------------------------------*- 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 decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 8;
//method ptscotch;
//method hierarchical;
method scotch;
simpleCoeffs
{
n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 2 2 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -1,47 +0,0 @@
/*--------------------------------*- 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 decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 8;
//method ptscotch;
//method hierarchical;
method scotch;
simpleCoeffs
{
n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 2 2 2 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "";
}
distributed no;
roots ( );
// ************************************************************************* //

View File

@ -0,0 +1 @@
backgroundMeshDecomposition/decomposeParDict