zhyang-dev/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GIT: Resolve conflict

Browse Source
This commit is contained in:
andy
2011-08-16 16:09:56 +01:00
parent 9857d2be7c c2dd153a14
commit 4f40cdb7d7
8696 changed files with 9494 additions and 9534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/blockMeshDict
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / 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
@ -16,7 +16,7 @@ FoamFile
convertToMeters 1;
vertices
vertices
(
(0 0 0)
(0.15 0 0)
@ -28,12 +28,12 @@ vertices
(0 1 0.1)
);
blocks
blocks
(
hex (0 1 2 3 4 5 6 7) (25 75 1) simpleGrading (1 1 1)
);
edges
edges
(
);

2
tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary
View File

@ -2,7 +2,7 @@
| ========= | |
| \\ / 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