From 2f62d94e8b1691208382869e0ace232ffbbc8e85 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 29 Jun 2017 17:16:38 +0100 Subject: [PATCH 1/2] BUG: CollidingParcel: is not contiguous since have collisionRecords_ --- .../basicKinematicCollidingParcel.H | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H index 80317598ac..7bc69e6b6d 100644 --- a/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H +++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicCollidingParcel/basicKinematicCollidingParcel.H @@ -46,12 +46,6 @@ namespace Foam { typedef CollidingParcel> basicKinematicCollidingParcel; - - template<> - inline bool contiguous() - { - return true; - } } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // From 0e465e0f5d91427b85a8f4b3903ce1ee3a726f2a Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 29 Jun 2017 17:33:40 +0100 Subject: [PATCH 2/2] BUG: label64: write primitives consistent with label size. Fixes #505. --- src/OpenFOAM/primitives/bools/bool/boolIO.C | 2 +- src/OpenFOAM/primitives/direction/directionIO.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/primitives/bools/bool/boolIO.C b/src/OpenFOAM/primitives/bools/bool/boolIO.C index f098a3e186..8f19c58bf3 100644 --- a/src/OpenFOAM/primitives/bools/bool/boolIO.C +++ b/src/OpenFOAM/primitives/bools/bool/boolIO.C @@ -45,7 +45,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const bool b) { // we could also write as text string without any difficulty // os << (b ? "true" : "false"); - os.write(int(b)); + os.write(label(b)); os.check(FUNCTION_NAME); return os; } diff --git a/src/OpenFOAM/primitives/direction/directionIO.C b/src/OpenFOAM/primitives/direction/directionIO.C index e733515933..135eaf89b1 100644 --- a/src/OpenFOAM/primitives/direction/directionIO.C +++ b/src/OpenFOAM/primitives/direction/directionIO.C @@ -68,7 +68,7 @@ Foam::Istream& Foam::operator>>(Istream& is, direction& d) Foam::Ostream& Foam::operator<<(Ostream& os, const direction d) { - os.write(int(d)); + os.write(label(d)); os.check(FUNCTION_NAME); return os; }