[io] mechanics_run: self.log arguments + start & end hooks
@@ -1802,7 +1802,8 @@ class MechanicsHdf5Runner(siconos.io.mechanics_hdf5.MechanicsHdf5):
self.log(s.updateState, with_timer)();
if (not isNewtonConverge) and (newtonNbIterations <newtonMaxIteration):
self.log(s.updateOutput, with_timer)()
- isNewtonConverge = self.log(s.newtonCheckConvergence,with_timer)(newtonTolerance)
+ isNewtonConverge = self.log(s.newtonCheckConvergence, with_timer)
+ (newtonTolerance)
if s.displayNewtonConvergence():
s.displayNewtonConvergenceInTheLoop();
if (not isNewtonConverge) and (not info):
@@ -2152,15 +2153,15 @@ class MechanicsHdf5Runner(siconos.io.mechanics_hdf5.MechanicsHdf5):
if verbose_progress:
self.print_verbose('step', k, 'of', k0 + int((T - t0) / h)-1)
- if self._start_run_iteration_hook is not None:
- self.log(self._start_run_iteration_hook(self))
+ if start_run_iteration_hook is not None:
+ self.log(start_run_iteration_hook, with_timer)(self)
- self.log(self.import_births(body_class=body_class,
- shape_class=shape_class,
- face_class=face_class,
- edge_class=edge_class))
+ self.log(self.import_births, with_timer)(body_class,
+ shape_class,
+ face_class,
+ edge_class)
- self.log(self.execute_deaths())
+ self.log(self.execute_deaths, with_timer)()
if controller is not None:
controller.step()
@@ -2252,8 +2253,8 @@ class MechanicsHdf5Runner(siconos.io.mechanics_hdf5.MechanicsHdf5):
return False
self.log(simulation.nextStep, with_timer)()
- if self._end_run_iteration_hook is not None:
- self.log(self._end_run_iteration_hook(self))
+ if end_run_iteration_hook is not None:
+ self.log(end_run_iteration_hook, with_timer) (self)
self.print_verbose ('')
k += 1
