Merge commit 'origin/master' into splitCyclic

Conflicts:
	applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
	applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/cyclic/cyclicPointPatch.C
	src/OpenFOAM/meshes/pointMesh/pointPatches/constraint/processor/processorPointPatch.C
	src/dynamicMesh/motionSmoother/motionSmoother.C
	src/dynamicMesh/motionSmoother/motionSmoother.H
	src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
This commit is contained in:
mattijs
2010-05-18 13:28:21 +01:00
480 changed files with 13145 additions and 5249 deletions

View File

@ -10,7 +10,7 @@ application=`getApplication`
runApplication blockMesh
# create ignition cells cellSet
runApplication cellSet
runApplication topoSet
runApplication $application

View File

@ -10,21 +10,24 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
object cellSetDict;
object topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
name ignitionCells;
action new;
topoSetSources
actions
(
sphereToCell
{
centre ( 0.125 0.375 0.05 );
radius 0.005;
name ignitionCells;
type cellSet;
action new;
source sphereToCell;
sourceInfo
{
centre ( 0.125 0.375 0.05 );
radius 0.005;
}
}
);

View File

@ -1,32 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object cellSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
name filter;
action new;
topoSetSources
(
// Cells with cell centre within box
boxToCell
{
box (1.5 -1 -1) (2 1 1);
}
);
// ************************************************************************* //