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

sixDoFRigidBodyMotion: remove the constraint and restraint "Coeffs"

Browse Source 
sub-dict and put the coefficients in the containing dictionary.
This commit is contained in:
Henry
2013-12-15 22:30:52 +00:00
parent d57f983401
commit 8af82f02bf
11 changed files with 58 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/constraints/sixDoFRigidBodyMotionConstraint/sixDoFRigidBodyMotionConstraint.C
View File

@ -43,14 +43,7 @@ Foam::sixDoFRigidBodyMotionConstraint::sixDoFRigidBodyMotionConstraint
)
:
name_(name),
sDoFRBMCCoeffs_
(
sDoFRBMCDict.subDict
(
word(sDoFRBMCDict.lookup("sixDoFRigidBodyMotionConstraint"))
+ "Coeffs"
)
)
sDoFRBMCCoeffs_(sDoFRBMCDict)
{}
@ -67,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionConstraint::read
const dictionary& sDoFRBMCDict
)
{
sDoFRBMCCoeffs_ = sDoFRBMCDict.subDict(type() + "Coeffs");
sDoFRBMCCoeffs_ = sDoFRBMCDict;
return true;
}

16
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/sixDoFRigidBodyMotionRestraint/sixDoFRigidBodyMotionRestraint.C
View File

@ -29,9 +29,8 @@ License
namespace Foam
{
defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
defineTypeNameAndDebug(sixDoFRigidBodyMotionRestraint, 0);
defineRunTimeSelectionTable(sixDoFRigidBodyMotionRestraint, dictionary);
}
@ -44,14 +43,7 @@ Foam::sixDoFRigidBodyMotionRestraint::sixDoFRigidBodyMotionRestraint
)
:
name_(name),
sDoFRBMRCoeffs_
(
sDoFRBMRDict.subDict
(
word(sDoFRBMRDict.lookup("sixDoFRigidBodyMotionRestraint"))
+ "Coeffs"
)
)
sDoFRBMRCoeffs_(sDoFRBMRDict)
{}
@ -68,7 +60,7 @@ bool Foam::sixDoFRigidBodyMotionRestraint::read
const dictionary& sDoFRBMRDict
)
{
sDoFRBMRCoeffs_ = sDoFRBMRDict.subDict(type() + "Coeffs");
sDoFRBMRCoeffs_ = sDoFRBMRDict;
return true;
}

2
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C
View File

@ -151,7 +151,7 @@ Foam::sixDoFRigidBodyMotion::sixDoFRigidBodyMotion
dict.lookupOrDefault
(
"initialOrientation",
dict.lookupOrDefault("orientation", I)
dict.lookupOrDefault("orientation", tensor::I)
)
),
momentOfInertia_(dict.lookup("momentOfInertia")),

2
src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotionState.C
View File

@ -63,7 +63,7 @@ Foam::sixDoFRigidBodyMotionState::sixDoFRigidBodyMotionState
)
:
centreOfMass_(dict.lookup("centreOfMass")),
Q_(dict.lookupOrDefault("orientation", tensor(I))),
Q_(dict.lookupOrDefault("orientation", tensor::I)),
v_(dict.lookupOrDefault("velocity", vector::zero)),
a_(dict.lookupOrDefault("acceleration", vector::zero)),
pi_(dict.lookupOrDefault("angularMomentum", vector::zero)),

16
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/0.org/pointDisplacement
View File

@ -50,22 +50,16 @@ boundaryField
sixDoFRigidBodyMotionConstraint fixedLine;
tolerance 1e-9;
relaxationFactor 0.7;
fixedLineCoeffs
{
refPoint (0.25 0.007 0.125);
direction (0 1 0);
}
}
fixedAxis1
{
sixDoFRigidBodyMotionConstraint fixedAxis;
tolerance 1e-06;
relaxationFactor 0.7;
fixedAxisCoeffs
{
axis ( 0 0 1 );
}
axis (0 0 1);
}
}
restraints
@ -73,29 +67,21 @@ boundaryField
verticalSpring
{
sixDoFRigidBodyMotionRestraint linearSpring;
linearSpringCoeffs
{
anchor (0.25 0.007 0.125);
refAttachmentPt (0.25 0.007 0.125);
stiffness 4000;
damping 2;
restLength 0;
}
}
axialSpring
{
sixDoFRigidBodyMotionRestraint linearAxialAngularSpring;
linearAxialAngularSpringCoeffs
{
axis (0 0 1);
stiffness 700;
damping 0.5;
referenceOrientation $orientation;
}
}
}
value uniform (0 0 0);
}

