Commit bbed85ab authored by mattijs's avatar mattijs
Browse files

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

parents 421a1448 5f1c9190
......@@ -167,7 +167,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
IOobject::NO_WRITE
),
Ua_.mesh(),
dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
),
gs0_
(
......
......@@ -88,7 +88,7 @@ removeCase ()
cleanSamples ()
{
rm -rf {samples,sampleSurfaces} > /dev/null 2>&1
rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1
}
cleanUcomponents ()
......
......@@ -7,4 +7,5 @@ application="mhdFoam"
(cd hartmann && runApplication blockMesh)
(cd hartmann && runApplication $application)
(cd hartmann && runApplication foamCalc components U)
(cd hartmann && runApplication sample)
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,6 +10,7 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -18,9 +18,9 @@ interpolationScheme cellPoint;
setFormat raw;
sets
sets
(
line_centreProfile
line_centreProfile
{
type uniform;
......@@ -34,9 +34,9 @@ sets
surfaces
();
fields
fields
(
U.component(0)
Ux
);
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.5 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev-8cbffd16687e |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,39 +10,37 @@ FoamFile
version 2.0;
format ascii;
class polyBoundaryMesh;
location "constant/polyMesh";
object boundary;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
4
(
inlet
{
type patch;
nFaces 30;
startFace 11770;
}
outlet
{
type patch;
nFaces 30;
startFace 11800;
}
walls
{
type wall;
nFaces 400;
startFace 11830;
}
frontAndBackPlanes
{
type empty;
nFaces 12000;
startFace 12230;
}
inlet
{
type patch;
nFaces 30;
startFace 11770;
}
outlet
{
type patch;
nFaces 30;
startFace 11800;
}
walls
{
type wall;
nFaces 400;
startFace 11830;
}
frontAndBackPlanes
{
type empty;
nFaces 12000;
startFace 12230;
}
)
// ************************************************************************* //
......@@ -60,6 +60,8 @@ functions
// Where to load it from (if not already in solver)
functionObjectLibs ("libfieldAverage.so");
outputControl outputTime;
// Fields to be averaged - runTime modifiable
fields
(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment