diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring b/applications/test/rigidBodyDynamics/pendulumAndSpring index 95a25c42e3..549ad3c27c 100644 --- a/applications/test/rigidBodyDynamics/pendulumAndSpring +++ b/applications/test/rigidBodyDynamics/pendulumAndSpring @@ -29,18 +29,21 @@ bodies } outline ( - (0 0.01 0) - (0.005 0.00866025 0) - (0.00866025 0.005 0) - (0.01 0 0) - (0.00866025 -0.005 0) - (0.005 -0.00866025 0) - (0 -0.01 0) - (-0.00866025 -0.005 0) - (-0.01 0 0) - (-0.00866025 0.005 0) - (-0.005 0.00866025 0) - (0 0.01 0) + (0 0.1 0) + (0.05 0.0866025 0) + (0.0866025 0.05 0) + (0.1 0 0) + (0.0866025 -0.05 0) + (0.05 -0.0866025 0) + (0 -0.1 0) + (0 -2.5 0) + (0 -0.1 0) + (-0.05 -0.0866025 0) + (-0.0866025 -0.05 0) + (-0.1 0 0) + (-0.0866025 0.05 0) + (-0.05 0.0866025 0) + (0 0.1 0) ); } @@ -52,21 +55,27 @@ bodies radius 0.01; centreOfMass (0 0 0); transform (1 0 0 0 1 0 0 0 1) (0 -5 0); - mergeWith M; + joint + { + type rigid; + } outline ( - (0 0.01 0) - (0.005 0.00866025 0) - (0.00866025 0.005 0) - (0.01 0 0) - (0.00866025 -0.005 0) - (0.005 -0.00866025 0) - (0 -0.01 0) - (-0.00866025 -0.005 0) - (-0.01 0 0) - (-0.00866025 0.005 0) - (-0.005 0.00866025 0) - (0 0.01 0) + (0 2.5 0) + (0 0.1 0) + (0.05 0.0866025 0) + (0.0866025 0.05 0) + (0.1 0 0) + (0.0866025 -0.05 0) + (0.05 -0.0866025 0) + (0 -0.1 0) + (-0.05 -0.0866025 0) + (-0.0866025 -0.05 0) + (-0.1 0 0) + (-0.0866025 0.05 0) + (-0.05 0.0866025 0) + (0 0.1 0) + (0 2.5 0) ); } } diff --git a/applications/test/rigidBodyDynamics/pendulumAndSpring.gnuplot b/applications/test/rigidBodyDynamics/pendulumAndSpring.gnuplot index a2ccba71da..8d89820ba9 100644 --- a/applications/test/rigidBodyDynamics/pendulumAndSpring.gnuplot +++ b/applications/test/rigidBodyDynamics/pendulumAndSpring.gnuplot @@ -2,7 +2,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | Website: https://openfoam.org -# \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation +# \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation # \\/ M anipulation | #------------------------------------------------------------------------------ # License @@ -48,6 +48,6 @@ set output "pendulumAndSpring.eps" plot \ "pendulumAndSpring.dat" u 1:2 w l t "x", \ - "pendulumAndSpring.dat" u 1:(57.29578*$2) w l axes x1y2 t "omega" + "pendulumAndSpring.dat" u 1:(180/pi*$3) w l axes x1y2 t "omega" #------------------------------------------------------------------------------