Fixing conflict.

This commit is contained in:
graham
2009-09-15 15:24:33 +01:00
72 changed files with 1110 additions and 424 deletions

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -1,14 +1,14 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;

View File

@ -30,6 +30,13 @@ FoamFile
d d [0 -2 0 0 0 0 0] (5e7 -1000 -1000);
f f [0 -1 0 0 0 0 0] (0 0 0);
}
thermalModel
{
type fixedTemperature;
T T [0 0 0 1 0] 350;
}
}
)

View File

@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/

View File

@ -1,24 +0,0 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format binary;
class dictionary;
location "system";
object tetFemSolution;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
solvers
{
motionU ICCG 1e-06 0;
}
// ************************************************************************* //

View File

@ -23,11 +23,13 @@ boundaryField
movingWall
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
fixedWalls
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
frontAndBack

View File

@ -34,11 +34,13 @@ boundaryField
upperWall
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
lowerWall
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
frontAndBack

View File

@ -34,11 +34,13 @@ boundaryField
upperWall
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
lowerWall
{
type kqRWallFunction;
value uniform ( 0 0 0 0 0 0 );
}
frontAndBack

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha1) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha1) Gauss linear;
}
divSchemes

View File

@ -23,8 +23,6 @@ ddtSchemes
gradSchemes
{
default Gauss linear;
grad(U) Gauss linear;
grad(alpha1) Gauss linear;
}
divSchemes