From 2bc9f0a545f4f6545ab07d324364f61e3a6ef109 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 13 Dec 2013 15:51:28 +0000
Subject: [PATCH] Reorganised private data
---
.../sixDoFRigidBodyMotion.C | 18 +++++++++---------
.../sixDoFRigidBodyMotion.H | 10 ++++++----
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
index 4ee39646d04..b3a013328c2 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
@@ -73,15 +73,15 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion()
motionState0_(),
restraints_(),
constraints_(),
+ tConstraints_(tensor::I),
+ rConstraints_(tensor::I),
initialCentreOfMass_(vector::zero),
initialQ_(I),
momentOfInertia_(diagTensor::one*VSMALL),
mass_(VSMALL),
aRelax_(1.0),
aDamp_(1.0),
- report_(false),
- tConstraints_(tensor::I),
- rConstraints_(tensor::I)
+ report_(false)
{}
@@ -114,15 +114,15 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
motionState0_(motionState_),
restraints_(),
constraints_(),
+ tConstraints_(tensor::I),
+ rConstraints_(tensor::I),
initialCentreOfMass_(initialCentreOfMass),
initialQ_(initialQ),
momentOfInertia_(momentOfInertia),
mass_(mass),
aRelax_(aRelax),
aDamp_(aDamp),
- report_(report),
- tConstraints_(tensor::I),
- rConstraints_(tensor::I)
+ report_(report)
{}
@@ -136,6 +136,8 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
motionState0_(motionState_),
restraints_(),
constraints_(),
+ tConstraints_(tensor::I),
+ rConstraints_(tensor::I),
initialCentreOfMass_
(
dict.lookupOrDefault
@@ -156,9 +158,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
mass_(readScalar(dict.lookup("mass"))),
aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
- report_(dict.lookupOrDefault<Switch>("report", false)),
- tConstraints_(tensor::I),
- rConstraints_(tensor::I)
+ report_(dict.lookupOrDefault<Switch>("report", false))
{
addRestraints(dict);
addConstraints(dict);
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
index 34e5016e11a..0e4ab39da26 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
@@ -96,6 +96,12 @@ class sixDoFRigidBodyMotion
//- Motion constaints
PtrList<sixDoFRigidBodyMotionConstraint> constraints_;
+ //- Translational constraint tensor
+ tensor tConstraints_;
+
+ //- Rotational constraint tensor
+ tensor rConstraints_;
+
//- Centre of mass of initial state
point initialCentreOfMass_;
@@ -118,10 +124,6 @@ class sixDoFRigidBodyMotion
//- Switch to turn reporting of motion data on and off
Switch report_;
- tensor tConstraints_;
-
- tensor rConstraints_;
-
// Private Member Functions
--
GitLab