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

14
tutorials/electromagnetics/electrostaticFoam/chargedWire/0/phi
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,34 +20,34 @@ internalField uniform 0;
boundaryField
{
left
left
{
type symmetryPlane;
}
right
right
{
type symmetryPlane;
}
down
down
{
type symmetryPlane;
}
up
up
{
type fixedValue;
value uniform 0;
}
hole
hole
{
type fixedValue;
value uniform 45000;
}
defaultFaces
defaultFaces
{
type empty;
}

14
tutorials/electromagnetics/electrostaticFoam/chargedWire/0/rho
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
{
left
left
{
type symmetryPlane;
}
right
right
{
type symmetryPlane;
}
down
down
{
type symmetryPlane;
}
up
up
{
type zeroGradient;
}
hole
hole
{
type fixedValue;
value uniform 3.57e-05;
}
defaultFaces
defaultFaces
{
type empty;
}

2
tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/physicalProperties
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

8
tutorials/electromagnetics/electrostaticFoam/chargedWire/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.001 0 0)
(0.038 0 0)
@ -42,7 +42,7 @@ vertices
(0 0.001 0.5)
);
blocks
blocks
(
hex (5 4 9 10 16 15 20 21) (60 30 1) simpleGrading (5 1 1)
hex (0 1 4 5 11 12 15 16) (60 30 1) simpleGrading (5 1 1)
@ -51,7 +51,7 @@ blocks
hex (9 4 7 8 20 15 18 19) (30 50 1) simpleGrading (1 1 1)
);
edges
edges
(
arc 0 5 (0.00092387 0.00038268 0)
arc 5 10 (0.00038268 0.00092387 0)

2
tutorials/electromagnetics/electrostaticFoam/chargedWire/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/electromagnetics/electrostaticFoam/chargedWire/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/electromagnetics/electrostaticFoam/chargedWire/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/electromagnetics/electrostaticFoam/chargedWire/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/electromagnetics/mhdFoam/hartmann/0/B
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,29 +20,29 @@ internalField uniform (0 20 0);
boundaryField
{
inlet
inlet
{
type zeroGradient;
}
outlet
outlet
{
type zeroGradient;
}
lowerWall
lowerWall
{
type fixedValue;
value uniform (0 20 0);
}
upperWall
upperWall
{
type fixedValue;
value uniform (0 20 0);
}
frontAndBack
frontAndBack
{
type empty;
}

12
tutorials/electromagnetics/mhdFoam/hartmann/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
@ -20,30 +20,30 @@ internalField uniform (0 0 0);
boundaryField
{
inlet
inlet
{
type fixedValue;
value uniform (1 0 0);
}
outlet
outlet
{
type zeroGradient;
}
lowerWall
lowerWall
{
type fixedValue;
value uniform (0 0 0);
}
upperWall
upperWall
{
type fixedValue;
value uniform (0 0 0);
}
frontAndBack
frontAndBack
{
type empty;
}

2
tutorials/electromagnetics/mhdFoam/hartmann/0/Ux
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/electromagnetics/mhdFoam/hartmann/0/Uy
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/electromagnetics/mhdFoam/hartmann/0/Uz
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/electromagnetics/mhdFoam/hartmann/0/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;
}
lowerWall
lowerWall
{
type zeroGradient;
}
upperWall
upperWall
{
type zeroGradient;
}
frontAndBack
frontAndBack
{
type empty;
}

12
tutorials/electromagnetics/mhdFoam/hartmann/0/pB
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,29 +20,29 @@ internalField uniform 0;
boundaryField
{
inlet
inlet
{
type fixedValue;
value uniform 0;
}
outlet
outlet
{
type fixedValue;
value uniform 0;
}
lowerWall
lowerWall
{
type zeroGradient;
}
upperWall
upperWall
{
type zeroGradient;
}
frontAndBack
frontAndBack
{
type empty;
}

8
tutorials/electromagnetics/mhdFoam/hartmann/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 -1 0)
(20 -1 0)
@ -28,12 +28,12 @@ vertices
(0 1 0.1)
);
blocks
blocks
(
hex (0 1 2 3 4 5 6 7) (100 40 1) simpleGrading (1 1 1)
);
edges
edges
(
);

2
tutorials/electromagnetics/mhdFoam/hartmann/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/electromagnetics/mhdFoam/hartmann/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/electromagnetics/mhdFoam/hartmann/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/electromagnetics/mhdFoam/hartmann/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/electromagnetics/mhdFoam/hartmann/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

2
tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict
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