exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes to avoid changing the operators in the control switches

Browse source
This commit is contained in:
Henrik Rusche 2019-01-23 15:52:37 +01:00
parent ec50f969d0
commit 951ca591e8
6 changed files with 76 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/foam/db/IOobjects/IOdictionary/IOdictionaryIO.C
View file

@ -67,7 +67,7 @@ void Foam::IOdictionary::readFile(const bool masterOnly)
const List<Pstream::commsStruct>& comms =
(
(Pstream::nProcs() < Pstream::nProcsSimpleSum)
(Pstream::nProcs() < Pstream::nProcsSimpleSum())
? Pstream::linearCommunication()
: Pstream::treeCommunication()
);

2
src/foam/db/regIOobject/regIOobjectRead.C
View file

@ -204,7 +204,7 @@ bool Foam::regIOobject::read()
const List<Pstream::commsStruct>& comms =
(
(Pstream::nProcs() < Pstream::nProcsSimpleSum)
(Pstream::nProcs() < Pstream::nProcsSimpleSum())
? Pstream::linearCommunication()
: Pstream::treeCommunication()
);

66
src/foam/global/controlSwitches/controlSwitches.H
View file

@ -81,18 +81,18 @@ inline bool operator==
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator==
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator==
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
);
template<class T>
@ -102,18 +102,18 @@ inline bool operator!=
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator!=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator!=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
);
template<class T>
@ -123,18 +123,18 @@ inline bool operator>=
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator>=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator>=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
);
template<class T>
@ -144,18 +144,18 @@ inline bool operator>
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator>
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator>
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
);
template<class T>
@ -165,18 +165,18 @@ inline bool operator<=
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator<=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator<=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
);
template<class T>
@ -186,11 +186,11 @@ inline bool operator<
const debug::controlSwitches<T>& rhs
);
template<class T1, class T2>
template<class T>
inline bool operator<
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
);
template<class T>

78
src/foam/global/controlSwitches/controlSwitchesI.H
View file

@ -41,33 +41,33 @@ inline const T Foam::debug::controlSwitches<T>::operator&(const T& rhs)
// * * * * * * * * * * * * * * * Global Operators * * * * * * * * * * * * * //
template<class T1, class T2>
template<class T>
inline bool Foam::operator==
(
const debug::controlSwitches<T1>& lhs,
const debug::controlSwitches<T2>& rhs
const debug::controlSwitches<T>& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs() == rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator==
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs == rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator==
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() == rhs;
@ -85,22 +85,22 @@ inline bool Foam::operator!=
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator!=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs != rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator!=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() != rhs;
@ -118,22 +118,22 @@ inline bool Foam::operator>=
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator>=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs >= rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator>=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() >= rhs;
@ -151,22 +151,22 @@ inline bool Foam::operator>
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator>
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs > rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator>
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() > rhs;
@ -184,22 +184,22 @@ inline bool Foam::operator<=
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator<=
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs <= rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator<=
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() <= rhs;
@ -217,22 +217,22 @@ inline bool Foam::operator<
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator<
(
const T1& lhs,
const debug::controlSwitches<T2>& rhs
const T& lhs,
const debug::controlSwitches<T>& rhs
)
{
return lhs < rhs();
}
template<class T1, class T2>
template<class T>
inline bool Foam::operator<
(
const debug::controlSwitches<T1>& lhs,
const T2& rhs
const debug::controlSwitches<T>& lhs,
const T& rhs
)
{
return lhs() < rhs;

2
src/foam/matrices/lduMatrix/lduMatrix/lduMatrixUpdateMatrixInterfaces.C
View file

@ -132,7 +132,7 @@ void Foam::lduMatrix::updateMatrixInterfaces
// Try and consume interfaces as they become available
bool allUpdated = false;
for (label i = 0; i < Pstream::nPollProcInterfaces; i++)
for (label i = 0; i < Pstream::nPollProcInterfaces(); i++)
{
allUpdated = true;

2
src/thermophysicalModels/specie/thermo/realGasThermo/realGasSpecieThermo/realGasSpecieThermoI.H
View file

@ -89,7 +89,7 @@ inline void Foam::realGasSpecieThermo<thermo>::T
)
);
if (iter++ > maxIter_)
if (iter++ > maxIter_())
{
FatalErrorIn
(