zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GIT: Resolved conflict

Browse Source
This commit is contained in:
Andrew Heather
2015-12-09 16:19:28 +00:00
parent abeef3313d ed2db73e50
commit 5c9dff6146
2311 changed files with 44971 additions and 26546 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/blockMeshDict
View File

@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant/polyMesh";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

36
tutorials/lagrangian/icoUncoupledKinematicParcelFoam/hopper/hopperInitialState/constant/polyMesh/boundary
View File

@ -1,36 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
2
(
walls
{
type wall;
inGroups 1(wall);
nFaces 136;
startFace 1852;
}
frontAndBack
{
type wall;
inGroups 1(wall);
nFaces 1920;
startFace 1988;
}
)
// ************************************************************************* //

2
tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/Allrun.pre
View File

@ -30,7 +30,7 @@ rm -rf system/wallFilmRegion
cp -r system/wallFilmRegion.org system/wallFilmRegion
find ./0 -maxdepth 1 -type f -exec \
sed -i "s/wallFilm/\"(region0_to.*)\"/g" {} \;
sed -i -e "s/wallFilm/\"(region0_to.*)\"/g" {} \;
paraFoam -touch
paraFoam -touch -region wallFilmRegion

1
tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/blockMeshDict
View File

@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant/polyMesh";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/blockMeshDict
View File

@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant/polyMesh";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

47
tutorials/lagrangian/reactingParcelFoam/counterFlowFlame2DLTS/constant/polyMesh/boundary
View File

@ -1,47 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
fuel
{
type patch;
nFaces 40;
startFace 7860;
}
air
{
type patch;
nFaces 40;
startFace 7900;
}
outlet
{
type patch;
nFaces 200;
startFace 7940;
}
frontAndBack
{
type empty;
inGroups 1(empty);
nFaces 8000;
startFace 8140;
}
)
// ************************************************************************* //

4
tutorials/lagrangian/reactingParcelFoam/filter/constant/fvOptions
View File

@ -29,8 +29,8 @@ filter1
DarcyForchheimerCoeffs
{
d d [0 -2 0 0 0 0 0] (500000 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
d (500000 -1000 -1000);
f (0 0 0);
coordinateSystem
{

1
tutorials/lagrangian/reactingParcelFoam/filter/system/blockMeshDict
View File

@ -10,7 +10,6 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
location "constant/polyMesh";
object blockMeshDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

54
tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/polyMesh/boundary
View File

@ -1,54 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
5
(
outlet
{
type wall;
nFaces 25;
startFace 300;
}
inlet
{
type wall;
nFaces 25;
startFace 325;
}
walls
{
type wall;
nFaces 50;
startFace 350;
}
back
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 25;
startFace 400;
}
front
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 25;
startFace 425;
}
)
// ************************************************************************* //

1
tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/blockMeshDict
View File

@ -9,7 +9,6 @@ FoamFile
{
version 2.0;
format ascii;
location "";
note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
class dictionary;
object blockMeshDict;

61
tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/constant/polyMesh/boundary
View File

@ -1,61 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
6
(
back
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 9340;
startFace 265900;
}
front
{
type symmetryPlane;
inGroups 1(symmetryPlane);
nFaces 9340;
startFace 275240;
}
inletCentral
{
type patch;
nFaces 100;
startFace 284580;
}
inletSides
{
type patch;
nFaces 200;
startFace 284680;
}
outlet
{
type patch;
nFaces 300;
startFace 284880;
}
walls
{
type wall;
inGroups 1(wall);
nFaces 9320;
startFace 285180;
}
)
// ************************************************************************* //

1
tutorials/lagrangian/reactingParcelFoam/verticalChannelLTS/system/blockMeshDict
View File

@ -9,7 +9,6 @@ FoamFile
{
version 2.0;
format ascii;
location "";
note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
class dictionary;
object blockMeshDict;

1
tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/system/blockMeshDict
View File

@ -9,7 +9,6 @@ FoamFile
{
version 2.0;
format ascii;
location "";
note "Created Wed Jul 1 19:20:21 2009. Blocks = 8, cells = 9340, vertices = 36";
class dictionary;
object blockMeshDict;

23
tutorials/lagrangian/sprayFoam/aachenBomb/constant/polyMesh/boundary → tutorials/lagrangian/sprayFoam/aachenBomb/chemkin/transportProperties
View File

@ -2,27 +2,26 @@
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
format ascii;
class dictionary;
location "chemkin";
object transportProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
1
(
walls
".*"
{
transport
{
type wall;
nFaces 19762;
startFace 494419;
As 1.67212e-6;
Ts 170.672;
}
)
}
// ************************************************************************* //

2
tutorials/lagrangian/sprayFoam/aachenBomb/constant/thermophysicalProperties
View File

@ -27,8 +27,8 @@ thermoType
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
newFormat yes;