diff --git a/applications/test/rigidBodyDynamics/pendulum/Make/files b/applications/test/rigidBodyDynamics/pendulum/Make/files index f860e98af4412b07740c76a8de34ad440476f195..471ba2b584fe4fa8c8ab39f785dd6ba314a7a255 100644 --- a/applications/test/rigidBodyDynamics/pendulum/Make/files +++ b/applications/test/rigidBodyDynamics/pendulum/Make/files @@ -1,3 +1,3 @@ pendulum.C -EXE = $(FOAM_USER_APPBIN)/pendulum +EXE = $(FOAM_USER_APPBIN)/Test-pendulum diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum b/applications/test/rigidBodyDynamics/pendulum/pendulum index 75d1a1706c825fe69791daafcf7865edc1b5c9e6..d179af4438547ee888802d8074f94b04aeedbad3 100644 --- a/applications/test/rigidBodyDynamics/pendulum/pendulum +++ b/applications/test/rigidBodyDynamics/pendulum/pendulum @@ -1,4 +1,4 @@ -bodies +bodies0 { pendulum { @@ -15,7 +15,7 @@ bodies } } -bodies0 +bodies { hinge { diff --git a/applications/test/rigidBodyDynamics/pendulum/pendulum.C b/applications/test/rigidBodyDynamics/pendulum/pendulum.C index 49af5cbdd6b988d677dbfc25c25a0acd089ff355..18626cba7cee5c4ae25faa40b9a18fb5ca26e288 100644 --- a/applications/test/rigidBodyDynamics/pendulum/pendulum.C +++ b/applications/test/rigidBodyDynamics/pendulum/pendulum.C @@ -81,16 +81,15 @@ int main(int argc, char *argv[]) */ // Create the pendulum model from dictionary - rigidBodyModel pendulum1(dictionary(IFstream("pendulum")())); - rigidBodyModel pendulum = pendulum1; + rigidBodyModel pendulum(dictionary(IFstream("pendulum")())); Info<< pendulum << endl; // Create the joint-space state fields scalarField q(pendulum.nDoF(), Zero); scalarField w(pendulum.nw(), Zero); - scalarField qdot(pendulum.nDoF(), Zero); - scalarField qddot(pendulum.nDoF(), Zero); + scalarField qDot(pendulum.nDoF(), Zero); + scalarField qDdot(pendulum.nDoF(), Zero); scalarField tau(pendulum.nDoF(), Zero); // Set the angle of the pendulum to 0.3rad @@ -104,20 +103,20 @@ int main(int argc, char *argv[]) scalar deltaT = 0.01; for (scalar t=0; t<4.1; t+=deltaT) { - qdot += 0.5*deltaT*qddot; - q += deltaT*qdot; + qDot += 0.5*deltaT*qDdot; + q += deltaT*qDot; pendulum.forwardDynamics ( q, w, - qdot, + qDot, tau, Field<spatialVector>(), - qddot + qDdot ); - qdot += 0.5*deltaT*qddot; + qDot += 0.5*deltaT*qDdot; Info<< "Time " << t << "s, angle = " << q[0] << "rad" << endl; }