mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
fix up function parameters of getData/giveData
use 'const word&' instead of 'word' to avoid duplication of word and correct constness
This commit is contained in:
@ -129,31 +129,31 @@ public:
|
|||||||
template <typename T>
|
template <typename T>
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
T ** const& field
|
T ** const& field
|
||||||
) const { getData(name,type,field,couplingStep_-1); }
|
) const { getData(name,type,field,couplingStep_-1); }
|
||||||
|
|
||||||
virtual void getData
|
virtual void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const = 0;
|
) const = 0;
|
||||||
|
|
||||||
virtual void getData
|
virtual void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const = 0;
|
) const = 0;
|
||||||
|
|
||||||
virtual void giveData
|
virtual void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype="double"
|
const char* datatype="double"
|
||||||
) const = 0;
|
) const = 0;
|
||||||
|
|||||||
@ -78,24 +78,24 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const {}
|
) const {}
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const {}
|
) const {}
|
||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype = ""
|
const char* datatype = ""
|
||||||
) const {}
|
) const {}
|
||||||
|
|||||||
@ -84,8 +84,8 @@ oneWayVTK::~oneWayVTK()
|
|||||||
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
|
||||||
void oneWayVTK::getData
|
void oneWayVTK::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const
|
) const
|
||||||
@ -194,8 +194,8 @@ void oneWayVTK::getData
|
|||||||
|
|
||||||
void oneWayVTK::giveData
|
void oneWayVTK::giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const
|
) const
|
||||||
|
|||||||
@ -87,16 +87,16 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const
|
) const
|
||||||
@ -104,8 +104,8 @@ public:
|
|||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype = ""
|
const char* datatype = ""
|
||||||
) const;
|
) const;
|
||||||
|
|||||||
@ -80,7 +80,7 @@ twoWayFiles::~twoWayFiles()
|
|||||||
|
|
||||||
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * * * //
|
||||||
|
|
||||||
fileName twoWayFiles::getFilePath(word& name, bool in) const
|
fileName twoWayFiles::getFilePath(const word& name, bool in) const
|
||||||
{
|
{
|
||||||
char timeStep[40];
|
char timeStep[40];
|
||||||
|
|
||||||
@ -100,7 +100,7 @@ fileName twoWayFiles::getFilePath(word& name, bool in) const
|
|||||||
return particleFilePathOld;
|
return particleFilePathOld;
|
||||||
}
|
}
|
||||||
|
|
||||||
void twoWayFiles::renameFilePath(fileName& particleFilePathOld,word& name) const
|
void twoWayFiles::renameFilePath(const fileName& particleFilePathOld, const word& name) const
|
||||||
{
|
{
|
||||||
char timeStep[40];
|
char timeStep[40];
|
||||||
|
|
||||||
@ -116,8 +116,8 @@ void twoWayFiles::renameFilePath(fileName& particleFilePathOld,word& name) const
|
|||||||
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
||||||
void twoWayFiles::getData
|
void twoWayFiles::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const
|
) const
|
||||||
@ -164,8 +164,8 @@ void twoWayFiles::getData
|
|||||||
|
|
||||||
void twoWayFiles::giveData
|
void twoWayFiles::giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const
|
) const
|
||||||
|
|||||||
@ -65,9 +65,9 @@ private:
|
|||||||
|
|
||||||
// private member functions
|
// private member functions
|
||||||
|
|
||||||
fileName getFilePath(word&, bool) const;
|
fileName getFilePath(const word&, bool) const;
|
||||||
|
|
||||||
void renameFilePath(fileName&,word&) const;
|
void renameFilePath(const fileName&, const word&) const;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -92,24 +92,24 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const { FatalError<<"function not implemented !!! twoWayFiles::getData!!!\n" << abort(FatalError); }
|
) const { FatalError<<"function not implemented !!! twoWayFiles::getData!!!\n" << abort(FatalError); }
|
||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype = ""
|
const char* datatype = ""
|
||||||
) const;
|
) const;
|
||||||
|
|||||||
@ -138,8 +138,8 @@ double twoWayMPI::DEMVariableValue(word variablename)
|
|||||||
|
|
||||||
void twoWayMPI::getData
|
void twoWayMPI::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -149,8 +149,8 @@ void twoWayMPI::getData
|
|||||||
|
|
||||||
void twoWayMPI::getData
|
void twoWayMPI::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -160,8 +160,8 @@ void twoWayMPI::getData
|
|||||||
|
|
||||||
void twoWayMPI::giveData
|
void twoWayMPI::giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const
|
) const
|
||||||
|
|||||||
@ -107,24 +107,24 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const;
|
) const;
|
||||||
|
|||||||
@ -178,8 +178,8 @@ twoWayMany2Many::~twoWayMany2Many()
|
|||||||
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
||||||
void twoWayMany2Many::getData
|
void twoWayMany2Many::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -231,8 +231,8 @@ void twoWayMany2Many::getData
|
|||||||
|
|
||||||
void twoWayMany2Many::getData
|
void twoWayMany2Many::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -242,8 +242,8 @@ void twoWayMany2Many::getData
|
|||||||
|
|
||||||
void twoWayMany2Many::giveData
|
void twoWayMany2Many::giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* /*datatype*/
|
const char* /*datatype*/
|
||||||
) const
|
) const
|
||||||
|
|||||||
@ -157,24 +157,24 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const;
|
) const;
|
||||||
|
|||||||
@ -253,8 +253,8 @@ twoWayOne2One::~twoWayOne2One()
|
|||||||
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
// * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * //
|
||||||
void twoWayOne2One::getData
|
void twoWayOne2One::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -361,8 +361,8 @@ void twoWayOne2One::getData
|
|||||||
|
|
||||||
void twoWayOne2One::getData
|
void twoWayOne2One::getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label /*step*/
|
label /*step*/
|
||||||
) const
|
) const
|
||||||
@ -383,8 +383,8 @@ void twoWayOne2One::getData
|
|||||||
|
|
||||||
void twoWayOne2One::giveData
|
void twoWayOne2One::giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const
|
) const
|
||||||
|
|||||||
@ -152,24 +152,24 @@ public:
|
|||||||
// Member Functions
|
// Member Functions
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void getData
|
void getData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
int ** const& field,
|
int ** const& field,
|
||||||
label step
|
label step
|
||||||
) const;
|
) const;
|
||||||
|
|
||||||
void giveData
|
void giveData
|
||||||
(
|
(
|
||||||
word name,
|
const word& name,
|
||||||
word type,
|
const word& type,
|
||||||
double ** const& field,
|
double ** const& field,
|
||||||
const char* datatype
|
const char* datatype
|
||||||
) const;
|
) const;
|
||||||
|
|||||||
Reference in New Issue
Block a user