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

Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

Browse Source
This commit is contained in:
Andrew Heather
2017-06-29 19:49:55 +01:00
parent 4518004df4 31172408ee
commit c84bf48873
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenFOAM/primitives/bools/bool/boolIO.C
View File

@ -45,7 +45,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const bool b)
{ {
// we could also write as text string without any difficulty // we could also write as text string without any difficulty
// os << (b ? "true" : "false"); // os << (b ? "true" : "false");
os.write(int(b)); os.write(label(b));
os.check(FUNCTION_NAME); os.check(FUNCTION_NAME);
return os; return os;
} }

2
src/OpenFOAM/primitives/direction/directionIO.C
View File

@ -68,7 +68,7 @@ Foam::Istream& Foam::operator>>(Istream& is, direction& d)
Foam::Ostream& Foam::operator<<(Ostream& os, const direction d) Foam::Ostream& Foam::operator<<(Ostream& os, const direction d)
{ {
os.write(int(d)); os.write(label(d));
os.check(FUNCTION_NAME); os.check(FUNCTION_NAME);
return os; return os;
} }

6
src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H
View File

@ -46,12 +46,6 @@ namespace Foam
{ {
typedef CollidingParcel<KinematicParcel<particle>> typedef CollidingParcel<KinematicParcel<particle>>
basicKinematicCollidingParcel; basicKinematicCollidingParcel;
template<>
inline bool contiguous<basicKinematicCollidingParcel>()
{
return true;
}
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //