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: 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

10
tutorials/basic/laplacianFoam/flange/0/T
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
@ -20,23 +20,23 @@ internalField uniform 273;
boundaryField
{
patch1
patch1
{
type zeroGradient;
}
patch2
patch2
{
type fixedValue;
value uniform 273;
}
patch3
patch3
{
type zeroGradient;
}
patch4
patch4
{
type fixedValue;
value uniform 573;

2
tutorials/basic/laplacianFoam/flange/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

2
tutorials/basic/laplacianFoam/flange/constant/polyMesh/boundary.org
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

2
tutorials/basic/laplacianFoam/flange/constant/transportProperties
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

2
tutorials/basic/laplacianFoam/flange/system/controlDict
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

2
tutorials/basic/laplacianFoam/flange/system/fvSchemes
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

2
tutorials/basic/laplacianFoam/flange/system/fvSolution
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

14
tutorials/basic/potentialFoam/cylinder/0.org/U
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
@ -20,33 +20,33 @@ internalField uniform (0 0 0);
boundaryField
{
down
down
{
type symmetryPlane;
}
right
right
{
type zeroGradient;
}
up
up
{
type symmetryPlane;
}
left
left
{
type fixedValue;
value uniform (1 0 0);
}
cylinder
cylinder
{
type symmetryPlane;
}
defaultFaces
defaultFaces
{
type empty;
}

14
tutorials/basic/potentialFoam/cylinder/0.org/p
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
@ -20,33 +20,33 @@ internalField uniform 0;
boundaryField
{
down
down
{
type symmetryPlane;
}
right
right
{
type fixedValue;
value uniform 0;
}
up
up
{
type symmetryPlane;
}
left
left
{
type zeroGradient;
}
cylinder
cylinder
{
type symmetryPlane;
}
defaultFaces
defaultFaces
{
type empty;
}

6
tutorials/basic/potentialFoam/cylinder/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
@ -60,7 +60,7 @@ vertices #codeStream
};
blocks
blocks
(
hex (5 4 9 10 24 23 28 29) (10 10 1) simpleGrading (1 1 1)
hex (0 1 4 5 19 20 23 24) (10 10 1) simpleGrading (1 1 1)
@ -74,7 +74,7 @@ blocks
hex (15 9 8 18 34 28 27 37) (10 20 1) simpleGrading (1 1 1)
);
edges
edges
(
arc 0 5 (0.469846 0.17101 -0.5)
arc 5 10 (0.17101 0.469846 -0.5)

2
tutorials/basic/potentialFoam/cylinder/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

2
tutorials/basic/potentialFoam/cylinder/system/controlDict
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

2
tutorials/basic/potentialFoam/cylinder/system/fvSchemes
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

2
tutorials/basic/potentialFoam/cylinder/system/fvSolution
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

12
tutorials/basic/potentialFoam/pitzDaily/0.org/U
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
@ -20,30 +20,30 @@ internalField uniform (0 0 0);
boundaryField
{
inlet
inlet
{
type fixedValue;
value uniform (10 0 0);
}
outlet
outlet
{
type zeroGradient;
}
upperWall
upperWall
{
type fixedValue;
value uniform (0 0 0);
}
lowerWall
lowerWall
{
type fixedValue;
value uniform (0 0 0);
}
frontAndBack
frontAndBack
{
type empty;
}

12
tutorials/basic/potentialFoam/pitzDaily/0.org/p
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
@ -20,28 +20,28 @@ internalField uniform 0;
boundaryField
{
inlet
inlet
{
type zeroGradient;
}
outlet
outlet
{
type fixedValue;
value uniform 0;
}
upperWall
upperWall
{
type zeroGradient;
}
lowerWall
lowerWall
{
type zeroGradient;
}
frontAndBack
frontAndBack
{
type empty;
}

8
tutorials/basic/potentialFoam/pitzDaily/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 0.001;
vertices
vertices
(
(-20.6 0 -0.5)
(-20.6 3 -0.5)
@ -64,7 +64,7 @@ vertices
(290 16.6 0.5)
);
blocks
blocks
(
hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1)
hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1)
@ -81,7 +81,7 @@ blocks
hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1)
);
edges
edges
(
);

2
tutorials/basic/potentialFoam/pitzDaily/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

2
tutorials/basic/potentialFoam/pitzDaily/system/controlDict
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

2
tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
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

2
tutorials/basic/potentialFoam/pitzDaily/system/fvSolution
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

12
tutorials/basic/scalarTransportFoam/pitzDaily/0/T
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
@ -20,28 +20,28 @@ internalField uniform 0;
boundaryField
{
inlet
inlet
{
type fixedValue;
value uniform 1;
}
outlet
outlet
{
type zeroGradient;
}
upperWall
upperWall
{
type zeroGradient;
}
lowerWall
lowerWall
{
type zeroGradient;
}
frontAndBack
frontAndBack
{
type empty;
}

14
tutorials/basic/scalarTransportFoam/pitzDaily/0/U
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
dimensions [0 1 -1 0 0 0 0];
internalField nonuniform List<vector>
internalField nonuniform List<vector>
12225
(
(9.88226 -1.12989 2.24499e-47)
@ -12249,30 +12249,30 @@ internalField nonuniform List<vector>
boundaryField
{
inlet
inlet
{
type fixedValue;
value uniform (10 0 0);
}
outlet
outlet
{
type zeroGradient;
}
upperWall
upperWall
{
type fixedValue;
value uniform (0 0 0);
}
lowerWall
lowerWall
{
type fixedValue;
value uniform (0 0 0);
}
frontAndBack
frontAndBack
{
type empty;
}

8
tutorials/basic/scalarTransportFoam/pitzDaily/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 0.001;
vertices
vertices
(
(-20.6 0 -0.5)
(-20.6 3 -0.5)
@ -64,7 +64,7 @@ vertices
(290 16.6 0.5)
);
blocks
blocks
(
hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1)
hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1)
@ -81,7 +81,7 @@ blocks
hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1)
);
edges
edges
(
);

2
tutorials/basic/scalarTransportFoam/pitzDaily/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

2
tutorials/basic/scalarTransportFoam/pitzDaily/constant/transportProperties
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

2
tutorials/basic/scalarTransportFoam/pitzDaily/system/controlDict
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

2
tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSchemes
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

2
tutorials/basic/scalarTransportFoam/pitzDaily/system/fvSolution
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