Commit c700fdf7 authored by Nicolas Docquier's avatar Nicolas Docquier
Browse files

Merge branch 'HotFix_issues_264_and_265' into 'master'

Saving buffer to disk, merging in master

See merge request robotran/mbsysc!417
parents f63e41db c838343c
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
* To be defined * To be defined
## Robotran v1.16.1
* [Py][Fix] The results are now saved to disk when an error is detected during direct dynamic integration.
* [Py][partitioning] The option _visualise_ is set to False by default as it is currently not working.
## Robotran v1.16.0 ## Robotran v1.16.0
......
...@@ -317,9 +317,9 @@ class MbsDirdyn(object): ...@@ -317,9 +317,9 @@ class MbsDirdyn(object):
name = bytes_to_str(self.mbs_dirdyn_ptr.contents.user_buffer.contents.names[i]) name = bytes_to_str(self.mbs_dirdyn_ptr.contents.user_buffer.contents.names[i])
self.results.outputs[name] = user_out[0] self.results.outputs[name] = user_out[0]
if (error >= 0): error_finish = libmodules.mbs_dirdyn_finish(self.mbs_dirdyn_ptr, self.mbs.mbs_data_ptr)
libmodules.mbs_dirdyn_finish(self.mbs_dirdyn_ptr, self.mbs.mbs_data_ptr)
if (error >= 0 and error_finish >= 0):
if self.get_options("save2file") and not results_loaded: if self.get_options("save2file") and not results_loaded:
mbs_msg("The beginning of the integration is not available in the buffer.\n" mbs_msg("The beginning of the integration is not available in the buffer.\n"
"The complete results are loaded from files.\n") "The complete results are loaded from files.\n")
......
...@@ -91,9 +91,6 @@ class MbsPart(object): ...@@ -91,9 +91,6 @@ class MbsPart(object):
self.mbs = mbs self.mbs = mbs
# Setting options with different default values in MBsysPy
self.set_options(visualise=1)
# Path to user function used by partitionning modue # Path to user function used by partitionning modue
self.user_path = self.mbs.user_path self.user_path = self.mbs.user_path
if user_path is not None: if user_path is not None:
...@@ -246,9 +243,10 @@ class MbsPart(object): ...@@ -246,9 +243,10 @@ class MbsPart(object):
1 to allow line permutation, 0 to forbid it. 1 to allow line permutation, 0 to forbid it.
defaut is 0 defaut is 0
visualise: int visualise: int
Currently not working for MBsysPy.
In case of loop closure failing, set to 1 to plot the closing In case of loop closure failing, set to 1 to plot the closing
procedure iterations. procedure iterations.
defaut is 1 defaut is 0
drivers: int drivers: int
Unused but 1 stand for yes, 0 for no. Unused but 1 stand for yes, 0 for no.
defaut is 0 defaut is 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment