zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove fvCFD.H usage from remaining library source

Browse Source 
- exception calcType.H since it'll most likely be used for building
  applications anyhow

- use quailified names in more of the lagrangian code

- killed some tab indents in various places.
This commit is contained in:
Mark Olesen
2009-12-02 15:34:52 +01:00
parent 2f8c7782f4
commit 00985638d8
91 changed files with 829 additions and 1155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C
View File

@ -198,8 +198,11 @@ void ReadVertices
int dims = 1; int dims = 1;
float scale; float scale;
CCMIOID mapID; CCMIOID mapID;
CCMIOReadVerticesf(&err, vertices, &dims, &scale, &mapID, verts.begin(), CCMIOReadVerticesf
offset, offsetPlusSize); (
&err, vertices, &dims, &scale, &mapID, verts.begin(),
offset, offsetPlusSize
);
CCMIOReadMap(&err, mapID, mapData.begin(), offset, offsetPlusSize); CCMIOReadMap(&err, mapID, mapData.begin(), offset, offsetPlusSize);
//CCMIOSize size; //CCMIOSize size;
@ -273,7 +276,6 @@ void ReadProblem
// ... walk through each region description and print it... // ... walk through each region description and print it...
CCMIOID boundary; CCMIOID boundary;
label regionI = 0; label regionI = 0;
int k = 0; int k = 0;

5
applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
View File

@ -30,7 +30,7 @@ Description
and run tetgen with -f option. and run tetgen with -f option.
Sample smesh file: Sample smesh file:
@verbatim
# cube.smesh -- A 10x10x10 cube # cube.smesh -- A 10x10x10 cube
8 3 8 3
1 0 0 0 1 0 0 0
@ -50,8 +50,9 @@ Description
4 2 6 7 3 65 4 2 6 7 3 65
0 0
0 0
@endverbatim
NOTE: Note
- for some reason boundary faces point inwards. I just reverse them - for some reason boundary faces point inwards. I just reverse them
always. Might use some geometric check instead. always. Might use some geometric check instead.
- marked faces might not actually be boundary faces of mesh. - marked faces might not actually be boundary faces of mesh.

14
applications/utilities/postProcessing/dataConversion/foamToEnsightParts/ensightOutputFunctions.C
View File

