zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rigidBodyMeshMotion, sixDoFRigidBodyMotion: lookup g from the mesh rather than time

Browse Source 
It would be more logical if g were registered to time but less flexible.
This commit is contained in:
Henry Weller
2019-05-03 17:15:14 +01:00
parent b8e15e24b1
commit 84e71a419a
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
View File

@ -245,10 +245,11 @@ void Foam::rigidBodyMeshMotion::solve()
const scalar ramp = ramp_->value(t.value());
if (t.foundObject<uniformDimensionedVectorField>("g"))
if (mesh().foundObject<uniformDimensionedVectorField>("g"))
{
g() =
ramp*t.lookupObject<uniformDimensionedVectorField>("g").value();
ramp
*mesh().lookupObject<uniformDimensionedVectorField>("g").value();
}
if (test_)

4
src/rigidBodyMeshMotion/rigidBodyMeshMotionSolver/rigidBodyMeshMotionSolver.C
View File

@ -193,10 +193,10 @@ void Foam::rigidBodyMeshMotionSolver::solve()
curTimeIndex_ = t.timeIndex();
}
if (t.foundObject<uniformDimensionedVectorField>("g"))
if (mesh().foundObject<uniformDimensionedVectorField>("g"))
{
g() =
t.lookupObject<uniformDimensionedVectorField>("g").value();
mesh().lookupObject<uniformDimensionedVectorField>("g").value();
}
if (test_)

4
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionSolver/sixDoFRigidBodyMotionSolver.C
View File

@ -196,9 +196,9 @@ void Foam::sixDoFRigidBodyMotionSolver::solve()
dimensionedVector g("g", dimAcceleration, Zero);
if (t.foundObject<uniformDimensionedVectorField>("g"))
if (mesh().foundObject<uniformDimensionedVectorField>("g"))
{
g = t.lookupObject<uniformDimensionedVectorField>("g");
g = mesh().lookupObject<uniformDimensionedVectorField>("g");
}
else if (coeffDict().found("g"))
{