diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C index 7d716e68..0ce2b8db 100644 --- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C +++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,9 +75,9 @@ Foam::solidBodyMotionFunctions::rotatingMotion::transformation() const scalar t = time_.value(); // Rotation around axis - vector eulerAngles = omega_->integrate(0, t)*axis_; + scalar angle = omega_->integrate(0, t); - quaternion R(eulerAngles.x(), eulerAngles.y(), eulerAngles.z()); + quaternion R(axis_, angle); septernion TR(septernion(origin_)*R*septernion(-origin_)); Info<< "solidBodyMotionFunctions::rotatingMotion::transformation(): " diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index 11f811e4..07c79444 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.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 @@ -107,7 +107,7 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs() const fvMesh& mesh = dimensionedInternalField().mesh(); - if (mesh.changing()) + if (mesh.moving()) { const fvPatch& p = patch(); const polyPatch& pp = p.patch(); diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C index 78e4c63a..11a2a21e 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C @@ -77,6 +77,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion() constraints_(), tConstraints_(tensor::I), rConstraints_(tensor::I), + initialCentreOfMass_(vector::zero), initialCentreOfRotation_(vector::zero), initialQ_(I), mass_(VSMALL), @@ -157,6 +158,9 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion motionState0_(sDoFRBM.motionState0_), restraints_(sDoFRBM.restraints_), constraints_(sDoFRBM.constraints_), + tConstraints_(sDoFRBM.tConstraints_), + rConstraints_(sDoFRBM.rConstraints_), + initialCentreOfMass_(sDoFRBM.initialCentreOfMass_), initialCentreOfRotation_(sDoFRBM.initialCentreOfRotation_), initialQ_(sDoFRBM.initialQ_), mass_(sDoFRBM.mass_),