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

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

Browse Source
This commit is contained in:
Henry Weller
2017-10-23 22:23:15 +01:00
parent a096a491fc 9cb8b71e06
commit 8d82645f68
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rigidBodyDynamics/restraints/linearAxialAngularSpring/linearAxialAngularSpring.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -133,7 +133,7 @@ void Foam::RBD::restraints::linearAxialAngularSpring::restrain
}
// Accumulate the force for the restrained body
fx[bodyIndex_] += spatialVector(moment, Zero);
fx[bodyIndex_] += model_.X0(bodyID_).T() & spatialVector(moment, Zero);
}

4
src/rigidBodyDynamics/restraints/linearDamper/linearDamper.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,7 +85,7 @@ void Foam::RBD::restraints::linearDamper::restrain
}
// Accumulate the force for the restrained body
fx[bodyIndex_] += spatialVector(Zero, force);
fx[bodyIndex_] += model_.X0(bodyID_).T() & spatialVector(Zero, force);
}

4
src/rigidBodyDynamics/restraints/sphericalAngularDamper/sphericalAngularDamper.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2016-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -85,7 +85,7 @@ void Foam::RBD::restraints::sphericalAngularDamper::restrain
}
// Accumulate the force for the restrained body
fx[bodyIndex_] += spatialVector(moment, Zero);
fx[bodyIndex_] += model_.X0(bodyID_).T() & spatialVector(moment, Zero);
}

7
src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.C
View File

@ -58,8 +58,8 @@ Foam::waveAlphaFvPatchScalarField::waveAlphaFvPatchScalarField
:
mixedFvPatchScalarField(p, iF),
UName_(dict.lookupOrDefault<word>("U", "U")),
liquid_(dict.lookupOrDefault<bool>("liquid", true)),
inletOutlet_(dict.lookupOrDefault<bool>("inletOutlet", true))
liquid_(dict.lookupOrDefault<Switch>("liquid", true)),
inletOutlet_(dict.lookupOrDefault<Switch>("inletOutlet", true))
{
if (dict.found("value"))
{
@ -171,7 +171,8 @@ void Foam::waveAlphaFvPatchScalarField::write
{
mixedFvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<bool>(os, "inletOutlet", true, inletOutlet_);
writeEntryIfDifferent<Switch>(os, "inletOutlet", true, inletOutlet_);
writeEntryIfDifferent<Switch>(os, "liquid", true, liquid_);
}

4
src/waves/derivedFvPatchFields/waveAlpha/waveAlphaFvPatchScalarField.H
View File

@ -79,14 +79,14 @@ class waveAlphaFvPatchScalarField
word UName_;
//- Is this alpha field that of the liquid under the wave?
const bool liquid_;
const Switch liquid_;
//- Act as an inlet/outlet patch? If false, the alpha field will be set
// by the wave model even during outflow. This may apply the wave model
// more accurately, but it might also be unstable. If true, the alpha
// boundary condition will be zero gradient when the flow reverses, as
// is usual.
const bool inletOutlet_;
const Switch inletOutlet_;
public: