mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Fixing conflict.
This commit is contained in:
@ -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 | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
@ -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 | |
|
||||
\*---------------------------------------------------------------------------*/
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
|
||||
// ************************************************************************* //
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha1) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha1) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
@ -23,8 +23,6 @@ ddtSchemes
|
||||
gradSchemes
|
||||
{
|
||||
default Gauss linear;
|
||||
grad(U) Gauss linear;
|
||||
grad(alpha1) Gauss linear;
|
||||
}
|
||||
|
||||
divSchemes
|
||||
|
||||
Reference in New Issue
Block a user