Preparatory clean-up for Pstream

This commit is contained in:
Hrvoje Jasak 2015-10-10 18:56:29 +01:00
parent 4dfcfe8c47
commit 41c9243031
3 changed files with 9 additions and 32 deletions

View file

@ -625,17 +625,6 @@ Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::linearCommunication_(0);
Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::treeCommunication_(0); Foam::List<Foam::Pstream::commsStruct> Foam::Pstream::treeCommunication_(0);
// Should compact transfer be used in which floats replace doubles
// reducing the bandwidth requirement at the expense of some loss
// in accuracy
const Foam::debug::optimisationSwitch
Foam::Pstream::floatTransfer
(
"floatTransfer",
0
);
// Number of processors at which the reduce algorithm changes from linear to // Number of processors at which the reduce algorithm changes from linear to
// tree // tree
const Foam::debug::optimisationSwitch const Foam::debug::optimisationSwitch
@ -646,20 +635,6 @@ Foam::Pstream::nProcsSimpleSum
); );
// Default commsType
// Foam::Pstream::commsTypes Foam::Pstream::defaultCommsType
// (
// commsTypeNames
// [
// debug::optimisationSwitches().lookupOrAddDefault
// (
// "commsType",
// word("blocking")
// )
// ]
// );
const Foam::debug::optimisationSwitch const Foam::debug::optimisationSwitch
Foam::Pstream::defaultCommsType Foam::Pstream::defaultCommsType
( (

View file

@ -222,11 +222,6 @@ public:
// Static data // Static data
//- Should compact transfer be used in which floats replace doubles
// reducing the bandwidth requirement at the expense of some loss
// in accuracy
static const debug::optimisationSwitch floatTransfer;
//- Number of processors at which the sum algorithm changes from linear //- Number of processors at which the sum algorithm changes from linear
// to tree // to tree
static const debug::optimisationSwitch nProcsSimpleSum; static const debug::optimisationSwitch nProcsSimpleSum;
@ -234,6 +229,15 @@ public:
//- Default commsType //- Default commsType
static const debug::optimisationSwitch defaultCommsType; static const debug::optimisationSwitch defaultCommsType;
//- Default comms with a cast
inline static Pstream::commsTypes defaultComms()
{
return static_cast<Pstream::commsTypes>
(
Pstream::defaultCommsType()
);
}
// Constructors // Constructors

View file

@ -633,8 +633,6 @@ Foam::argList::argList
{ {
Info<< "Slaves : " << slaveProcs << nl Info<< "Slaves : " << slaveProcs << nl
<< "Pstream initialized with:" << nl << "Pstream initialized with:" << nl
<< " floatTransfer : "
<< Pstream::floatTransfer << nl
<< " nProcsSimpleSum : " << " nProcsSimpleSum : "
<< Pstream::nProcsSimpleSum() << nl << Pstream::nProcsSimpleSum() << nl
<< " commsType : " << " commsType : "