Commit 0368f38a authored by graham's avatar graham
Browse files

ENH. Update dsmc submodels to allow models with no coeffs dictionary.

Updated dsmc and md tuts, including new cyclic handling.
parent 49ccf0ff
......@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class CloudType>
Foam::BinaryCollisionModel<CloudType>::BinaryCollisionModel(CloudType& owner)
:
dict_(dictionary::null),
owner_(owner),
coeffDict_(dictionary::null)
{}
template<class CloudType>
Foam::BinaryCollisionModel<CloudType>::BinaryCollisionModel
(
......@@ -87,4 +96,3 @@ Foam::BinaryCollisionModel<CloudType>::coeffDict() const
#include "BinaryCollisionModelNew.C"
// ************************************************************************* //
......@@ -85,6 +85,9 @@ public:
// Constructors
//- Construct null from owner
BinaryCollisionModel(CloudType& owner);
//- Construct from components
BinaryCollisionModel
(
......
......@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class CloudType>
Foam::InflowBoundaryModel<CloudType>::InflowBoundaryModel(CloudType& owner)
:
dict_(dictionary::null),
owner_(owner),
coeffDict_(dictionary::null)
{}
template<class CloudType>
Foam::InflowBoundaryModel<CloudType>::InflowBoundaryModel
(
......
......@@ -86,6 +86,9 @@ public:
// Constructors
//- Construct null from owner
InflowBoundaryModel(CloudType& owner);
//- Construct from dictionary
InflowBoundaryModel
(
......
......@@ -34,7 +34,7 @@ Foam::NoInflow<CloudType>::NoInflow
CloudType& cloud
)
:
InflowBoundaryModel<CloudType>(dict, cloud, typeName)
InflowBoundaryModel<CloudType>(cloud)
{}
......
......@@ -50,7 +50,7 @@ class NoInflow
public:
//- Runtime type information
TypeName("NoInflow");
TypeName("none");
// Constructors
......
......@@ -37,7 +37,7 @@ Foam::MaxwellianThermal<CloudType>::MaxwellianThermal
CloudType& cloud
)
:
WallInteractionModel<CloudType>(dict, cloud, typeName)
WallInteractionModel<CloudType>(cloud)
{}
......
......@@ -36,7 +36,7 @@ Foam::SpecularReflection<CloudType>::SpecularReflection
CloudType& cloud
)
:
WallInteractionModel<CloudType>(dict, cloud, typeName)
WallInteractionModel<CloudType>(cloud)
{}
......
......@@ -27,6 +27,15 @@ License
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class CloudType>
Foam::WallInteractionModel<CloudType>::WallInteractionModel(CloudType& owner)
:
dict_(dictionary::null),
owner_(owner),
coeffDict_(dictionary::null)
{}
template<class CloudType>
Foam::WallInteractionModel<CloudType>::WallInteractionModel
(
......
......@@ -85,6 +85,9 @@ public:
// Constructors
//- Construct null from owner
WallInteractionModel(CloudType& owner);
//- Construct from components
WallInteractionModel
(
......
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object boundaryT;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 1 0 0 0];
dimensions [ 0 0 0 1 0 0 0 ];
internalField uniform 0;
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
location "0";
object boundaryU;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -1 0 0 0 0];
dimensions [ 0 1 -1 0 0 0 0 ];
internalField uniform (0 0 0);
internalField uniform ( 0 0 0 );
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object dsmcRhoN;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 -3 0 0 0 0 0];
dimensions [ 0 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
location "0";
object fD;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform (0 0 0);
internalField uniform ( 0 0 0 );
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object iDof;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 -3 0 0 0 0 0];
dimensions [ 0 -3 0 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object internalE;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volScalarField;
location "0";
object linearKE;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -1 -2 0 0 0 0];
dimensions [ 1 -1 -2 0 0 0 0 ];
internalField uniform 0;
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
......@@ -10,30 +10,42 @@ FoamFile
version 2.0;
format ascii;
class volVectorField;
location "0";
object momentum;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [1 -2 -1 0 0 0 0];
dimensions [ 1 -2 -1 0 0 0 0 ];
internalField uniform (0 0 0);
internalField uniform ( 0 0 0 );
boundaryField
{
xPeriodic
xPeriodic_half0
{
type cyclic;
}
yPeriodic
yPeriodic_half0
{
type cyclic;
}
zPeriodic
zPeriodic_half0
{
type cyclic;
}
yPeriodic_half1
{
type cyclic;
}
zPeriodic_half1
{
type cyclic;
}
xPeriodic_half1
{
type cyclic;
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: 1.6 |
| \\ / A nd | Web: http://www.OpenFOAM.org |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |