From 773022d8aad02d8c99b550dc5ee36233abd8546d Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 24 Jun 2014 15:05:08 +0100 Subject: [PATCH 1/3] BUG: PrimitivePatch: clear local topology --- .../meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C index 664e5a19..d4aa873d 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C +++ b/src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchClear.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,6 +92,7 @@ clearTopology() deleteDemandDrivenData(pointEdgesPtr_); deleteDemandDrivenData(pointFacesPtr_); deleteDemandDrivenData(edgeLoopsPtr_); + deleteDemandDrivenData(localPointOrderPtr_); } From c45659d848b0e418afd129c9fc1edd658f3da73e Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 24 Jun 2014 15:05:43 +0100 Subject: [PATCH 2/3] ENH: UIndirectList: added stl typedefs --- .../Lists/UIndirectList/UIndirectList.H | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H index 56121a22..4409dac8 100644 --- a/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H +++ b/src/OpenFOAM/containers/Lists/UIndirectList/UIndirectList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,6 +128,21 @@ public: //- Type of values the UList contains. typedef T value_type; + //- Type that can be used for storing into + // UList::value_type objects. + typedef T& reference; + + //- Type that can be used for storing into + // constant UList::value_type objects + typedef const T& const_reference; + + //- The type that can represent the difference between any two + // UList iterator objects. + typedef label difference_type; + + //- The type that can represent the size of a UList. + typedef label size_type; + // Ostream operator From 07985e549778a3eb984579b377305565539922ed Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 24 Jun 2014 15:07:49 +0100 Subject: [PATCH 3/3] BUG: sixDofRigidBodyMotion: write initial rotation --- .../sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C index 4da01ef2..b7266df9 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionIO.C @@ -52,7 +52,7 @@ void Foam::sixDoFRigidBodyMotion::write(Ostream& os) const os.writeKeyword("centreOfMass") << initialCentreOfMass_ << token::END_STATEMENT << nl; - os.writeKeyword("orientation") + os.writeKeyword("initialOrientation") << initialQ_ << token::END_STATEMENT << nl; os.writeKeyword("mass") << mass_ << token::END_STATEMENT << nl;