zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-12-28 03:37:59 +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

12
tutorials/multiphase/interFoam/les/nozzleFlow2D/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
@ -25,30 +25,30 @@ boundaryField
type empty;
}
inlet
inlet
{
type fixedValue;
value uniform (0 0 0 0 0 0 0 0 0);
}
wall
wall
{
type zeroGradient;
}
atmosphere
atmosphere
{
type inletOutlet;
inletValue uniform (0 0 0 0 0 0 0 0 0);
value uniform (0 0 0 0 0 0 0 0 0);
}
front
front
{
type wedge;
}
back
back
{
type wedge;
}

12
tutorials/multiphase/interFoam/les/nozzleFlow2D/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
@ -25,30 +25,30 @@ boundaryField
type empty;
}
inlet
inlet
{
type fixedValue;
value uniform (460 0 0);
}
wall
wall
{
type fixedValue;
value uniform (0 0 0);
}
atmosphere
atmosphere
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
front
front
{
type wedge;
}
back
back
{
type wedge;
}

2
tutorials/multiphase/interFoam/les/nozzleFlow2D/0/alpha1
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/multiphase/interFoam/les/nozzleFlow2D/0/k
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
@ -25,31 +25,31 @@ boundaryField
type empty;
}
inlet
inlet
{
type fixedValue;
value uniform 1e-05;
}
wall
wall
{
type fixedValue;
value uniform 1e-11;
}
atmosphere
atmosphere
{
type inletOutlet;
inletValue uniform 0.001;
value uniform 1e-11;
}
front
front
{
type wedge;
}
back
back
{
type wedge;
}

12
tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuSgs
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
@ -25,27 +25,27 @@ boundaryField
type empty;
}
inlet
inlet
{
type zeroGradient;
}
wall
wall
{
type zeroGradient;
}
atmosphere
atmosphere
{
type zeroGradient;
}
front
front
{
type wedge;
}
back
back
{
type wedge;
}

12
tutorials/multiphase/interFoam/les/nozzleFlow2D/0/nuTilda
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
@ -25,31 +25,31 @@ boundaryField
type empty;
}
inlet
inlet
{
type fixedValue;
value uniform 0;
}
wall
wall
{
type fixedValue;
value uniform 0;
}
atmosphere
atmosphere
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
}
front
front
{
type wedge;
}
back
back
{
type wedge;
}

2
tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p_rgh
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/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties
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/multiphase/interFoam/les/nozzleFlow2D/constant/g
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/multiphase/interFoam/les/nozzleFlow2D/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 1e-06;
vertices
vertices
(
(0 0 0)
(3000 0 0)
@ -39,7 +39,7 @@ vertices
(3000 1600 69.8575086536)
);
blocks
blocks
(
hex (0 1 3 2 0 1 11 10)
(75 30 1)
@ -48,17 +48,17 @@ blocks
hex (2 3 5 4 10 11 13 12)
(75 40 1)
edgeGrading (1 1 1 1 20 1 1 20 1 1 1 1)
hex (4 5 7 6 12 13 15 14)
(75 15 1)
simpleGrading (1.0 1.0 1.0)
hex (6 7 9 8 14 15 17 16)
(75 15 1)
simpleGrading (1.0 1.0 1.0)
);
edges
edges
(
);
@ -69,7 +69,7 @@ boundary
type empty;
faces
(
(0 1 1 0)
(0 1 1 0)
);
}

2
tutorials/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/constant/turbulenceProperties
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/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/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/multiphase/interFoam/les/nozzleFlow2D/system/refineMeshDict
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/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.1
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/multiphase/interFoam/les/nozzleFlow2D/system/topoSetDict.2
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