Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

This commit is contained in:
Henry
2011-04-28 21:14:18 +01:00
129 changed files with 6693 additions and 2629 deletions

View File

@ -23,7 +23,7 @@ cp -r 0.org 0
runApplication mapFields ../wingMotion2D_simpleFoam -sourceTime latestTime -consistent
mv 0/pointDisplacement.unmapped 0/pointDisplacement
runApplication decomposePar
runParallel `getApplication` 3
runParallel `getApplication` 4
runApplication reconstructPar
# ----------------------------------------------------------------- end-of-file

View File

@ -35,7 +35,7 @@ boundaryField
);
velocity (0 0 0);
acceleration (0 0 0);
angularMomentum (0 0 -0.5);
angularMomentum (0 0 -2.0);
torque (0 0 0);
rhoName rhoInf;
rhoInf 1;

View File

@ -20,38 +20,38 @@ FoamFile
topAndBottom
{
type patch;
nFaces 150;
startFace 76473;
nFaces 72;
startFace 25168;
}
inlet
{
type patch;
nFaces 48;
startFace 76623;
nFaces 40;
startFace 25240;
}
outlet
{
type patch;
nFaces 48;
startFace 76671;
nFaces 62;
startFace 25280;
}
front
{
type empty;
nFaces 38129;
startFace 76719;
nFaces 12559;
startFace 25342;
}
back
{
type empty;
nFaces 38129;
startFace 114848;
nFaces 12559;
startFace 37901;
}
wing
{
type wall;
nFaces 778;
startFace 152977;
nFaces 378;
startFace 50460;
}
)

View File

@ -23,7 +23,7 @@ startTime 0;
stopAt endTime;
endTime 1;
endTime 0.6;
deltaT 1e-5;

View File

@ -15,27 +15,22 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 3;
numberOfSubdomains 4;
method simple;
simpleCoeffs
{
n ( 1 3 1 );
n ( 2 2 1 );
delta 0.001;
}
hierarchicalCoeffs
{
n ( 3 2 1 );
n ( 2 2 1 );
delta 0.001;
order xyz;
}
manualCoeffs
{
dataFile "cellDecomposition";
}
// ************************************************************************* //

View File

@ -20,38 +20,38 @@ FoamFile
topAndBottom
{
type patch;
nFaces 150;
startFace 76473;
nFaces 72;
startFace 25168;
}
inlet
{
type patch;
nFaces 48;
startFace 76623;
nFaces 40;
startFace 25240;
}
outlet
{
type patch;
nFaces 48;
startFace 76671;
nFaces 62;
startFace 25280;
}
front
{
type empty;
nFaces 38129;
startFace 76719;
nFaces 12559;
startFace 25342;
}
back
{
type empty;
nFaces 38129;
startFace 114848;
nFaces 12559;
startFace 37901;
}
wing
{
type wall;
nFaces 778;
startFace 152977;
nFaces 378;
startFace 50460;
}
)

View File

@ -15,15 +15,35 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Tolerance used in matching faces. Absolute tolerance is span of
// face times this factor. To load incorrectly matches meshes set this
// to a higher value.
matchTolerance 1e-3;
// This application/dictionary controls:
// - optional: create new patches from boundary faces (either given as
// a set of patches or as a faceSet)
// - always: order faces on coupled patches such that they are opposite. This
// is done for all coupled faces, not just for any patches created.
// - optional: synchronise points on coupled patches.
// 1. Create cyclic:
// - specify where the faces should come from
// - specify the type of cyclic. If a rotational specify the rotationAxis
// and centre to make matching easier
// - always create both halves in one invocation with correct 'neighbourPatch'
// setting.
// - optionally pointSync true to guarantee points to line up.
// 2. Correct incorrect cyclic:
// This will usually fail upon loading:
// "face 0 area does not match neighbour 2 by 0.0100005%"
// " -- possible face ordering problem."
// - in polyMesh/boundary file:
// - loosen matchTolerance of all cyclics to get case to load
// - or change patch type from 'cyclic' to 'patch'
// and regenerate cyclic as above
// Do a synchronisation of coupled points after creation of any patches.
// Note: this does not work with points that are on multiple coupled patches
// with transformations.
pointSync true;
// with transformations (i.e. cyclics).
pointSync false;
// Patches to create.
patches

View File

@ -19,19 +19,19 @@ convertToMeters 1;
vertices
(
(-2.5 -4.8 -0.1)
( 10 -4.8 -0.1)
( 10 4.8 -0.1)
(-2.5 4.8 -0.1)
(-2.5 -4.8 0.1)
( 10 -4.8 0.1)
( 10 4.8 0.1)
(-2.5 4.8 0.1)
(-1.2 -2.2 -0.1)
( 5 -2.2 -0.1)
( 5 2.2 -0.1)
(-1.2 2.2 -0.1)
(-1.2 -2.2 0.1)
( 5 -2.2 0.1)
( 5 2.2 0.1)
(-1.2 2.2 0.1)
);
blocks
(
hex (0 1 2 3 4 5 6 7) (75 48 1) simpleGrading (1 1 1)
hex (0 1 2 3 4 5 6 7) (36 24 1) simpleGrading (1 1 1)
);
edges

View File

@ -20,38 +20,38 @@ FoamFile
topAndBottom
{
type patch;
nFaces 150;
startFace 2098769;
nFaces 72;
startFace 495985;
}
inlet
{
type patch;
nFaces 48;
startFace 2098919;
nFaces 72;
startFace 496057;
}
outlet
{
type patch;
nFaces 48;
startFace 2098967;
nFaces 204;
startFace 496129;
}
front
{
type empty;
nFaces 38129;
startFace 2099015;
nFaces 12559;
startFace 496333;
}
back
{
type empty;
nFaces 38120;
startFace 2137144;
nFaces 12559;
startFace 508892;
}
wing_5degrees.obj_WALL10
{
type wall;
nFaces 49792;
startFace 2175264;
nFaces 12096;
startFace 521451;
}
)

View File

@ -62,10 +62,10 @@ castellatedMeshControls
// actually be a lot less.
maxGlobalCells 2000000;
// The surface refinement loop might spend lots of iterations refining just a
// few cells. This setting will cause refinement to stop if <= minimumRefine
// are selected for refinement. Note: it will at least do one iteration
// (unless the number of cells to refine is 0)
// The surface refinement loop might spend lots of iterations refining just
// a few cells. This setting will cause refinement to stop if <=
// minimumRefine are selected for refinement. Note: it will at least do one
// iteration (unless the number of cells to refine is 0)
minRefinementCells 100;
// Number of buffer layers between different levels.
@ -98,7 +98,7 @@ castellatedMeshControls
wing_5degrees.obj
{
// Surface-wise min and max refinement level
level (6 6);
level (5 5);
}
}
@ -124,7 +124,7 @@ castellatedMeshControls
refinementBox
{
mode inside;
levels ((1e15 3));
levels ((1e15 2));
}
}