research/OpenFOAM-2.4.x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:OpenFOAM/OpenFOAM-2.3.x

Browse source
This commit is contained in:
mattijs 2014-05-28 15:24:39 +01:00
commit ba366a9f9b
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
View file

@ -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(): "

4
src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C
View file

@ -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();

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
View file

@ -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_),