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

Reorganised private data

Browse Source
This commit is contained in:
Henry
2013-12-13 15:51:28 +00:00
parent 1b06c634ce
commit 2bc9f0a545
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
View File

@ -73,15 +73,15 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion()
motionState0_(), motionState0_(),
restraints_(), restraints_(),
constraints_(), constraints_(),
tConstraints_(tensor::I),
rConstraints_(tensor::I),
initialCentreOfMass_(vector::zero), initialCentreOfMass_(vector::zero),
initialQ_(I), initialQ_(I),
momentOfInertia_(diagTensor::one*VSMALL), momentOfInertia_(diagTensor::one*VSMALL),
mass_(VSMALL), mass_(VSMALL),
aRelax_(1.0), aRelax_(1.0),
aDamp_(1.0), aDamp_(1.0),
report_(false), report_(false)
tConstraints_(tensor::I),
rConstraints_(tensor::I)
{} {}
@ -114,15 +114,15 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
motionState0_(motionState_), motionState0_(motionState_),
restraints_(), restraints_(),
constraints_(), constraints_(),
tConstraints_(tensor::I),
rConstraints_(tensor::I),
initialCentreOfMass_(initialCentreOfMass), initialCentreOfMass_(initialCentreOfMass),
initialQ_(initialQ), initialQ_(initialQ),
momentOfInertia_(momentOfInertia), momentOfInertia_(momentOfInertia),
mass_(mass), mass_(mass),
aRelax_(aRelax), aRelax_(aRelax),
aDamp_(aDamp), aDamp_(aDamp),
report_(report), report_(report)
tConstraints_(tensor::I),
rConstraints_(tensor::I)
{} {}
@ -136,6 +136,8 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
motionState0_(motionState_), motionState0_(motionState_),
restraints_(), restraints_(),
constraints_(), constraints_(),
tConstraints_(tensor::I),
rConstraints_(tensor::I),
initialCentreOfMass_ initialCentreOfMass_
( (
dict.lookupOrDefault dict.lookupOrDefault
@ -156,9 +158,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
mass_(readScalar(dict.lookup("mass"))), mass_(readScalar(dict.lookup("mass"))),
aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)), aRelax_(dict.lookupOrDefault<scalar>("accelerationRelaxation", 1.0)),
aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)), aDamp_(dict.lookupOrDefault<scalar>("accelerationDamping", 1.0)),
report_(dict.lookupOrDefault<Switch>("report", false)), report_(dict.lookupOrDefault<Switch>("report", false))
tConstraints_(tensor::I),
rConstraints_(tensor::I)
{ {
addRestraints(dict); addRestraints(dict);
addConstraints(dict); addConstraints(dict);

10
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.H
View File

@ -96,6 +96,12 @@ class sixDoFRigidBodyMotion
//- Motion constaints //- Motion constaints
PtrList<sixDoFRigidBodyMotionConstraint> constraints_; PtrList<sixDoFRigidBodyMotionConstraint> constraints_;
//- Translational constraint tensor
tensor tConstraints_;
//- Rotational constraint tensor
tensor rConstraints_;
//- Centre of mass of initial state //- Centre of mass of initial state
point initialCentreOfMass_; point initialCentreOfMass_;
@ -118,10 +124,6 @@ class sixDoFRigidBodyMotion
//- Switch to turn reporting of motion data on and off //- Switch to turn reporting of motion data on and off
Switch report_; Switch report_;
tensor tConstraints_;
tensor rConstraints_;
// Private Member Functions // Private Member Functions