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

This commit is contained in:
mattijs 2011-11-23 15:28:54 +00:00
commit fabf645c08
16 changed files with 203 additions and 19 deletions

View File

@ -49,7 +49,7 @@ foreach cmake ( cmake-2.8.4 cmake-2.8.3 cmake-2.8.1 )
end
#- ParaView version, automatically determine major version:
setenv ParaView_VERSION 3.10.1
setenv ParaView_VERSION 3.12.0
setenv ParaView_MAJOR detect

View File

@ -51,7 +51,7 @@ done
#- ParaView version, automatically determine major version
export ParaView_VERSION=3.10.1
export ParaView_VERSION=3.12.0
export ParaView_MAJOR=detect

View File

@ -9,20 +9,18 @@ application=`getApplication`
runApplication blockMesh
runApplication setSet -batch cRefine.setSet
runApplication topoSet -dict cRefine.topoSetDict
runApplication refineMesh -overwrite -dict
rm log.setSet
runApplication setSet -batch f.setSet
rm log.setSet
runApplication setSet -batch fZone.setSet
rm log.topoSet
runApplication topoSet -dict f.topoSetDict
# create the pyrolysis region.
runApplication extrudeToRegionMesh -overwrite
rm log.setSet
runApplication setSet -batch fBurner.setSet
rm log.topoSet
runApplication topoSet -dict fBurner.topoSetDict
runApplication createPatch -overwrite

View File

@ -1 +0,0 @@
cellSet refineCells new boxToCell (-0.15 0.0 -0.3)(0.15 2.4 0.3)

View File

@ -0,0 +1,32 @@
/*--------------------------------*- 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 refineCells;
type cellSet;
action new;
source boxToCell;
sourceInfo
{
box (-0.15 0.0 -0.3)(0.15 2.4 0.3);
}
}
);
// ************************************************************************* //

View File

@ -1,2 +0,0 @@
faceSet fLeft new boxToFace (-0.151 0 -0.3)(-0.14999 2.4 0.3)
faceSet fRight new boxToFace (0.14999 0 -0.3)(0.151 2.4 0.3)

View File

@ -0,0 +1,66 @@
/*--------------------------------*- 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 fLeft;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.151 0 -0.3)(-0.14999 2.4 0.3);
}
}
{
name fRight;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (0.14999 0 -0.3)(0.151 2.4 0.3);
}
}
{
name fRight_zone;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet fRight;
}
}
{
name fLeft_zone;
type faceZoneSet;
action new;
source setToFaceZone;
sourceInfo
{
faceSet fLeft;
}
}
);
// ************************************************************************* //

View File

@ -1 +0,0 @@
faceSet fBurner new boxToFace (-0.15 -0.001 -0.30) (0.15 0.001 0.30)

View File

@ -0,0 +1,32 @@
/*--------------------------------*- 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 fBurner;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.15 -0.001 -0.30) (0.15 0.001 0.30);
}
}
);
// ************************************************************************* //

View File

@ -1,2 +0,0 @@
faceZoneSet fRight_zone new setToFaceZone fRight
faceZoneSet fLeft_zone new setToFaceZone fLeft

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions
runApplication blockMesh
runApplication setSet -batch makeFaceSet.setSet
runApplication topoSet
runApplication createPatch -overwrite
# Run

View File

@ -1 +0,0 @@
faceSet f0 new boxToFace (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1)

View File

@ -0,0 +1,32 @@
/*--------------------------------*- 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 f0;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.0529 -0.001 -0.1)(0.0529 0.002 0.1);
}
}
);
// ************************************************************************* //

View File

@ -7,7 +7,7 @@
application=`getApplication`
runApplication blockMesh
runApplication setSet -batch makeFaceSet.setSet
runApplication topoSet
runApplication createPatch -overwrite
runApplication decomposePar -force

View File

@ -1 +0,0 @@
faceSet f0 new boxToFace (-0.1 -0.001 -0.1)(0.1 0.005 0.1)

View File

@ -0,0 +1,32 @@
/*--------------------------------*- 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 f0;
type faceSet;
action new;
source boxToFace;
sourceInfo
{
box (-0.1 -0.001 -0.1)(0.1 0.005 0.1);
}
}
);
// ************************************************************************* //