mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev
This commit is contained in:
@ -167,7 +167,7 @@ Foam::kineticTheoryModel::kineticTheoryModel
|
|||||||
IOobject::NO_WRITE
|
IOobject::NO_WRITE
|
||||||
),
|
),
|
||||||
Ua_.mesh(),
|
Ua_.mesh(),
|
||||||
dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
|
dimensionedScalar("zero", dimensionSet(1, -1, -1, 0, 0), 0.0)
|
||||||
),
|
),
|
||||||
gs0_
|
gs0_
|
||||||
(
|
(
|
||||||
|
|||||||
@ -88,7 +88,7 @@ removeCase ()
|
|||||||
|
|
||||||
cleanSamples ()
|
cleanSamples ()
|
||||||
{
|
{
|
||||||
rm -rf {samples,sampleSurfaces} > /dev/null 2>&1
|
rm -rf {sets,samples,sampleSurfaces} > /dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanUcomponents ()
|
cleanUcomponents ()
|
||||||
|
|||||||
@ -7,4 +7,5 @@ application="mhdFoam"
|
|||||||
|
|
||||||
(cd hartmann && runApplication blockMesh)
|
(cd hartmann && runApplication blockMesh)
|
||||||
(cd hartmann && runApplication $application)
|
(cd hartmann && runApplication $application)
|
||||||
|
(cd hartmann && runApplication foamCalc components U)
|
||||||
(cd hartmann && runApplication sample)
|
(cd hartmann && runApplication sample)
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
/*--------------------------------*- C++ -*----------------------------------*\
|
/*--------------------------------*- C++ -*----------------------------------*\
|
||||||
| ========= | |
|
| ========= | |
|
||||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||||
| \\ / O peration | Version: 1.5 |
|
| \\ / O peration | Version: dev-8cbffd16687e |
|
||||||
| \\ / A nd | Web: http://www.OpenFOAM.org |
|
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||||
| \\/ M anipulation | |
|
| \\/ M anipulation | |
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
FoamFile
|
FoamFile
|
||||||
@ -10,6 +10,7 @@ FoamFile
|
|||||||
version 2.0;
|
version 2.0;
|
||||||
format ascii;
|
format ascii;
|
||||||
class polyBoundaryMesh;
|
class polyBoundaryMesh;
|
||||||
|
location "constant/polyMesh";
|
||||||
object boundary;
|
object boundary;
|
||||||
}
|
}
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|||||||
@ -36,7 +36,7 @@ surfaces
|
|||||||
|
|
||||||
fields
|
fields
|
||||||
(
|
(
|
||||||
U.component(0)
|
Ux
|
||||||
);
|
);
|
||||||
|
|
||||||
// ************************************************************************* //
|
// ************************************************************************* //
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
/*--------------------------------*- C++ -*----------------------------------*\
|
/*--------------------------------*- C++ -*----------------------------------*\
|
||||||
| ========= | |
|
| ========= | |
|
||||||
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
|
||||||
| \\ / O peration | Version: 1.5 |
|
| \\ / O peration | Version: dev-8cbffd16687e |
|
||||||
| \\ / A nd | Web: http://www.OpenFOAM.org |
|
| \\ / A nd | Web: www.OpenFOAM.org |
|
||||||
| \\/ M anipulation | |
|
| \\/ M anipulation | |
|
||||||
\*---------------------------------------------------------------------------*/
|
\*---------------------------------------------------------------------------*/
|
||||||
FoamFile
|
FoamFile
|
||||||
@ -10,39 +10,37 @@ FoamFile
|
|||||||
version 2.0;
|
version 2.0;
|
||||||
format ascii;
|
format ascii;
|
||||||
class polyBoundaryMesh;
|
class polyBoundaryMesh;
|
||||||
|
location "constant/polyMesh";
|
||||||
object boundary;
|
object boundary;
|
||||||
}
|
}
|
||||||
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
|
||||||
|
|
||||||
4
|
4
|
||||||
(
|
(
|
||||||
inlet
|
inlet
|
||||||
{
|
{
|
||||||
type patch;
|
type patch;
|
||||||
nFaces 30;
|
nFaces 30;
|
||||||
startFace 11770;
|
startFace 11770;
|
||||||
}
|
}
|
||||||
|
outlet
|
||||||
outlet
|
{
|
||||||
{
|
|
||||||
type patch;
|
type patch;
|
||||||
nFaces 30;
|
nFaces 30;
|
||||||
startFace 11800;
|
startFace 11800;
|
||||||
}
|
}
|
||||||
|
walls
|
||||||
walls
|
{
|
||||||
{
|
|
||||||
type wall;
|
type wall;
|
||||||
nFaces 400;
|
nFaces 400;
|
||||||
startFace 11830;
|
startFace 11830;
|
||||||
}
|
}
|
||||||
|
frontAndBackPlanes
|
||||||
frontAndBackPlanes
|
{
|
||||||
{
|
|
||||||
type empty;
|
type empty;
|
||||||
nFaces 12000;
|
nFaces 12000;
|
||||||
startFace 12230;
|
startFace 12230;
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// ************************************************************************* //
|
// ************************************************************************* //
|
||||||
|
|||||||
@ -60,6 +60,8 @@ functions
|
|||||||
// Where to load it from (if not already in solver)
|
// Where to load it from (if not already in solver)
|
||||||
functionObjectLibs ("libfieldAverage.so");
|
functionObjectLibs ("libfieldAverage.so");
|
||||||
|
|
||||||
|
outputControl outputTime;
|
||||||
|
|
||||||
// Fields to be averaged - runTime modifiable
|
// Fields to be averaged - runTime modifiable
|
||||||
fields
|
fields
|
||||||
(
|
(
|
||||||
|
|||||||
Reference in New Issue
Block a user