Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

This commit is contained in:
andy
2011-11-25 11:59:06 +00:00
12 changed files with 280 additions and 14 deletions

View File

@ -52,7 +52,7 @@ cleanTimeDirectories()
rm -rf ./${timeDir} ./-${timeDir} > /dev/null 2>&1
zeros="0$zeros"
done
rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./.setSet > /dev/null 2>&1
rm -rf ./[1-9]* ./-[1-9]* ./log ./log.* ./log-* ./logSummary.* ./.fxLock ./*.xml ./ParaView* ./paraFoam* ./*.OpenFOAM ./*.blockMesh ./.setSet > /dev/null 2>&1
}

View File

@ -7,5 +7,6 @@ cd ${0%/*} || exit 1 # run from this directory
cleanCase
\rm -rf 0
\rm -f constant/triSurface*.eMesh*
\rm -r constant/extendedFeatureEdgeMesh/
\rm -f constant/triSurface/*.eMesh*

View File

@ -10,8 +10,7 @@ cp -rf 0.org 0
runApplication blockMesh
# create the set for the obstacles
runApplication setSet -batch createObstacle.setSet
mv log.setSet log.setSet1
runApplication topoSet
# create the obstacles - add obstacle patches to wallFilm patch
runApplication subsetMesh c0 -patch wallFilm -overwrite

View File

@ -0,0 +1,72 @@
/*--------------------------------*- 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 topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name c0;
type cellSet;
action clear;
}
{
name c0;
type cellSet;
action invert;
}
{
name c0;
type cellSet;
action delete;
source boxToCell;
sourceInfo
{
box (0.4 0.1 0.1) (0.6 0.3 0.3);
}
}
{
name c0;
type cellSet;
action delete;
source boxToCell;
sourceInfo
{
box (0.4 0.1 0.4) (0.6 0.3 0.6);
}
}
{
name c0;
type cellSet;
action delete;
source boxToCell;
sourceInfo
{
box (0.4 0.4 0.1) (0.6 0.6 0.3);
}
}
{
name c0;
type cellSet;
action delete;
source boxToCell;
sourceInfo
{
box (0.4 0.4 0.4) (0.6 0.6 0.6);
}
}
);
// ************************************************************************* //

View File

@ -5,8 +5,9 @@ cp -rf 0.org 0
runApplication blockMesh
runApplication setSet -batch wallFilmRegion.setSet
mv log.setSet log.wallFilmRegion.setSet
#runApplication setSet -batch wallFilmRegion.setSet
#mv log.setSet log.wallFilmRegion.setSet
runApplication topoSet -dict system/wallFilmRegion.topoSet
runApplication extrudeToRegionMesh -overwrite

View File

@ -0,0 +1,42 @@
/*--------------------------------*- 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 topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name wallFilmFaces;
type faceSet;
action new;
source patchToFace;
sourceInfo
{
name filmWalls;
}
}
{
name wallFilmFaces;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet wallFilmFaces;
}
}
);
// ************************************************************************* //

View File

@ -5,13 +5,17 @@ cp -rf 0.org 0
runApplication blockMesh
runApplication setSet -batch wallFilmRegion.setSet
mv log.setSet log.wallFilmRegion.setSet
#runApplication setSet -batch wallFilmRegion.setSet
#mv log.setSet log.wallFilmRegion.setSet
runApplication topoSet -dict system/wallFilmRegion.topoSet
mv log.topoSet log.wallFilmRegion.topoSet
runApplication extrudeToRegionMesh -overwrite
runApplication setSet -region wallFilmRegion -batch createWallFilmRegionPatches.setSet
mv log.setSet log.createWallFilmRegionPatches.setSet
#runApplication setSet -region wallFilmRegion -batch createWallFilmRegionPatches.setSet
#mv log.setSet log.createWallFilmRegionPatches.setSet
runApplication topoSet -region wallFilmRegion -dict system/createWallFilmRegionPatches.topoSet
mv log.topoSet log.createWallFilmRegionPatches.topoSet
runApplication createPatch -region wallFilmRegion -overwrite

View File

@ -0,0 +1,42 @@
/*--------------------------------*- 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 topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name wallFilmFaces;
type faceSet;
action new;
source patchToFace;
sourceInfo
{
name filmWalls;
}
}
{
name wallFilmFaces;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet wallFilmFaces;
}
}
);
// ************************************************************************* //

View File

@ -0,0 +1,62 @@
/*--------------------------------*- 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 topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name sideFaces1;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.00001 -0.00001 -1) (0.10001 0.00001 1);
}
}
{
name sideFaces2;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box ( 0.09999 -0.00001 -1) (0.10001 0.05001 1);
}
}
{
name sideFaces3;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.00001 0.04999 -1) (1.00001 0.05001 1);
}
}
{
name sideFaces4;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.00001 -0.00001 -1) (0.00001 0.05001 1);
}
}
);
// ************************************************************************* //

View File

@ -6,7 +6,8 @@ cd ${0%/*} || exit 1 # run from this directory
cp -r 0.org 0 > /dev/null 2>&1
runApplication blockMesh
runApplication setSet -batch createObstacle.setSet
#runApplication setSet -batch createObstacle.setSet
runApplication topoSet
runApplication subsetMesh -overwrite c0 -patch walls
runApplication setFields
runApplication `getApplication`

View File

@ -21,13 +21,13 @@ FoamFile
{
type patch;
nFaces 1024;
startFace 95232;
startFace 93568;
}
walls
{
type wall;
nFaces 5120;
startFace 96256;
nFaces 5376;
startFace 94592;
}
)

View File

@ -0,0 +1,42 @@
/*--------------------------------*- 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 topoSetDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
actions
(
{
name c0;
type cellSet;
action clear;
}
{
name c0;
type cellSet;
action invert;
}
{
name c0;
type cellSet;
action delete;
source boxToCell;
sourceInfo
{
box (0.375 0.375 0) (0.625 0.625 0.25);
}
}
);
// ************************************************************************* //