Mercurial > octave
diff scripts/ode/ode15s.m @ 26894:ee6300e77c92
Update detection of sundials in the build system (bug #52475).
* m4/acnclude.m4 : check for sunlinsol_klu.h and sunlinsol_dense.h
* configure.ac : update check for sundials features
* script/ode/ode15i.m : update conditionals in tests
* script/ode/ode15s.m : update conditionals in tests
* libinterp/dldfcn/__ode15__.cc : udate conditionals in preprocessor directives
| author | Carlo de Falco <carlo.defalco@polimi.it> |
|---|---|
| date | Fri, 15 Feb 2019 12:35:15 +0100 |
| parents | 00f796120a6d |
| children | b442ec6dda5c |
line wrap: on
line diff
--- a/scripts/ode/ode15s.m Fri Feb 15 12:24:28 2019 +0100 +++ b/scripts/ode/ode15s.m Fri Feb 15 12:35:15 2019 +0100 @@ -545,21 +545,21 @@ %! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt); %! assert ([t(end), y(end,:)], frefrob, 1e-3); -%!testif HAVE_SUNDIALS_IDAKLU +%!testif HAVE_SUNDIALS_SUNLINSOL_KLU %! opt = odeset ("MStateDependence", "none", %! "Mass", [1, 0, 0; 0, 1, 0; 0, 0, 0], %! "Jacobian", @jacfunsparse); %! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt); %! assert ([t(end), y(end,:)], frefrob, 1e-3); -%!testif HAVE_SUNDIALS_IDAKLU +%!testif HAVE_SUNDIALS_SUNLINSOL_KLU %! opt = odeset ("MStateDependence", "none", %! "Mass", sparse ([1, 0, 0; 0, 1, 0; 0, 0, 0]), %! "Jacobian", @jacfunsparse); %! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt); %! assert ([t(end), y(end,:)], frefrob, 1e-3); -%!testif HAVE_SUNDIALS_IDAKLU +%!testif HAVE_SUNDIALS_SUNLINSOL_KLU %! warning ("off", "ode15s:mass_state_dependent_provided", "local"); %! opt = odeset ("MStateDependence", "none", %! "Mass", @massdensefunstate, @@ -575,14 +575,14 @@ %! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt); %! assert ([t(end), y(end,:)], frefrob, 1e-3); -%!testif HAVE_SUNDIALS_IDAKLU +%!testif HAVE_SUNDIALS_SUNLINSOL_KLU %! opt = odeset ("MStateDependence", "none", %! "Mass", @massdensefuntime, %! "Jacobian", @jacfunsparse); %! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt); %! assert ([t(end), y(end,:)], frefrob, 1e-3); -%!testif HAVE_SUNDIALS_IDAKLU +%!testif HAVE_SUNDIALS_SUNLINSOL_KLU %! opt = odeset ("MStateDependence", "none", %! "Mass", @masssparsefuntime, %! "Jacobian", @jacfunsparse);