Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
robotran
mbsysc
Commits
7d5afc1b
Commit
7d5afc1b
authored
Feb 15, 2021
by
Sébastien Timmermans
Browse files
[Fix] finish integrator called twice #263
parent
f46db470
Changes
8
Hide whitespace changes
Inline
Side-by-side
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_bader.c
View file @
7d5afc1b
...
...
@@ -186,5 +186,5 @@ void error_bader(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
">>DIRDYN>>
\n
"
);
mbs_msg
(
">>DIRDYN>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
">>DIRDYN>> During Bader integrator [%d]
\n
"
,
err
);
finish_bader
(
mbs_data
,
dd
);
//
finish_bader(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_custom.c
View file @
7d5afc1b
...
...
@@ -123,5 +123,5 @@ void error_custom(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
"
\t
>>Custom>>
\n
"
);
mbs_msg
(
"
\t
>>Custom>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>Custom>> During Custom integrator [%d]
\n
"
,
err
);
finish_custom
(
mbs_data
,
dd
);
//
finish_custom(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_dopri5.c
View file @
7d5afc1b
...
...
@@ -153,5 +153,5 @@ void error_dopri5(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
"
\t
>>DIRDYN>>
\n
"
);
mbs_msg
(
"
\t
>>DIRDYN>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>DIRDYN>> During Dopri 5 integrator [%d]
\n
"
,
err
);
finish_dopri5
(
mbs_data
,
dd
);
//
finish_dopri5(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_euler_explicit.c
View file @
7d5afc1b
...
...
@@ -128,7 +128,7 @@ void error_eulerEx(MbsData *mbs_data, MbsDirdyn *dd, int err)
mbs_msg
(
"
\t
>>Euler explicit>>
\n
"
);
mbs_msg
(
"
\t
>>Euler explicit>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>Euler explicit>> During time integration [%d]
\n
"
,
err
);
finish_eulerEx
(
mbs_data
,
dd
);
//
finish_eulerEx(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
...
...
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_euler_implicit.c
View file @
7d5afc1b
...
...
@@ -151,5 +151,5 @@ void error_euler_implicit(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
">>DIRDYN>>
\n
"
);
mbs_msg
(
">>DIRDYN>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
">>DIRDYN>> During Euler Implicit integrator [%d]
\n
"
,
err
);
finish_euler_implicit
(
mbs_data
,
dd
);
//
finish_euler_implicit(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_rk4.c
View file @
7d5afc1b
...
...
@@ -122,5 +122,5 @@ void error_rk4(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
"
\t
>>RK4>>
\n
"
);
mbs_msg
(
"
\t
>>RK4>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>RK4>> During RK4 integrator [%d]
\n
"
,
err
);
finish_rk4
(
mbs_data
,
dd
);
//
finish_rk4(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_rosenbrock.c
View file @
7d5afc1b
...
...
@@ -169,5 +169,5 @@ void error_rosenbrock(MbsData *mbs_data, MbsDirdyn *dd, int err)
mbs_msg
(
"
\t
>>Rosenbrock>>
\n
"
);
mbs_msg
(
"
\t
>>Rosenbrock>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>Rosenbrock>> During Rosenbrock integrator [%d]
\n
"
,
err
);
finish_rosenbrock
(
mbs_data
,
dd
);
//
finish_rosenbrock(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
MBsysC/mbs_common/mbs_numerics/mbs_integrators/mbs_w_methods.c
View file @
7d5afc1b
...
...
@@ -146,6 +146,10 @@ int loop_w_methods(double t0, double tf, MbsData *mbs_data, MbsDirdyn *mbs_dd) {
void
finish_w_methods
(
MbsData
*
mbs_data
,
MbsDirdyn
*
dd
)
{
if
(
!
dd
)
{
return
;
}
if
(
dd
->
nState
!=
0
)
{
free_dvec_0
(((
MbsDirdynWMethods
*
)
dd
->
integrator_struct
)
->
dfdx
);
...
...
@@ -180,5 +184,5 @@ void error_w_methods(MbsData *mbs_data, MbsDirdyn *dd, int err) {
mbs_msg
(
"
\t
>>DIRDYN>>
\n
"
);
mbs_msg
(
"
\t
>>DIRDYN>> Error during integration in direct dynamics at time %g s !
\n
"
,
mbs_data
->
tsim
);
mbs_msg
(
"
\t
>>DIRDYN>> During W Methods integrator [%d]
\n
"
,
err
);
finish_w_methods
(
mbs_data
,
dd
);
//
finish_w_methods(mbs_data, dd);
// already called in mbs_dirdyn_finish
}
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment