Merge commit 'bundle/olesenm' into home

This commit is contained in:
Mark Olesen
2009-10-19 19:47:45 +02:00
153 changed files with 960 additions and 508 deletions

View File

@ -43,7 +43,7 @@ Description
#include "cellShape.H"
#include "cellModeller.H"
#include "mergePoints.H"
#include "mathConstants.H"
#include "mathematicalConstants.H"
using namespace Foam;
@ -128,7 +128,7 @@ int main(int argc, char *argv[])
fileName pointsFile(runTime.constantPath()/"points.tmp");
OFstream pFile(pointsFile);
scalar a(0.1*constant::math::pi/180.0);
scalar a(degToRad(0.1));
tensor rotateZ =
tensor
(

View File

@ -26,22 +26,33 @@ solidBodyMotionFvMeshCoeffs
// Table rotating in z axis
rotatingTable
{
solidBodyMotionFunction rotationMotion;
rotationMotionCoeffs
solidBodyMotionFunction rotatingMotion;
rotatingMotionCoeffs
{
CofG (0 0.1 0);
radialVelocity (0 0 360); // degrees/s
}
}
// Box rotates on rotating table
//// Box rotates on rotating table
//rotatingBox
//{
// solidBodyMotionFunction rotatingMotion;
// rotatingMotionCoeffs
// {
// CofG (0 0 0);
// radialVelocity (720 0 0); // degrees/s
// }
//}
// Tube rocking on rotating table
rotatingBox
{
solidBodyMotionFunction rotationMotion;
rotationMotionCoeffs
solidBodyMotionFunction oscillatingRotatingMotion;
oscillatingRotatingMotionCoeffs
{
CofG (0 0 0);
radialVelocity (720 0 0); // degrees/s
omega 40; // rad/s
amplitude (45 0 0); // 45 degrees max tilt
}
}
}

View File

@ -15,8 +15,6 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
libs ("libOpenFOAM.so" "libmySolidBodyMotionFunctions.so");
application interDyMFoam;
startFrom startTime;

View File

@ -24,7 +24,7 @@ regions
(
boxToCell
{
box ( -100 -100 -100 ) ( 100 -0.02 100);
box ( -100 -100 -100 ) ( 100 100 -0.0025);
fieldValues ( volScalarFieldValue alpha1 1 );
}
);