2
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/dynamicMeshDict
View File

@ -16,7 +16,7 @@ FoamFile
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ("libfvMotionSolvers.so");
motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so");
solver displacementLaplacian;

19
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary
View File

@ -21,37 +21,40 @@ FoamFile
{
type patch;
nFaces 72;
startFace 25168;
startFace 22911;
}
inlet
{
type patch;
nFaces 40;
startFace 25240;
startFace 22983;
}
outlet
{
type patch;
nFaces 62;
startFace 25280;
startFace 23023;
}
front
{
type empty;
nFaces 12559;
startFace 25342;
inGroups 1(empty);
nFaces 11431;
startFace 23085;
}
back
{
type empty;
nFaces 12559;
startFace 37901;
inGroups 1(empty);
nFaces 11431;
startFace 34516;
}
wing
{
type wall;
inGroups 1(wall);
nFaces 378;
startFace 50460;
startFace 45947;
}
)

19
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary
View File

@ -21,37 +21,40 @@ FoamFile
{
type patch;
nFaces 72;
startFace 25168;
startFace 22911;
}
inlet
{
type patch;
nFaces 40;
startFace 25240;
startFace 22983;
}
outlet
{
type patch;
nFaces 62;
startFace 25280;
startFace 23023;
}
front
{
type empty;
nFaces 12559;
startFace 25342;
inGroups 1(empty);
nFaces 11431;
startFace 23085;
}
back
{
type empty;
nFaces 12559;
startFace 37901;
inGroups 1(empty);
nFaces 11431;
startFace 34516;
}
wing
{
type wall;
inGroups 1(wall);
nFaces 378;
startFace 50460;
startFace 45947;
}
)

8
tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/0.org/pointDisplacement
View File

@ -33,7 +33,6 @@ boundaryField
momentOfInertia (0.1052 0.1052 0.1778);
mass 9.6;
velocity (0 0 0);
orientation (1 0 0 0 1 0 0 0 1);
acceleration (0 0 0);
angularMomentum (0 0 0);
torque (0 0 0);
@ -46,8 +45,6 @@ boundaryField
{
sixDoFRigidBodyMotionRestraint linearSpring;
linearSpringCoeffs
{
anchor (0.5 0.5 1);
refAttachmentPt $centreOfMass;
stiffness 5000;
@ -55,7 +52,6 @@ boundaryField
restLength 0.4;
}
}
}
constraints
{
maxIterations 500;
@ -65,7 +61,6 @@ boundaryField
sixDoFRigidBodyMotionConstraint fixedOrientation;
tolerance 1e-6;
relaxationFactor 1.0;
fixedOrientationCoeffs {}
}
fixedLine1
@ -73,13 +68,10 @@ boundaryField
sixDoFRigidBodyMotionConstraint fixedLine;
tolerance 1e-6;
relaxationFactor 1.0;
fixedLineCoeffs
{
refPoint $centreOfMass;
direction (0 0 1);
}
}
}
value uniform (0 0 0);
}
}

2
tutorials/mesh/moveDynamicMesh/simpleHarmonicMotion/constant/dynamicMeshDict
View File

@ -16,7 +16,7 @@ FoamFile
dynamicFvMesh dynamicMotionSolverFvMesh;
motionSolverLibs ("libfvMotionSolvers.so");
motionSolverLibs ("libfvMotionSolvers.so" "libsixDoFRigidBodyMotion.so");
solver displacementLaplacian;

2
tutorials/multiphase/interDyMFoam/ras/floatingObject/constant/polyMesh/boundary
View File

@ -20,6 +20,7 @@ FoamFile
stationaryWalls
{
type wall;
inGroups 1(wall);
nFaces 11200;
startFace 277808;
}
@ -32,6 +33,7 @@ FoamFile
floatingObject
{
type wall;
inGroups 1(wall);
nFaces 672;
startFace 290608;
}