Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 324b13ee authored by SOLIMAN Sylvain's avatar SOLIMAN Sylvain

Merge branch 'hotfix/smooth_curves'

parents 89a3c0af 7670830b
......@@ -8,7 +8,7 @@
about/0
]).
version('4.1.2').
version('4.1.3').
copyright(
'Copyright (C) 2003-2018 Inria, EPI Lifeware, Saclay-Île de France, France'
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -16,7 +16,7 @@ init_gsl_solver(
struct gsl_solver *solver, const struct gsl_solver_config *config)
{
const gsl_odeiv2_step_type *method = config->method;
int variable_count = config->variable_count;
size_t variable_count = config->variable_count;
double *p = (double *) xcalloc(config->parameter_count, sizeof(double));
gsl_odeiv2_system sys = {functions, jacobian, variable_count, p};
solver->sys = sys;
......@@ -86,7 +86,8 @@ gsl_solver_step(struct gsl_solver_state *state)
if (t >= config->time_final) {
return false;
}
t_upper = config->time_final;
// hmax not enough to ensure steps smaller than hmax
t_upper = std::min(config->time_final, t + solver->d->hmax);
events(state, &t_upper);
if (t_upper < t + config->initial_step_size) {
t_upper = t + config->initial_step_size;
......
......@@ -10,7 +10,7 @@
struct gsl_solver_config {
int variable_count;
size_t variable_count;
int parameter_count;
int event_count;
const gsl_odeiv2_step_type *method;
......
......@@ -134,7 +134,7 @@ numerical_simulation :-
),
option(
maximum_step_size, number, _MaximumStepSize,
'maximum step size for the numerical solver, as a fraction of time'
'maximum step size for the numerical solver, as a fraction of the total time'
),
option(
precision, number, _Precision,
......
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