@ -34,12 +34,10 @@ License
#include "OFstream.H" #include "OFstream.H"
#include "IOmanip.H" #include "IOmanip.H"
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
void ensightCaseEntry void Foam::ensightCaseEntry
( (
OFstream& caseFile, OFstream& caseFile,
const string& ensightType, const string& ensightType,
@ -89,7 +87,7 @@ void ensightCaseEntry
} }
void ensightParticlePositions void Foam::ensightParticlePositions
( (
const polyMesh& mesh, const polyMesh& mesh,
const fileName& dataDir, const fileName& dataDir,
@ -153,7 +151,7 @@ void ensightParticlePositions
template<class Type> template<class Type>
void ensightLagrangianField void Foam::ensightLagrangianField
( (
const IOobject& fieldObject, const IOobject& fieldObject,
const fileName& dataDir, const fileName& dataDir,
@ -211,7 +209,7 @@ void ensightLagrangianField
//- write generalized field components //- write generalized field components
template <class Type> template <class Type>
void ensightVolField void Foam::ensightVolField
( (
const ensightParts& partsList, const ensightParts& partsList,
const IOobject& fieldObject, const IOobject& fieldObject,
@ -241,9 +239,5 @@ void ensightVolField
); );
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // namespace Foam
// ************************************************************************* // // ************************************************************************* //

5
applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
View File

@ -1195,7 +1195,8 @@ void register_data_readers()
/* /*
** like this for combined unstructured grids & results in a single file ** like this for combined unstructured grids & results in a single file
*/ */
reg_single_unstruct_reader ( reg_single_unstruct_reader
(
"Foam Reader", /* title you want for data reader */ "Foam Reader", /* title you want for data reader */
user_query_file_function, /* whatever you called this */ user_query_file_function, /* whatever you called this */
user_read_one_grid_function /* whatever you called this */ user_read_one_grid_function /* whatever you called this */
@ -1203,8 +1204,6 @@ void register_data_readers()
} }
} }

3
src/ODE/ODESolvers/RK/RK.C
View File

@ -29,10 +29,9 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(Foam::RK, 0);
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(Foam::RK, 0);
addToRunTimeSelectionTable(ODESolver, RK, ODE); addToRunTimeSelectionTable(ODESolver, RK, ODE);
const scalar const scalar

21
src/ODE/ODESolvers/RK/RK.H
View File

@ -26,7 +26,7 @@ Class
Foam::RK Foam::RK
Description Description
Foam::RK Runge-Kutta ODE solver
SourceFiles SourceFiles
RKCK.C RKCK.C
@ -53,6 +53,15 @@ class RK
public ODESolver public ODESolver
{ {
// Private data // Private data
static const scalar safety, pGrow, pShrink, errCon;
static const scalar
a2, a3, a4, a5, a6,
b21, b31, b32, b41, b42, b43,
b51, b52, b53, b54, b61, b62, b63, b64, b65,
c1, c3, c4, c6,
dc1, dc3, dc4, dc5, dc6;
mutable scalarField yTemp_; mutable scalarField yTemp_;
mutable scalarField ak2_; mutable scalarField ak2_;
@ -64,16 +73,6 @@ class RK
mutable scalarField yErr_; mutable scalarField yErr_;
mutable scalarField yTemp2_; mutable scalarField yTemp2_;
static const scalar safety, pGrow, pShrink, errCon;
static const scalar
a2, a3, a4, a5, a6,
b21, b31, b32, b41, b42, b43,
b51, b52, b53, b54, b61, b62, b63, b64, b65,
c1, c3, c4, c6,
dc1, dc3, dc4, dc5, dc6;
public: public:
//- Runtime type information //- Runtime type information

4
src/OSspecific/POSIX/timer.C
View File

@ -22,8 +22,6 @@ License
along with OpenFOAM; if not, write to the Free Software Foundation, along with OpenFOAM; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include <unistd.h> #include <unistd.h>
@ -56,8 +54,6 @@ void Foam::timer::signalHandler(int)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::timer::timer(const unsigned int newTimeOut) Foam::timer::timer(const unsigned int newTimeOut)
: :
newTimeOut_(newTimeOut) newTimeOut_(newTimeOut)

62
src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C
View File

@ -26,28 +26,27 @@ License
#include "dynamicRefineFvMesh.H" #include "dynamicRefineFvMesh.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "fvc.H"
#include "volFields.H" #include "volFields.H"
#include "polyTopoChange.H" #include "polyTopoChange.H"
#include "surfaceFields.H" #include "surfaceFields.H"
#include "fvCFD.H"
#include "syncTools.H" #include "syncTools.H"
#include "pointFields.H" #include "pointFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dynamicRefineFvMesh, 0); defineTypeNameAndDebug(dynamicRefineFvMesh, 0);
addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject); addToRunTimeSelectionTable(dynamicFvMesh, dynamicRefineFvMesh, IOobject);
} // End namespace Foam
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
label dynamicRefineFvMesh::count // the PackedBoolList::count method would probably be faster
// since we are only checking for 'true' anyhow
Foam::label Foam::dynamicRefineFvMesh::count
( (
const PackedBoolList& l, const PackedBoolList& l,
const unsigned int val const unsigned int val
@ -65,7 +64,7 @@ label dynamicRefineFvMesh::count
} }
void dynamicRefineFvMesh::calculateProtectedCells void Foam::dynamicRefineFvMesh::calculateProtectedCells
( (
PackedBoolList& unrefineableCell PackedBoolList& unrefineableCell
) const ) const
@ -171,7 +170,7 @@ void dynamicRefineFvMesh::calculateProtectedCells
} }
void dynamicRefineFvMesh::readDict() void Foam::dynamicRefineFvMesh::readDict()
{ {
dictionary refineDict dictionary refineDict
( (
@ -196,7 +195,8 @@ void dynamicRefineFvMesh::readDict()
// Refines cells, maps fields and recalculates (an approximate) flux // Refines cells, maps fields and recalculates (an approximate) flux
autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine Foam::autoPtr<Foam::mapPolyMesh>
Foam::dynamicRefineFvMesh::refine
( (
const labelList& cellsToRefine const labelList& cellsToRefine
) )
@ -408,7 +408,8 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::refine
// Combines previously split cells, maps fields and recalculates // Combines previously split cells, maps fields and recalculates
// (an approximate) flux // (an approximate) flux
autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine Foam::autoPtr<Foam::mapPolyMesh>
Foam::dynamicRefineFvMesh::unrefine
( (
const labelList& splitPoints const labelList& splitPoints
) )
@ -563,7 +564,8 @@ autoPtr<mapPolyMesh> dynamicRefineFvMesh::unrefine
// Get max of connected point // Get max of connected point
scalarField dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const Foam::scalarField
Foam::dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
{ {
scalarField vFld(nCells(), -GREAT); scalarField vFld(nCells(), -GREAT);
@ -581,7 +583,8 @@ scalarField dynamicRefineFvMesh::maxPointField(const scalarField& pFld) const
// Get min of connected cell // Get min of connected cell
scalarField dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const Foam::scalarField
Foam::dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const
{ {
scalarField pFld(nPoints(), GREAT); scalarField pFld(nPoints(), GREAT);
@ -599,7 +602,8 @@ scalarField dynamicRefineFvMesh::minCellField(const volScalarField& vFld) const
// Simple (non-parallel) interpolation by averaging. // Simple (non-parallel) interpolation by averaging.
scalarField dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const Foam::scalarField
Foam::dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
{ {
scalarField pFld(nPoints()); scalarField pFld(nPoints());
@ -619,7 +623,8 @@ scalarField dynamicRefineFvMesh::cellToPoint(const scalarField& vFld) const
// Calculate error. Is < 0 or distance from inbetween levels // Calculate error. Is < 0 or distance from inbetween levels
scalarField dynamicRefineFvMesh::error Foam::scalarField
Foam::dynamicRefineFvMesh::error
( (
const scalarField& fld, const scalarField& fld,
const scalar minLevel, const scalar minLevel,
@ -641,7 +646,7 @@ scalarField dynamicRefineFvMesh::error
} }
void dynamicRefineFvMesh::selectRefineCandidates void Foam::dynamicRefineFvMesh::selectRefineCandidates
( (
const scalar lowerRefineLevel, const scalar lowerRefineLevel,
const scalar upperRefineLevel, const scalar upperRefineLevel,
@ -675,7 +680,7 @@ void dynamicRefineFvMesh::selectRefineCandidates
} }
labelList dynamicRefineFvMesh::selectRefineCells Foam::labelList Foam::dynamicRefineFvMesh::selectRefineCells
( (
const label maxCells, const label maxCells,
const label maxRefinement, const label maxRefinement,
@ -762,7 +767,7 @@ labelList dynamicRefineFvMesh::selectRefineCells
} }
labelList dynamicRefineFvMesh::selectUnrefinePoints Foam::labelList Foam::dynamicRefineFvMesh::selectUnrefinePoints
( (
const scalar unrefineLevel, const scalar unrefineLevel,
const PackedBoolList& markedCell, const PackedBoolList& markedCell,
@ -822,7 +827,10 @@ labelList dynamicRefineFvMesh::selectUnrefinePoints
} }
void dynamicRefineFvMesh::extendMarkedCells(PackedBoolList& markedCell) const void Foam::dynamicRefineFvMesh::extendMarkedCells
(
PackedBoolList& markedCell
) const
{ {
// Mark faces using any marked cell // Mark faces using any marked cell
boolList markedFace(nFaces(), false); boolList markedFace(nFaces(), false);
@ -863,7 +871,7 @@ void dynamicRefineFvMesh::extendMarkedCells(PackedBoolList& markedCell) const
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io) Foam::dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
: :
dynamicFvMesh(io), dynamicFvMesh(io),
meshCutter_(*this), meshCutter_(*this),
@ -996,13 +1004,13 @@ dynamicRefineFvMesh::dynamicRefineFvMesh(const IOobject& io)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dynamicRefineFvMesh::~dynamicRefineFvMesh() Foam::dynamicRefineFvMesh::~dynamicRefineFvMesh()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool dynamicRefineFvMesh::update() bool Foam::dynamicRefineFvMesh::update()
{ {
// Re-read dictionary. Choosen since usually -small so trivial amount // Re-read dictionary. Choosen since usually -small so trivial amount
// of time compared to actual refinement. Also very useful to be able // of time compared to actual refinement. Also very useful to be able
@ -1204,7 +1212,7 @@ bool dynamicRefineFvMesh::update()
} }
bool dynamicRefineFvMesh::writeObject bool Foam::dynamicRefineFvMesh::writeObject
( (
IOstream::streamFormat fmt, IOstream::streamFormat fmt,
IOstream::versionNumber ver, IOstream::versionNumber ver,
@ -1215,8 +1223,10 @@ bool dynamicRefineFvMesh::writeObject
const_cast<hexRef8&>(meshCutter_).setInstance(time().timeName()); const_cast<hexRef8&>(meshCutter_).setInstance(time().timeName());
bool writeOk = bool writeOk =
(
dynamicFvMesh::writeObjects(fmt, ver, cmp) dynamicFvMesh::writeObjects(fmt, ver, cmp)
&& meshCutter_.write(); && meshCutter_.write()
);
if (dumpLevel_) if (dumpLevel_)
{ {
@ -1249,8 +1259,4 @@ bool dynamicRefineFvMesh::writeObject
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

3
src/finiteVolume/fvMatrices/solvers/MULES/MULES.C
View File

@ -34,8 +34,7 @@ License
#include "fvcSurfaceIntegrate.H" #include "fvcSurfaceIntegrate.H"
#include "slicedSurfaceFields.H" #include "slicedSurfaceFields.H"
#include "syncTools.H" #include "syncTools.H"
#include "fvm.H"
#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

3
src/finiteVolume/fvMatrices/solvers/MULES/MULESTemplates.C
View File

@ -34,8 +34,7 @@ License
#include "fvcSurfaceIntegrate.H" #include "fvcSurfaceIntegrate.H"
#include "slicedSurfaceFields.H" #include "slicedSurfaceFields.H"
#include "syncTools.H" #include "syncTools.H"
#include "fvm.H"
#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C
View File

@ -44,7 +44,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::commonRailInjector::commonRailInjector Foam::commonRailInjector::commonRailInjector
( (
const Foam::Time& t, const Foam::Time& t,

1
src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C
View File

@ -45,7 +45,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::definedInjector::definedInjector Foam::definedInjector::definedInjector
( (
const Time& t, const Time& t,

2
src/lagrangian/dieselSpray/injector/injector/injector.H
View File

@ -64,7 +64,7 @@ public:
// Constructors // Constructors
//- Constructor from Istream //- Constructor from Istream
injector(const Time& t, Istream& is); injector(const Time&, Istream&);
//- Return clone //- Return clone
inline autoPtr<injector> clone() const; inline autoPtr<injector> clone() const;

19
src/lagrangian/dieselSpray/injector/injector/injectorI.H
View File

@ -24,32 +24,25 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
//- Return clone inline Foam::autoPtr<Foam::injector>
inline autoPtr<injector> injector::clone() const Foam::injector::clone() const
{ {
return autoPtr<injector>(new injector(*this)); return autoPtr<injector>(new injector(*this));
} }
inline autoPtr<injectorType>& injector::properties() inline Foam::autoPtr<Foam::injectorType>&
Foam::injector::properties()
{ {
return properties_; return properties_;
} }
inline const autoPtr<injectorType>& injector::properties() const inline const Foam::autoPtr<Foam::injectorType>&
Foam::injector::properties() const
{ {
return properties_; return properties_;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

1
src/lagrangian/dieselSpray/injector/injectorType/injectorType.C
View File

@ -37,7 +37,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::injectorType::injectorType Foam::injectorType::injectorType
( (
const Foam::Time&, const Foam::Time&,

1
src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C
View File

@ -44,7 +44,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::multiHoleInjector::multiHoleInjector Foam::multiHoleInjector::multiHoleInjector
( (
const Foam::Time& t, const Foam::Time& t,

1
src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
View File

@ -46,7 +46,6 @@ namespace Foam
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
Foam::unitInjector::unitInjector Foam::unitInjector::unitInjector
( (
const Foam::Time& t, const Foam::Time& t,

3
src/lagrangian/dieselSpray/spray/spray.C
View File

@ -45,7 +45,10 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0); defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

18
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
View File

@ -30,13 +30,10 @@ License
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "RosinRammler.H" #include "RosinRammler.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(LISA, 0); defineTypeNameAndDebug(LISA, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -45,11 +42,12 @@ addToRunTimeSelectionTable
LISA, LISA,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::LISA::LISA
LISA::LISA
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -67,13 +65,13 @@ LISA::LISA
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
LISA::~LISA() Foam::LISA::~LISA()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void LISA::atomizeParcel void Foam::LISA::atomizeParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -381,8 +379,4 @@ void LISA::atomizeParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

16
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.C
View File

@ -27,21 +27,18 @@ License
#include "error.H" #include "error.H"
#include "atomizationModel.H" #include "atomizationModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(atomizationModel, 0); defineTypeNameAndDebug(atomizationModel, 0);
defineRunTimeSelectionTable(atomizationModel, dictionary); defineRunTimeSelectionTable(atomizationModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::atomizationModel::atomizationModel
atomizationModel::atomizationModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -55,11 +52,8 @@ atomizationModel::atomizationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
atomizationModel::~atomizationModel() Foam::atomizationModel::~atomizationModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

19
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
View File

@ -30,13 +30,11 @@ License
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "RosinRammler.H" #include "RosinRammler.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(blobsSheetAtomization, 0); defineTypeNameAndDebug(blobsSheetAtomization, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -45,11 +43,12 @@ addToRunTimeSelectionTable
blobsSheetAtomization, blobsSheetAtomization,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::blobsSheetAtomization::blobsSheetAtomization
blobsSheetAtomization::blobsSheetAtomization
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -65,13 +64,13 @@ blobsSheetAtomization::blobsSheetAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
blobsSheetAtomization::~blobsSheetAtomization() Foam::blobsSheetAtomization::~blobsSheetAtomization()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void blobsSheetAtomization::atomizeParcel void Foam::blobsSheetAtomization::atomizeParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -140,8 +139,4 @@ void blobsSheetAtomization::atomizeParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

18
src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
View File

@ -30,13 +30,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "basicMultiComponentMixture.H" #include "basicMultiComponentMixture.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noAtomization, 0); defineTypeNameAndDebug(noAtomization, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -45,11 +42,12 @@ addToRunTimeSelectionTable
noAtomization, noAtomization,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noAtomization::noAtomization
noAtomization::noAtomization
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -61,13 +59,13 @@ noAtomization::noAtomization
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noAtomization::~noAtomization() Foam::noAtomization::~noAtomization()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void noAtomization::atomizeParcel void Foam::noAtomization::atomizeParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -79,8 +77,4 @@ void noAtomization::atomizeParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

18
src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C
View File

@ -28,13 +28,11 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(ETAB, 0); defineTypeNameAndDebug(ETAB, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,11 +41,12 @@ addToRunTimeSelectionTable
ETAB, ETAB,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::ETAB::ETAB
ETAB::ETAB
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -70,13 +69,13 @@ ETAB::ETAB
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
ETAB::~ETAB() Foam::ETAB::~ETAB()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void ETAB::breakupParcel void Foam::ETAB::breakupParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -84,7 +83,6 @@ void ETAB::breakupParcel
const liquidMixture& fuels const liquidMixture& fuels
) const ) const
{ {
scalar T = p.T(); scalar T = p.T();
scalar pc = spray_.p()[p.cell()]; scalar pc = spray_.p()[p.cell()];
scalar r = 0.5*p.d(); scalar r = 0.5*p.d();
@ -191,8 +189,4 @@ void ETAB::breakupParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(SHF, 0); defineTypeNameAndDebug(SHF, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
SHF, SHF,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::SHF::SHF
SHF::SHF
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -92,13 +89,13 @@ SHF::SHF
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
SHF::~SHF() Foam::SHF::~SHF()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void SHF::breakupParcel void Foam::SHF::breakupParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -265,8 +262,4 @@ void SHF::breakupParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

19
src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C
View File

@ -28,13 +28,11 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(TAB, 0); defineTypeNameAndDebug(TAB, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,11 +41,12 @@ addToRunTimeSelectionTable
TAB, TAB,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::TAB::TAB
TAB::TAB
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -75,13 +74,13 @@ TAB::TAB
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
TAB::~TAB() Foam::TAB::~TAB()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void TAB::breakupParcel void Foam::TAB::breakupParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -207,8 +206,4 @@ void TAB::breakupParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

19
src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C
View File

@ -27,21 +27,18 @@ License
#include "error.H" #include "error.H"
#include "breakupModel.H" #include "breakupModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(breakupModel, 0); defineTypeNameAndDebug(breakupModel, 0);
defineRunTimeSelectionTable(breakupModel, dictionary); defineRunTimeSelectionTable(breakupModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::breakupModel::breakupModel
breakupModel::breakupModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -71,13 +68,13 @@ breakupModel::breakupModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * //
breakupModel::~breakupModel() Foam::breakupModel::~breakupModel()
{} {}
// * * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * //
void breakupModel::updateParcelProperties void Foam::breakupModel::updateParcelProperties
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -142,8 +139,4 @@ void breakupModel::updateParcelProperties
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

16
src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C
View File

@ -31,11 +31,10 @@ License
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(noBreakup, 0); defineTypeNameAndDebug(noBreakup, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,11 +43,11 @@ addToRunTimeSelectionTable
noBreakup, noBreakup,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noBreakup::noBreakup
noBreakup::noBreakup
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -60,13 +59,13 @@ noBreakup::noBreakup
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noBreakup::~noBreakup() Foam::noBreakup::~noBreakup()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void noBreakup::breakupParcel void Foam::noBreakup::breakupParcel
( (
parcel&, parcel&,
const scalar, const scalar,
@ -77,8 +76,5 @@ void noBreakup::breakupParcel
// Do nothing // Do nothing
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
View File

@ -30,13 +30,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "basicMultiComponentMixture.H" #include "basicMultiComponentMixture.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(reitzDiwakar, 0); defineTypeNameAndDebug(reitzDiwakar, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -45,11 +42,11 @@ addToRunTimeSelectionTable
reitzDiwakar, reitzDiwakar,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::reitzDiwakar::reitzDiwakar
reitzDiwakar::reitzDiwakar
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -66,13 +63,13 @@ reitzDiwakar::reitzDiwakar
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
reitzDiwakar::~reitzDiwakar() Foam::reitzDiwakar::~reitzDiwakar()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void reitzDiwakar::breakupParcel void Foam::reitzDiwakar::breakupParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -147,8 +144,4 @@ void reitzDiwakar::breakupParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(reitzKHRT, 0); defineTypeNameAndDebug(reitzKHRT, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
reitzKHRT, reitzKHRT,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::reitzKHRT::reitzKHRT
reitzKHRT::reitzKHRT
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -68,13 +65,13 @@ reitzKHRT::reitzKHRT
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
reitzKHRT::~reitzKHRT() Foam::reitzKHRT::~reitzKHRT()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void reitzKHRT::breakupParcel void Foam::reitzKHRT::breakupParcel
( (
parcel& p, parcel& p,
const scalar deltaT, const scalar deltaT,
@ -228,8 +225,4 @@ void reitzKHRT::breakupParcel
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/collisionModel/ORourke/ORourkeCollisionModel.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(ORourkeCollisionModel, 0); defineTypeNameAndDebug(ORourkeCollisionModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
ORourkeCollisionModel, ORourkeCollisionModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::ORourkeCollisionModel::ORourkeCollisionModel
ORourkeCollisionModel::ORourkeCollisionModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm, spray& sm,
@ -64,13 +61,13 @@ ORourkeCollisionModel::ORourkeCollisionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
ORourkeCollisionModel::~ORourkeCollisionModel() Foam::ORourkeCollisionModel::~ORourkeCollisionModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void ORourkeCollisionModel::collideParcels(const scalar dt) const void Foam::ORourkeCollisionModel::collideParcels(const scalar dt) const
{ {
if (spray_.size() < 2) if (spray_.size() < 2)
{ {
@ -127,8 +124,4 @@ void ORourkeCollisionModel::collideParcels(const scalar dt) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/collisionModel/collisionModel/collisionModel.C
View File

@ -27,21 +27,18 @@ License
#include "error.H" #include "error.H"
#include "collisionModel.H" #include "collisionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(collisionModel, 0); defineTypeNameAndDebug(collisionModel, 0);
defineRunTimeSelectionTable(collisionModel, dictionary); defineRunTimeSelectionTable(collisionModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::collisionModel::collisionModel
collisionModel::collisionModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm, spray& sm,
@ -57,12 +54,8 @@ collisionModel::collisionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
collisionModel::~collisionModel() Foam::collisionModel::~collisionModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/collisionModel/noCollision/noCollision.C
View File

@ -29,13 +29,10 @@ License
#include "noCollision.H" #include "noCollision.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noCollision, 0); defineTypeNameAndDebug(noCollision, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
noCollision, noCollision,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noCollision::noCollision
noCollision::noCollision
( (
const dictionary& dict, const dictionary& dict,
spray& sm, spray& sm,
@ -62,20 +59,16 @@ noCollision::noCollision
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noCollision::~noCollision() Foam::noCollision::~noCollision()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void noCollision::collideParcels(const scalar) const void Foam::noCollision::collideParcels(const scalar) const
{ {
// Do nothing // Do nothing
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/collisionModel/trajectoryModel/trajectoryModel.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(trajectoryCollisionModel, 0); defineTypeNameAndDebug(trajectoryCollisionModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
trajectoryCollisionModel, trajectoryCollisionModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::trajectoryCollisionModel::trajectoryCollisionModel
trajectoryCollisionModel::trajectoryCollisionModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm, spray& sm,
@ -66,13 +63,13 @@ trajectoryCollisionModel::trajectoryCollisionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
trajectoryCollisionModel::~trajectoryCollisionModel() Foam::trajectoryCollisionModel::~trajectoryCollisionModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void trajectoryCollisionModel::collideParcels(const scalar dt) const void Foam::trajectoryCollisionModel::collideParcels(const scalar dt) const
{ {
if (spray_.size() < 2) if (spray_.size() < 2)
{ {
@ -121,8 +118,4 @@ void trajectoryCollisionModel::collideParcels(const scalar dt) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

15
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionLESModel/dispersionLESModel.C
View File

@ -26,19 +26,16 @@ License
#include "dispersionLESModel.H" #include "dispersionLESModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dispersionLESModel, 0); defineTypeNameAndDebug(dispersionLESModel, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::dispersionLESModel::dispersionLESModel
dispersionLESModel::dispersionLESModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -57,12 +54,8 @@ dispersionLESModel::dispersionLESModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dispersionLESModel::~dispersionLESModel() Foam::dispersionLESModel::~dispersionLESModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

16
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/dispersionModel.C
View File

@ -28,22 +28,18 @@ License
#include "dispersionModel.H" #include "dispersionModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dispersionModel, 0); defineTypeNameAndDebug(dispersionModel, 0);
defineRunTimeSelectionTable(dispersionModel, dictionary); defineRunTimeSelectionTable(dispersionModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::dispersionModel::dispersionModel
dispersionModel::dispersionModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -56,12 +52,8 @@ dispersionModel::dispersionModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dispersionModel::~dispersionModel() Foam::dispersionModel::~dispersionModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

15
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionRASModel/dispersionRASModel.C
View File

@ -26,19 +26,16 @@ License
#include "dispersionRASModel.H" #include "dispersionRASModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dispersionRASModel, 0); defineTypeNameAndDebug(dispersionRASModel, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::dispersionRASModel::dispersionRASModel
dispersionRASModel::dispersionRASModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -57,12 +54,8 @@ dispersionRASModel::dispersionRASModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dispersionRASModel::~dispersionRASModel() Foam::dispersionRASModel::~dispersionRASModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
View File

@ -29,13 +29,10 @@ License
#include "gradientDispersionRAS.H" #include "gradientDispersionRAS.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(gradientDispersionRAS, 0); defineTypeNameAndDebug(gradientDispersionRAS, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
gradientDispersionRAS, gradientDispersionRAS,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::gradientDispersionRAS::gradientDispersionRAS
gradientDispersionRAS::gradientDispersionRAS
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -61,13 +58,13 @@ gradientDispersionRAS::gradientDispersionRAS
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
gradientDispersionRAS::~gradientDispersionRAS() Foam::gradientDispersionRAS::~gradientDispersionRAS()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void gradientDispersionRAS::disperseParcels() const void Foam::gradientDispersionRAS::disperseParcels() const
{ {
const scalar cps = 0.16432; const scalar cps = 0.16432;
@ -143,8 +140,4 @@ void gradientDispersionRAS::disperseParcels() const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/noDispersion/noDispersion.C
View File

@ -29,13 +29,10 @@ License
#include "noDispersion.H" #include "noDispersion.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noDispersion, 0); defineTypeNameAndDebug(noDispersion, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
noDispersion, noDispersion,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noDispersion::noDispersion(const dictionary& dict, spray& sm)
noDispersion::noDispersion(const dictionary& dict, spray& sm)
: :
dispersionModel(dict, sm) dispersionModel(dict, sm)
{} {}
@ -57,20 +54,16 @@ noDispersion::noDispersion(const dictionary& dict, spray& sm)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noDispersion::~noDispersion() Foam::noDispersion::~noDispersion()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void noDispersion::disperseParcels() const void Foam::noDispersion::disperseParcels() const
{ {
// Do nothing // Do nothing
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

19
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
View File

@ -29,13 +29,10 @@ License
#include "stochasticDispersionRAS.H" #include "stochasticDispersionRAS.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(stochasticDispersionRAS, 0); defineTypeNameAndDebug(stochasticDispersionRAS, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
stochasticDispersionRAS, stochasticDispersionRAS,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::stochasticDispersionRAS::stochasticDispersionRAS
stochasticDispersionRAS::stochasticDispersionRAS
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -61,13 +58,13 @@ stochasticDispersionRAS::stochasticDispersionRAS
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
stochasticDispersionRAS::~stochasticDispersionRAS() Foam::stochasticDispersionRAS::~stochasticDispersionRAS()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void stochasticDispersionRAS::disperseParcels() const void Foam::stochasticDispersionRAS::disperseParcels() const
{ {
const scalar cps = 0.16432; const scalar cps = 0.16432;
@ -111,7 +108,7 @@ void stochasticDispersionRAS::disperseParcels() const
// numerical recipes... Ch. 7. Random Numbers... // numerical recipes... Ch. 7. Random Numbers...
scalar x1,x2; scalar x1,x2;
scalar rsq = 10.0; scalar rsq = 10.0;
while ((rsq > 1.0) || (rsq == 0.0)) while (rsq > 1.0 || rsq == 0.0)
{ {
x1 = 2.0*spray_.rndGen().scalar01() - 1.0; x1 = 2.0*spray_.rndGen().scalar01() - 1.0;
x2 = 2.0*spray_.rndGen().scalar01() - 1.0; x2 = 2.0*spray_.rndGen().scalar01() - 1.0;
@ -135,8 +132,4 @@ void stochasticDispersionRAS::disperseParcels() const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.C
View File

@ -29,21 +29,18 @@ License
#include "dragModel.H" #include "dragModel.H"
#include "parcel.H" #include "parcel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(dragModel, 0); defineTypeNameAndDebug(dragModel, 0);
defineRunTimeSelectionTable(dragModel, dictionary); defineRunTimeSelectionTable(dragModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::dragModel::dragModel(const dictionary& dict)
dragModel::dragModel(const dictionary& dict)
: :
dict_(dict) dict_(dict)
{} {}
@ -51,12 +48,8 @@ dragModel::dragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
dragModel::~dragModel() Foam::dragModel::~dragModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

3
src/lagrangian/dieselSpray/spraySubModels/dragModel/dragModel/dragModel.H
View File

@ -34,7 +34,8 @@ Description
#define dragModel_H #define dragModel_H
#include "IOdictionary.H" #include "IOdictionary.H"
#include "fvCFD.H" #include "volFields.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

20
src/lagrangian/dieselSpray/spraySubModels/dragModel/noDragModel/noDragModel.C
View File

@ -29,13 +29,10 @@ License
#include "noDragModel.H" #include "noDragModel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noDragModel, 0); defineTypeNameAndDebug(noDragModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,11 +41,12 @@ addToRunTimeSelectionTable
noDragModel, noDragModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noDragModel::noDragModel(const dictionary& dict)
noDragModel::noDragModel(const dictionary& dict)
: :
dragModel(dict) dragModel(dict)
{} {}
@ -56,13 +54,13 @@ noDragModel::noDragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noDragModel::~noDragModel() Foam::noDragModel::~noDragModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar noDragModel::Cd Foam::scalar Foam::noDragModel::Cd
( (
const scalar, const scalar,
const scalar const scalar
@ -72,7 +70,7 @@ scalar noDragModel::Cd
} }
scalar noDragModel::relaxationTime Foam::scalar Foam::noDragModel::relaxationTime
( (
const vector&, const vector&,
const scalar, const scalar,
@ -86,8 +84,4 @@ scalar noDragModel::relaxationTime
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

20
src/lagrangian/dieselSpray/spraySubModels/dragModel/standardDragModel/standardDragModel.C
View File

@ -29,13 +29,10 @@ License
#include "standardDragModel.H" #include "standardDragModel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(standardDragModel, 0); defineTypeNameAndDebug(standardDragModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,11 +41,12 @@ addToRunTimeSelectionTable
standardDragModel, standardDragModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::standardDragModel::standardDragModel(const dictionary& dict)
standardDragModel::standardDragModel(const dictionary& dict)
: :
dragModel(dict), dragModel(dict),
dragDict_(dict.subDict(typeName + "Coeffs")), dragDict_(dict.subDict(typeName + "Coeffs")),
@ -62,13 +60,13 @@ standardDragModel::standardDragModel(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
standardDragModel::~standardDragModel() Foam::standardDragModel::~standardDragModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar standardDragModel::Cd Foam::scalar Foam::standardDragModel::Cd
( (
const scalar Re, const scalar Re,
const scalar dev const scalar dev
@ -88,7 +86,7 @@ scalar standardDragModel::Cd
} }
scalar standardDragModel::relaxationTime Foam::scalar Foam::standardDragModel::relaxationTime
( (
const vector& URel, const vector& URel,
const scalar diameter, const scalar diameter,
@ -119,8 +117,4 @@ scalar standardDragModel::relaxationTime
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

29
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.C
View File

@ -30,13 +30,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(RutlandFlashBoil, 0); defineTypeNameAndDebug(RutlandFlashBoil, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -45,12 +42,12 @@ addToRunTimeSelectionTable
RutlandFlashBoil, RutlandFlashBoil,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
: :
evaporationModel(dict), evaporationModel(dict),
evapDict_(dict.subDict(typeName + "Coeffs")), evapDict_(dict.subDict(typeName + "Coeffs")),
@ -80,20 +77,20 @@ RutlandFlashBoil::RutlandFlashBoil( const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
RutlandFlashBoil::~RutlandFlashBoil() Foam::RutlandFlashBoil::~RutlandFlashBoil()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool RutlandFlashBoil::evaporation() const bool Foam::RutlandFlashBoil::evaporation() const
{ {
return true; return true;
} }
// Correlation for the Sherwood Number // Correlation for the Sherwood Number
scalar RutlandFlashBoil::Sh Foam::scalar Foam::RutlandFlashBoil::Sh
( (
const scalar ReynoldsNumber, const scalar ReynoldsNumber,
const scalar SchmidtNumber const scalar SchmidtNumber
@ -107,7 +104,7 @@ scalar RutlandFlashBoil::Sh
} }
scalar RutlandFlashBoil::relaxationTime Foam::scalar Foam::RutlandFlashBoil::relaxationTime
( (
const scalar diameter, const scalar diameter,
const scalar liquidDensity, const scalar liquidDensity,
@ -181,7 +178,7 @@ scalar RutlandFlashBoil::relaxationTime
} }
scalar RutlandFlashBoil::boilingTime Foam::scalar Foam::RutlandFlashBoil::boilingTime
( (
const scalar liquidDensity, const scalar liquidDensity,
const scalar cpFuel, const scalar cpFuel,
@ -351,14 +348,4 @@ scalar RutlandFlashBoil::boilingTime
} }
inline label RutlandFlashBoil::nEvapIter() const
{
return nEvapIter_;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

6
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/RutlandFlashBoil/RutlandFlashBoil.H
View File

@ -135,7 +135,11 @@ public:
const scalar kLiquid const scalar kLiquid
) const; ) const;
inline label nEvapIter() const; inline label nEvapIter() const
{
return nEvapIter_;
}
}; };

19
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.C
View File

@ -24,36 +24,29 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "error.H"
#include "evaporationModel.H" #include "evaporationModel.H"
#include "fvCFD.H" #include "runTimeSelectionTables.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
defineTypeNameAndDebug(evaporationModel, 0); defineTypeNameAndDebug(evaporationModel, 0);
defineRunTimeSelectionTable(evaporationModel, dictionary); defineRunTimeSelectionTable(evaporationModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::evaporationModel::evaporationModel(const dictionary& dict)
evaporationModel::evaporationModel(const dictionary& dict)
: :
dict_(dict) dict_(dict)
{} {}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
evaporationModel::~evaporationModel() Foam::evaporationModel::~evaporationModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

4
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/evaporationModel.H
View File

@ -82,7 +82,7 @@ public:
// Constructors // Constructors
//- Construct from components //- Construct from components
evaporationModel(const dictionary& dict); evaporationModel(const dictionary&);
//- Destructor //- Destructor
@ -91,7 +91,7 @@ public:
// Selector // Selector
static autoPtr<evaporationModel> New(const dictionary& dict); static autoPtr<evaporationModel> New(const dictionary&);
// Member Functions // Member Functions

22
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/evaporationModel/newEvaporationModel.C
View File

@ -29,29 +29,23 @@ License
#include "evaporationModel.H" #include "evaporationModel.H"
#include "noEvaporation.H" #include "noEvaporation.H"
#include "standardEvaporationModel.H" #include "standardEvaporationModel.H"
#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam Foam::autoPtr<Foam::evaporationModel>
Foam::evaporationModel::New(const dictionary& dict)
{ {
word modelType(dict.lookup("evaporationModel"));
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "Selecting evaporationModel " << modelType << endl;
autoPtr<evaporationModel> evaporationModel::New(const dictionary& dict)
{
word evaporationModelType(dict.lookup("evaporationModel"));
Info<< "Selecting evaporationModel "
<< evaporationModelType << endl;
dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTable::iterator cstrIter =
dictionaryConstructorTablePtr_->find(evaporationModelType); dictionaryConstructorTablePtr_->find(modelType);
if (cstrIter == dictionaryConstructorTablePtr_->end()) if (cstrIter == dictionaryConstructorTablePtr_->end())
{ {
FatalErrorIn("evaporationModel::New(const dictionary&)") FatalErrorIn("evaporationModel::New(const dictionary&)")
<< "Unknown evaporationModelType type " << evaporationModelType << "Unknown evaporationModelType type " << modelType
<< ", constructor not in hash table" << nl << nl << ", constructor not in hash table" << nl << nl
<< " Valid evaporationModel types are: " << nl << " Valid evaporationModel types are: " << nl
<< dictionaryConstructorTablePtr_->sortedToc() << dictionaryConstructorTablePtr_->sortedToc()
@ -62,8 +56,4 @@ autoPtr<evaporationModel> evaporationModel::New(const dictionary& dict)
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

30
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.C
View File

@ -29,13 +29,10 @@ License
#include "noEvaporation.H" #include "noEvaporation.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noEvaporation, 0); defineTypeNameAndDebug(noEvaporation, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,11 +41,12 @@ addToRunTimeSelectionTable
noEvaporation, noEvaporation,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::noEvaporation::noEvaporation( const dictionary& dict)
noEvaporation::noEvaporation( const dictionary& dict)
: :
evaporationModel(dict) evaporationModel(dict)
{} {}
@ -56,19 +54,19 @@ noEvaporation::noEvaporation( const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noEvaporation::~noEvaporation() Foam::noEvaporation::~noEvaporation()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool noEvaporation::evaporation() const bool Foam::noEvaporation::evaporation() const
{ {
return false; return false;
} }
scalar noEvaporation::Sh Foam::scalar Foam::noEvaporation::Sh
( (
const scalar, const scalar,
const scalar const scalar
@ -78,7 +76,7 @@ scalar noEvaporation::Sh
} }
scalar noEvaporation::relaxationTime Foam::scalar Foam::noEvaporation::relaxationTime
( (
const scalar, const scalar,
const scalar, const scalar,
@ -97,7 +95,7 @@ scalar noEvaporation::relaxationTime
} }
scalar noEvaporation::boilingTime Foam::scalar Foam::noEvaporation::boilingTime
( (
const scalar, const scalar,
const scalar, const scalar,
@ -121,14 +119,4 @@ scalar noEvaporation::boilingTime
} }
inline label noEvaporation::nEvapIter() const
{
return 0;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

6
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/noEvaporation/noEvaporation.H
View File

@ -111,7 +111,11 @@ public:
const scalar kLiq const scalar kLiq
) const; ) const;
inline label nEvapIter() const; inline label nEvapIter() const
{
return 0;
}
}; };

29
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.C
View File

@ -29,13 +29,10 @@ License
#include "saturateEvaporationModel.H" #include "saturateEvaporationModel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(saturateEvaporationModel, 0); defineTypeNameAndDebug(saturateEvaporationModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
saturateEvaporationModel, saturateEvaporationModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::saturateEvaporationModel::saturateEvaporationModel
saturateEvaporationModel::saturateEvaporationModel
( (
const dictionary& dict const dictionary& dict
) )
@ -60,20 +57,20 @@ saturateEvaporationModel::saturateEvaporationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
saturateEvaporationModel::~saturateEvaporationModel() Foam::saturateEvaporationModel::~saturateEvaporationModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool saturateEvaporationModel::evaporation() const bool Foam::saturateEvaporationModel::evaporation() const
{ {
return true; return true;
} }
// Correlation for the Sherwood Number // Correlation for the Sherwood Number
scalar saturateEvaporationModel::Sh Foam::scalar Foam::saturateEvaporationModel::Sh
( (
const scalar ReynoldsNumber, const scalar ReynoldsNumber,
const scalar SchmidtNumber const scalar SchmidtNumber
@ -83,7 +80,7 @@ scalar saturateEvaporationModel::Sh
} }
scalar saturateEvaporationModel::relaxationTime Foam::scalar Foam::saturateEvaporationModel::relaxationTime
( (
const scalar diameter, const scalar diameter,
const scalar liquidDensity, const scalar liquidDensity,
@ -102,7 +99,7 @@ scalar saturateEvaporationModel::relaxationTime
} }
scalar saturateEvaporationModel::boilingTime Foam::scalar Foam::saturateEvaporationModel::boilingTime
( (
const scalar liquidDensity, const scalar liquidDensity,
const scalar cpFuel, const scalar cpFuel,
@ -142,14 +139,4 @@ scalar saturateEvaporationModel::boilingTime
} }
inline label saturateEvaporationModel::nEvapIter() const
{
return 1;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

7
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/saturateEvaporationModel/saturateEvaporationModel.H
View File

@ -123,7 +123,12 @@ public:
const scalar const scalar
) const; ) const;
inline label nEvapIter() const; inline label nEvapIter() const
{
return 1;
}
}; };

29
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.C
View File

@ -29,13 +29,10 @@ License
#include "standardEvaporationModel.H" #include "standardEvaporationModel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(standardEvaporationModel, 0); defineTypeNameAndDebug(standardEvaporationModel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,12 +41,12 @@ addToRunTimeSelectionTable
standardEvaporationModel, standardEvaporationModel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::standardEvaporationModel::standardEvaporationModel
standardEvaporationModel::standardEvaporationModel
( (
const dictionary& dict const dictionary& dict
) )
@ -82,20 +79,20 @@ standardEvaporationModel::standardEvaporationModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
standardEvaporationModel::~standardEvaporationModel() Foam::standardEvaporationModel::~standardEvaporationModel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool standardEvaporationModel::evaporation() const bool Foam::standardEvaporationModel::evaporation() const
{ {
return true; return true;
} }
// Correlation for the Sherwood Number // Correlation for the Sherwood Number
scalar standardEvaporationModel::Sh Foam::scalar Foam::standardEvaporationModel::Sh
( (
const scalar ReynoldsNumber, const scalar ReynoldsNumber,
const scalar SchmidtNumber const scalar SchmidtNumber
@ -109,7 +106,7 @@ scalar standardEvaporationModel::Sh
} }
scalar standardEvaporationModel::relaxationTime Foam::scalar Foam::standardEvaporationModel::relaxationTime
( (
const scalar diameter, const scalar diameter,
const scalar liquidDensity, const scalar liquidDensity,
@ -169,7 +166,7 @@ scalar standardEvaporationModel::relaxationTime
} }
scalar standardEvaporationModel::boilingTime Foam::scalar Foam::standardEvaporationModel::boilingTime
( (
const scalar liquidDensity, const scalar liquidDensity,
const scalar cpFuel, const scalar cpFuel,
@ -207,14 +204,4 @@ scalar standardEvaporationModel::boilingTime
} }
inline label standardEvaporationModel::nEvapIter() const
{
return nEvapIter_;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

6
src/lagrangian/dieselSpray/spraySubModels/evaporationModel/standardEvaporationModel/standardEvaporationModel.H
View File

@ -126,7 +126,11 @@ public:
const scalar const scalar
) const; ) const;
inline label nEvapIter() const; inline label nEvapIter() const
{
return nEvapIter_;
}
}; };

24
src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/RanzMarshall/RanzMarshall.C
View File

@ -29,13 +29,10 @@ License
#include "RanzMarshall.H" #include "RanzMarshall.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(RanzMarshall, 0); defineTypeNameAndDebug(RanzMarshall, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -44,11 +41,12 @@ addToRunTimeSelectionTable
RanzMarshall, RanzMarshall,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::RanzMarshall::RanzMarshall(const dictionary& dict)
RanzMarshall::RanzMarshall(const dictionary& dict)
: :
heatTransferModel(dict), heatTransferModel(dict),
heatDict_(dict.subDict(typeName + "Coeffs")), heatDict_(dict.subDict(typeName + "Coeffs")),
@ -60,19 +58,19 @@ RanzMarshall::RanzMarshall(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
RanzMarshall::~RanzMarshall() Foam::RanzMarshall::~RanzMarshall()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool RanzMarshall::heatTransfer() const bool Foam::RanzMarshall::heatTransfer() const
{ {
return true; return true;
} }
scalar RanzMarshall::Nu Foam::scalar Foam::RanzMarshall::Nu
( (
const scalar ReynoldsNumber, const scalar ReynoldsNumber,
const scalar PrandtlNumber const scalar PrandtlNumber
@ -86,7 +84,7 @@ scalar RanzMarshall::Nu
} }
scalar RanzMarshall::relaxationTime Foam::scalar Foam::RanzMarshall::relaxationTime
( (
const scalar liquidDensity, const scalar liquidDensity,
const scalar diameter, const scalar diameter,
@ -108,7 +106,7 @@ scalar RanzMarshall::relaxationTime
} }
scalar RanzMarshall::fCorrection(const scalar z) const Foam::scalar Foam::RanzMarshall::fCorrection(const scalar z) const
{ {
scalar correct; scalar correct;
if (z > 0.01) if (z > 0.01)
@ -132,8 +130,4 @@ scalar RanzMarshall::fCorrection(const scalar z) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

16
src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/heatTransferModel/heatTransferModel.C
View File

@ -26,32 +26,24 @@ License
#include "heatTransferModel.H" #include "heatTransferModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(heatTransferModel, 0); defineTypeNameAndDebug(heatTransferModel, 0);
defineRunTimeSelectionTable(heatTransferModel, dictionary); defineRunTimeSelectionTable(heatTransferModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from dictionary Foam::heatTransferModel::heatTransferModel(const dictionary& dict)
heatTransferModel::heatTransferModel(const dictionary& dict)
: :
dict_(dict) dict_(dict)
{} {}
heatTransferModel::~heatTransferModel() Foam::heatTransferModel::~heatTransferModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

23
src/lagrangian/dieselSpray/spraySubModels/heatTransferModel/noHeatTransfer/noHeatTransfer.C
View File

@ -27,13 +27,10 @@ License
#include "noHeatTransfer.H" #include "noHeatTransfer.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(noHeatTransfer, 0); defineTypeNameAndDebug(noHeatTransfer, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -42,12 +39,12 @@ addToRunTimeSelectionTable
noHeatTransfer, noHeatTransfer,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::noHeatTransfer::noHeatTransfer(const dictionary& dict)
noHeatTransfer::noHeatTransfer(const dictionary& dict)
: :
heatTransferModel(dict) heatTransferModel(dict)
{} {}
@ -55,25 +52,25 @@ noHeatTransfer::noHeatTransfer(const dictionary& dict)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
noHeatTransfer::~noHeatTransfer() Foam::noHeatTransfer::~noHeatTransfer()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool noHeatTransfer::heatTransfer() const bool Foam::noHeatTransfer::heatTransfer() const
{ {
return false; return false;
} }
scalar noHeatTransfer::Nu(const scalar, const scalar) const Foam::scalar Foam::noHeatTransfer::Nu(const scalar, const scalar) const
{ {
return 0.0; return 0.0;
} }
scalar noHeatTransfer::relaxationTime Foam::scalar Foam::noHeatTransfer::relaxationTime
( (
const scalar, const scalar,
const scalar, const scalar,
@ -87,14 +84,10 @@ scalar noHeatTransfer::relaxationTime
} }
scalar noHeatTransfer::fCorrection(const scalar) const Foam::scalar Foam::noHeatTransfer::fCorrection(const scalar) const
{ {
return 1.0; return 1.0;
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

23
src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(ChomiakInjector, 0); defineTypeNameAndDebug(ChomiakInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
ChomiakInjector, ChomiakInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::ChomiakInjector::ChomiakInjector
ChomiakInjector::ChomiakInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -88,13 +85,13 @@ ChomiakInjector::ChomiakInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
ChomiakInjector::~ChomiakInjector() Foam::ChomiakInjector::~ChomiakInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar ChomiakInjector::d0 Foam::scalar Foam::ChomiakInjector::d0
( (
const label, const label,
const scalar const scalar
@ -104,7 +101,7 @@ scalar ChomiakInjector::d0
} }
vector ChomiakInjector::direction Foam::vector Foam::ChomiakInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -162,7 +159,7 @@ vector ChomiakInjector::direction
} }
scalar ChomiakInjector::velocity Foam::scalar Foam::ChomiakInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -184,7 +181,7 @@ scalar ChomiakInjector::velocity
} }
scalar ChomiakInjector::averageVelocity(const label i) const Foam::scalar Foam::ChomiakInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi(); scalar dt = it.teoi() - it.tsoi();
@ -192,8 +189,4 @@ scalar ChomiakInjector::averageVelocity(const label i) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

31
src/lagrangian/dieselSpray/spraySubModels/injectorModel/blobsSwirl/blobsSwirlInjector.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "unitConversion.H" #include "unitConversion.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(blobsSwirlInjector, 0); defineTypeNameAndDebug(blobsSwirlInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
blobsSwirlInjector, blobsSwirlInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::blobsSwirlInjector::blobsSwirlInjector
blobsSwirlInjector::blobsSwirlInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -94,13 +91,13 @@ blobsSwirlInjector::blobsSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
blobsSwirlInjector::~blobsSwirlInjector() Foam::blobsSwirlInjector::~blobsSwirlInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar blobsSwirlInjector::d0 Foam::scalar Foam::blobsSwirlInjector::d0
( (
const label n, const label n,
const scalar t const scalar t
@ -132,7 +129,7 @@ scalar blobsSwirlInjector::d0
} }
vector blobsSwirlInjector::direction Foam::vector Foam::blobsSwirlInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -182,7 +179,7 @@ vector blobsSwirlInjector::direction
} }
scalar blobsSwirlInjector::velocity Foam::scalar Foam::blobsSwirlInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -192,7 +189,7 @@ scalar blobsSwirlInjector::velocity
} }
scalar blobsSwirlInjector::averageVelocity(const label i) const Foam::scalar Foam::blobsSwirlInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
@ -210,13 +207,13 @@ scalar blobsSwirlInjector::averageVelocity(const label i) const
} }
scalar blobsSwirlInjector::kv(const label inj) const Foam::scalar Foam::blobsSwirlInjector::kv(const label inj) const
{ {
return cD_[inj]/cos(angle_) * sqrt((1.0 - x_)/(1.0 + x_)); return cD_[inj]/cos(angle_) * sqrt((1.0 - x_)/(1.0 + x_));
} }
void blobsSwirlInjector::calculateHX void Foam::blobsSwirlInjector::calculateHX
( (
const label inj, const label inj,
const scalar massFlow, const scalar massFlow,
@ -277,7 +274,7 @@ void blobsSwirlInjector::calculateHX
} }
scalar blobsSwirlInjector::deltaPressureInj Foam::scalar Foam::blobsSwirlInjector::deltaPressureInj
( (
const scalar time, const scalar time,
const label inj const label inj
@ -289,7 +286,7 @@ scalar blobsSwirlInjector::deltaPressureInj
} }
scalar blobsSwirlInjector::averagePressure(const label inj) const Foam::scalar Foam::blobsSwirlInjector::averagePressure(const label inj) const
{ {
const injectorType& it = sm_.injectors()[inj].properties(); const injectorType& it = sm_.injectors()[inj].properties();
@ -298,8 +295,4 @@ scalar blobsSwirlInjector::averagePressure(const label inj) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

23
src/lagrangian/dieselSpray/spraySubModels/injectorModel/constant/constInjector.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(constInjector, 0); defineTypeNameAndDebug(constInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
constInjector, constInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::constInjector::constInjector
constInjector::constInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -93,13 +90,13 @@ constInjector::constInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
constInjector::~constInjector() Foam::constInjector::~constInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar constInjector::d0 Foam::scalar Foam::constInjector::d0
( (
const label n, const label n,
const scalar const scalar
@ -109,7 +106,7 @@ scalar constInjector::d0
} }
vector constInjector::direction Foam::vector Foam::constInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -176,7 +173,7 @@ vector constInjector::direction
} }
scalar constInjector::velocity Foam::scalar Foam::constInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -198,7 +195,7 @@ scalar constInjector::velocity
} }
scalar constInjector::averageVelocity(const label i) const Foam::scalar Foam::constInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi(); scalar dt = it.teoi() - it.tsoi();
@ -207,8 +204,4 @@ scalar constInjector::averageVelocity(const label i) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

24
src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(definedHollowConeInjector, 0); defineTypeNameAndDebug(definedHollowConeInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
definedHollowConeInjector, definedHollowConeInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::definedHollowConeInjector::definedHollowConeInjector
definedHollowConeInjector::definedHollowConeInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -128,13 +125,13 @@ definedHollowConeInjector::definedHollowConeInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
definedHollowConeInjector::~definedHollowConeInjector() Foam::definedHollowConeInjector::~definedHollowConeInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar definedHollowConeInjector::d0 Foam::scalar Foam::definedHollowConeInjector::d0
( (
const label n, const label n,
const scalar t const scalar t
@ -146,7 +143,7 @@ scalar definedHollowConeInjector::d0
} }
vector definedHollowConeInjector::direction Foam::vector Foam::definedHollowConeInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -204,7 +201,7 @@ vector definedHollowConeInjector::direction
} }
scalar definedHollowConeInjector::velocity Foam::scalar Foam::definedHollowConeInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -226,7 +223,8 @@ scalar definedHollowConeInjector::velocity
} }
scalar definedHollowConeInjector::averageVelocity(const label i) const Foam::scalar
Foam::definedHollowConeInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi(); scalar dt = it.teoi() - it.tsoi();
@ -234,8 +232,4 @@ scalar definedHollowConeInjector::averageVelocity(const label i) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

30
src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(definedPressureSwirlInjector, 0); defineTypeNameAndDebug(definedPressureSwirlInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
definedPressureSwirlInjector, definedPressureSwirlInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::definedPressureSwirlInjector::definedPressureSwirlInjector
definedPressureSwirlInjector::definedPressureSwirlInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -80,13 +77,13 @@ definedPressureSwirlInjector::definedPressureSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
definedPressureSwirlInjector::~definedPressureSwirlInjector() Foam::definedPressureSwirlInjector::~definedPressureSwirlInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar definedPressureSwirlInjector::d0 Foam::scalar Foam::definedPressureSwirlInjector::d0
( (
const label n, const label n,
const scalar t const scalar t
@ -206,7 +203,7 @@ scalar definedPressureSwirlInjector::d0
} }
vector definedPressureSwirlInjector::direction Foam::vector Foam::definedPressureSwirlInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -255,7 +252,7 @@ vector definedPressureSwirlInjector::direction
} }
scalar definedPressureSwirlInjector::velocity Foam::scalar Foam::definedPressureSwirlInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -265,7 +262,7 @@ scalar definedPressureSwirlInjector::velocity
} }
scalar definedPressureSwirlInjector::averageVelocity(const label i) const Foam::scalar Foam::definedPressureSwirlInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
@ -284,7 +281,7 @@ scalar definedPressureSwirlInjector::averageVelocity(const label i) const
} }
scalar definedPressureSwirlInjector::kv Foam::scalar Foam::definedPressureSwirlInjector::kv
( (
const label inj, const label inj,
const scalar massFlow, const scalar massFlow,
@ -316,7 +313,7 @@ scalar definedPressureSwirlInjector::kv
} }
scalar definedPressureSwirlInjector::deltaPressureInj Foam::scalar Foam::definedPressureSwirlInjector::deltaPressureInj
( (
const scalar time, const scalar time,
const label inj const label inj
@ -328,7 +325,8 @@ scalar definedPressureSwirlInjector::deltaPressureInj
} }
scalar definedPressureSwirlInjector::averagePressure(const label inj) const Foam::scalar
Foam::definedPressureSwirlInjector::averagePressure(const label inj) const
{ {
const injectorType& it = sm_.injectors()[inj].properties(); const injectorType& it = sm_.injectors()[inj].properties();
@ -337,8 +335,4 @@ scalar definedPressureSwirlInjector::averagePressure(const label inj) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

23
src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(hollowConeInjector, 0); defineTypeNameAndDebug(hollowConeInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
hollowConeInjector, hollowConeInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::hollowConeInjector::hollowConeInjector
hollowConeInjector::hollowConeInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -104,13 +101,13 @@ hollowConeInjector::hollowConeInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
hollowConeInjector::~hollowConeInjector() Foam::hollowConeInjector::~hollowConeInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar hollowConeInjector::d0 Foam::scalar Foam::hollowConeInjector::d0
( (
const label, const label,
const scalar const scalar
@ -120,7 +117,7 @@ scalar hollowConeInjector::d0
} }
vector hollowConeInjector::direction Foam::vector Foam::hollowConeInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -171,7 +168,7 @@ vector hollowConeInjector::direction
} }
scalar hollowConeInjector::velocity Foam::scalar Foam::hollowConeInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -193,7 +190,7 @@ scalar hollowConeInjector::velocity
} }
scalar hollowConeInjector::averageVelocity(const label i) const Foam::scalar Foam::hollowConeInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
scalar dt = it.teoi() - it.tsoi(); scalar dt = it.teoi() - it.tsoi();
@ -201,8 +198,4 @@ scalar hollowConeInjector::averageVelocity(const label i) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.C
View File

@ -29,21 +29,18 @@ License
#include "injectorModel.H" #include "injectorModel.H"
#include "volFields.H" #include "volFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(injectorModel, 0); defineTypeNameAndDebug(injectorModel, 0);
defineRunTimeSelectionTable(injectorModel, dictionary); defineRunTimeSelectionTable(injectorModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::injectorModel::injectorModel
injectorModel::injectorModel
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -58,12 +55,8 @@ injectorModel::injectorModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
injectorModel::~injectorModel() Foam::injectorModel::~injectorModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

29
src/lagrangian/dieselSpray/spraySubModels/injectorModel/pressureSwirl/pressureSwirlInjector.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(pressureSwirlInjector, 0); defineTypeNameAndDebug(pressureSwirlInjector, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
pressureSwirlInjector, pressureSwirlInjector,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::pressureSwirlInjector::pressureSwirlInjector
pressureSwirlInjector::pressureSwirlInjector
( (
const dictionary& dict, const dictionary& dict,
spray& sm spray& sm
@ -90,13 +87,13 @@ pressureSwirlInjector::pressureSwirlInjector
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
pressureSwirlInjector::~pressureSwirlInjector() Foam::pressureSwirlInjector::~pressureSwirlInjector()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar pressureSwirlInjector::d0 Foam::scalar Foam::pressureSwirlInjector::d0
( (
const label n, const label n,
const scalar t const scalar t
@ -128,7 +125,7 @@ scalar pressureSwirlInjector::d0
} }
vector pressureSwirlInjector::direction Foam::vector Foam::pressureSwirlInjector::direction
( (
const label n, const label n,
const label hole, const label hole,
@ -177,7 +174,7 @@ vector pressureSwirlInjector::direction
} }
scalar pressureSwirlInjector::velocity Foam::scalar Foam::pressureSwirlInjector::velocity
( (
const label i, const label i,
const scalar time const scalar time
@ -187,7 +184,7 @@ scalar pressureSwirlInjector::velocity
} }
scalar pressureSwirlInjector::averageVelocity(const label i) const Foam::scalar Foam::pressureSwirlInjector::averageVelocity(const label i) const
{ {
const injectorType& it = sm_.injectors()[i].properties(); const injectorType& it = sm_.injectors()[i].properties();
@ -206,7 +203,7 @@ scalar pressureSwirlInjector::averageVelocity(const label i) const
} }
scalar pressureSwirlInjector::kv Foam::scalar Foam::pressureSwirlInjector::kv
( (
const label inj, const label inj,
const scalar massFlow, const scalar massFlow,
@ -237,7 +234,7 @@ scalar pressureSwirlInjector::kv
} }
scalar pressureSwirlInjector::deltaPressureInj Foam::scalar Foam::pressureSwirlInjector::deltaPressureInj
( (
const scalar time, const scalar time,
const label inj const label inj
@ -249,7 +246,7 @@ scalar pressureSwirlInjector::deltaPressureInj
} }
scalar pressureSwirlInjector::averagePressure(const label inj) const Foam::scalar Foam::pressureSwirlInjector::averagePressure(const label inj) const
{ {
const injectorType& it = sm_.injectors()[inj].properties(); const injectorType& it = sm_.injectors()[inj].properties();
@ -259,8 +256,4 @@ scalar pressureSwirlInjector::averagePressure(const label inj) const
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

17
src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
View File

@ -28,13 +28,10 @@ License
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "wallPolyPatch.H" #include "wallPolyPatch.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(reflectParcel, 0); defineTypeNameAndDebug(reflectParcel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -43,12 +40,12 @@ addToRunTimeSelectionTable
reflectParcel, reflectParcel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::reflectParcel::reflectParcel
reflectParcel::reflectParcel
( (
const dictionary& dict, const dictionary& dict,
const volVectorField& U, const volVectorField& U,
@ -64,14 +61,14 @@ reflectParcel::reflectParcel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
reflectParcel::~reflectParcel() Foam::reflectParcel::~reflectParcel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
// Return 'keepParcel' // Return 'keepParcel'
bool reflectParcel::wallTreatment bool Foam::reflectParcel::wallTreatment
( (
parcel& p, parcel& p,
const label globalFacei const label globalFacei
@ -187,8 +184,4 @@ bool reflectParcel::wallTreatment
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

19
src/lagrangian/dieselSpray/spraySubModels/wallModel/removeParcel/removeParcel.C
View File

@ -27,13 +27,10 @@ License
#include "removeParcel.H" #include "removeParcel.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(removeParcel, 0); defineTypeNameAndDebug(removeParcel, 0);
addToRunTimeSelectionTable addToRunTimeSelectionTable
@ -42,14 +39,12 @@ addToRunTimeSelectionTable
removeParcel, removeParcel,
dictionary dictionary
); );
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components Foam::removeParcel::removeParcel
removeParcel::removeParcel
( (
const dictionary& dict, const dictionary& dict,
const volVectorField& U, const volVectorField& U,
@ -62,13 +57,13 @@ removeParcel::removeParcel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
removeParcel::~removeParcel() Foam::removeParcel::~removeParcel()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool removeParcel::wallTreatment bool Foam::removeParcel::wallTreatment
( (
parcel&, parcel&,
const label facei const label facei
@ -78,8 +73,4 @@ bool removeParcel::wallTreatment
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

15
src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.C
View File

@ -26,21 +26,18 @@ License
#include "wallModel.H" #include "wallModel.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(wallModel, 0); defineTypeNameAndDebug(wallModel, 0);
defineRunTimeSelectionTable(wallModel, dictionary); defineRunTimeSelectionTable(wallModel, dictionary);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
wallModel::wallModel Foam::wallModel::wallModel
( (
const dictionary& dict, const dictionary& dict,
const volVectorField& U, const volVectorField& U,
@ -55,12 +52,8 @@ wallModel::wallModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
wallModel::~wallModel() Foam::wallModel::~wallModel()
{} {}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

12
src/lagrangian/dieselSpray/spraySubModels/wallModel/wallModel/wallModel.H
View File

@ -40,10 +40,12 @@ SourceFiles
#include "spray.H" #include "spray.H"
#include "IOdictionary.H" #include "IOdictionary.H"
#include "fvCFD.H"
#include "autoPtr.H" #include "autoPtr.H"
#include "runTimeSelectionTables.H" #include "runTimeSelectionTables.H"
#include "volFields.H"
#include "surfaceFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
@ -91,9 +93,9 @@ public:
//- Construct from components //- Construct from components
wallModel wallModel
( (
const dictionary& dict, const dictionary&,
const volVectorField& U, const volVectorField& U,
spray& sm spray&
); );
@ -105,7 +107,7 @@ public:
static autoPtr<wallModel> New static autoPtr<wallModel> New
( (
const dictionary& dict, const dictionary&,
const volVectorField& U, const volVectorField& U,
spray& sm spray& sm
); );
@ -116,7 +118,7 @@ public:
//- Return true if parcel is to be kept, false if it is to be removed //- Return true if parcel is to be kept, false if it is to be removed
virtual bool wallTreatment virtual bool wallTreatment
( (
parcel& parcel, parcel&,
const label facei const label facei
) const = 0; ) const = 0;
}; };

9
src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.C
View File

@ -101,14 +101,7 @@ bool Foam::interpolationLookUpTable<Type>::checkRange
const label interfield const label interfield
) const ) const
{ {
if (lookUpValue >= min_[interfield] && lookUpValue <= max_[interfield]) return lookUpValue >= min_[interfield] && lookUpValue <= max_[interfield];
{
return true;
}
else
{
return false;
}
} }

26
src/thermophysicalModels/radiation/radiationModel/fvDOM/interpolationLookUpTable/interpolationLookUpTable.H
View File

@ -46,13 +46,15 @@ SourceFiles
#include "scalarField.H" #include "scalarField.H"
#include "HashTable.H" #include "HashTable.H"
#include "IOdictionary.H" #include "IOdictionary.H"
#include "fvCFD.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// Forward declaration of classes
class fvMesh;
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class interpolationLookUpTable Declaration Class interpolationLookUpTable Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
@ -103,7 +105,7 @@ private:
// Private Member Functions // Private Member Functions
//- Read the table of data from file //- Read the table of data from file
void readTable(const word& instance, const fvMesh& mesh); void readTable(const word& instance, const fvMesh&);
//- Dimension table from dictionaries input and output //- Dimension table from dictionaries input and output
void dimensionTable(); void dimensionTable();
@ -144,16 +146,16 @@ public:
//- Construct given the name of the file containing the table of data //- Construct given the name of the file containing the table of data
interpolationLookUpTable interpolationLookUpTable
( (
const fileName& fn, const fileName&,
const word& instance, const word& instance,
const fvMesh& mesh const fvMesh&
); );
//- Construct from dictionary //- Construct from dictionary
interpolationLookUpTable(const dictionary& dict); interpolationLookUpTable(const dictionary&);
//- Construct copy //- Construct copy
interpolationLookUpTable(const interpolationLookUpTable& interpTable); interpolationLookUpTable(const interpolationLookUpTable&);
// Member Functions // Member Functions
@ -167,10 +169,10 @@ public:
//- Write Look Up Table to filename. //- Write Look Up Table to filename.
void write void write
( (
Ostream& os, Ostream&,
const fileName& fn, const fileName&,
const word& instance, const word& instance,
const fvMesh& mesh const fvMesh&
) const; ) const;
@ -211,17 +213,13 @@ public:
}; };
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "interpolationLookUpTableI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam } // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "interpolationLookUpTableI.H"
#ifdef NoRepository #ifdef NoRepository
# include "interpolationLookUpTable.C" # include "interpolationLookUpTable.C"