Mercurial > octave
annotate libinterp/dldfcn/__ode15__.cc @ 29958:32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
* mk-opts.pl: Surround emitted function definitions with
OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END tags.
* mk-builtins.pl: Surround emitted function declarations with
OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END tags. Emit deprecated
global inline functions.
* __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc,
amd.cc, balance.cc, besselj.cc, bitfcns.cc, bsxfun.cc, call-stack.cc,
ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc,
daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc,
defun.cc, det.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc,
dot.cc, eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc,
fcn-info.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gsvd.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc,
interpreter.cc, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc,
load-path.cc, load-save.cc, lookup.cc, ls-oct-text.cc, lsode.cc,
lu.cc, mappers.cc, matrix_type.cc, max.cc, mgorth.cc, nproc.cc,
oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pinv.cc, pr-flt-fmt.cc,
pr-output.cc, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc,
rcond.cc, regexp.cc, schur.cc, settings.cc, sighandlers.cc, sparse.cc,
spparms.cc, sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc,
sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, symrcm.cc, symtab.cc,
syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc,
typecast.cc, urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc,
__fltk_uigetfile__.cc, __glpk__.cc, __init_gnuplot__.cc, __ode15__.cc,
__voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc,
gzip.cc, ov-base.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-null-mat.cc,
ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc,
octave.cc, lex.ll, oct-parse.yy, profiler.cc, pt-eval.cc: Surround
DEFUN and DEFMETHOD function defnitions with OCTAVE_NAMESPACE_BEGIN
and OCTAVE_NAMESPACE_END tags.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 13 Aug 2021 21:53:51 -0400 |
parents | b5f3ae7610cf |
children | 939bef0b66e0 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
29358
0a5b15007766
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27932
diff
changeset
|
3 // Copyright (C) 2016-2021 The Octave Project Developers |
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
25 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
27 # include "config.h" |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
28 #endif |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
29 |
22911
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
30 #include "dColVector.h" |
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
31 #include "dMatrix.h" |
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
32 #include "dSparse.h" |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
33 #include "f77-fcn.h" |
28849
8b0675c2cfe0
Add functions to check for integer overflow on multiplication (bug #59094).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28741
diff
changeset
|
34 #include "lo-utils.h" |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
35 |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
23022
diff
changeset
|
36 #include "Cell.h" |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
37 #include "defun-dld.h" |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
38 #include "error.h" |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
23022
diff
changeset
|
39 #include "errwarn.h" |
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
23022
diff
changeset
|
40 #include "oct-map.h" |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
41 #include "ov.h" |
23024
a6a7b054e4ba
Rationalize #includes in libinterp/dldfcn directory.
Rik <rik@octave.org>
parents:
23022
diff
changeset
|
42 #include "ovl.h" |
26000
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
43 #include "pager.h" |
22911
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
44 #include "parse.h" |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
45 |
22911
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
46 #if defined (HAVE_SUNDIALS) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
47 |
26898
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
48 # if defined (HAVE_NVECTOR_NVECTOR_SERIAL_H) |
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
49 # include <nvector/nvector_serial.h> |
25098
5dce8aa80652
configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475)
Mike Miller <mtmiller@octave.org>
parents:
25054
diff
changeset
|
50 # endif |
5dce8aa80652
configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475)
Mike Miller <mtmiller@octave.org>
parents:
25054
diff
changeset
|
51 |
26898
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
52 # if defined (HAVE_IDA_IDA_H) |
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
53 # include <ida/ida.h> |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
54 # elif defined (HAVE_IDA_H) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
55 # include <ida.h> |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
56 # endif |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
57 # if defined (HAVE_IDA_IDA_DIRECT_H) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
58 # include <ida/ida_direct.h> |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
59 # elif defined (HAVE_IDA_DIRECT_H) |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
60 # include <ida_direct.h> |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
61 # endif |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
62 |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
63 # if defined (HAVE_SUNLINSOL_SUNLINSOL_DENSE_H) |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
64 # include <sunlinsol/sunlinsol_dense.h> |
23022
305cdc1d444b
* __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing.
John W. Eaton <jwe@octave.org>
parents:
22919
diff
changeset
|
65 # endif |
305cdc1d444b
* __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing.
John W. Eaton <jwe@octave.org>
parents:
22919
diff
changeset
|
66 |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
67 # if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H) |
26895
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
68 # if defined (HAVE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
69 # include <klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
70 # endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
71 # if defined (HAVE_KLU_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
72 # include <klu/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
73 # endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
74 # if defined (HAVE_SUITESPARSE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
75 # include <suitesparse/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
76 # endif |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
77 # if defined (HAVE_UFPARSE_KLU_H) |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
78 # include <ufsparse/klu.h> |
a1acd11bad19
Directly include klu.h in __ode15__.cc (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26894
diff
changeset
|
79 # endif |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
80 # include <sunlinsol/sunlinsol_klu.h> |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
81 # endif |
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
82 |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
83 namespace octave |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
84 { |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
85 # if ! defined (HAVE_IDASETJACFN) && defined (HAVE_IDADLSSETJACFN) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
86 static inline int |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
87 IDASetJacFn (void *ida_mem, IDADlsJacFn jac) |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
88 { |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
89 return IDADlsSetJacFn (ida_mem, jac); |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
90 } |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
91 # endif |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
92 |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
93 # if ! defined (HAVE_IDASETLINEARSOLVER) && defined (HAVE_IDADLSSETLINEARSOLVER) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
94 static inline int |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
95 IDASetLinearSolver (void *ida_mem, SUNLinearSolver LS, SUNMatrix A) |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
96 { |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
97 return IDADlsSetLinearSolver (ida_mem, LS, A); |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
98 } |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
99 # endif |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
100 |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
101 # if ! defined (HAVE_SUNLINSOL_DENSE) && defined (HAVE_SUNDENSELINEARSOLVER) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
102 static inline SUNLinearSolver |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
103 SUNLinSol_Dense (N_Vector y, SUNMatrix A) |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
104 { |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
105 return SUNDenseLinearSolver (y, A); |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
106 } |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
107 # endif |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
108 |
26909
5042a568771a
don't disable all of sundials if including sunlinsol_klu.h fails (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26907
diff
changeset
|
109 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU) |
5042a568771a
don't disable all of sundials if including sunlinsol_klu.h fails (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26907
diff
changeset
|
110 # if ! defined (HAVE_SUNLINSOL_KLU) && defined (HAVE_SUNKLU) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
111 static inline SUNLinearSolver |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
112 SUNLinSol_KLU (N_Vector y, SUNMatrix A) |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
113 { |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
114 return SUNKLU (y, A); |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
115 } |
26909
5042a568771a
don't disable all of sundials if including sunlinsol_klu.h fails (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26907
diff
changeset
|
116 # endif |
26903
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
117 # endif |
73b141d5a888
improve configure checks for sundials (bug #55911)
John W. Eaton <jwe@octave.org>
parents:
26898
diff
changeset
|
118 |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
119 static inline realtype * |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
120 nv_data_s (N_Vector& v) |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
121 { |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
122 # if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
123 // Disable warning from GCC about old-style casts in Sundials |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
124 // macro expansions. Do this in a function so that this |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
125 // diagnostic may still be enabled for the rest of the file. |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
126 # pragma GCC diagnostic push |
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
127 # pragma GCC diagnostic ignored "-Wold-style-cast" |
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
128 # endif |
22915
7766e3ef6c69
* __ode15__.cc: Avoid old-style cast warnings.
John W. Eaton <jwe@octave.org>
parents:
22914
diff
changeset
|
129 |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
130 return NV_DATA_S (v); |
23085
dffa2b8c9482
maint: strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
23075
diff
changeset
|
131 |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
132 # if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC) |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
133 // Restore prevailing warning state for remainder of the file. |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
134 # pragma GCC diagnostic pop |
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
135 # endif |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26909
diff
changeset
|
136 } |
22915
7766e3ef6c69
* __ode15__.cc: Avoid old-style cast warnings.
John W. Eaton <jwe@octave.org>
parents:
22914
diff
changeset
|
137 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
138 class IDA |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
139 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
140 public: |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
141 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
142 typedef |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
143 ColumnVector (*DAERHSFuncIDA) (const ColumnVector& x, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
144 const ColumnVector& xdot, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
145 realtype t, const octave_value& idaf); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
146 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
147 typedef |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
148 Matrix (*DAEJacFuncDense) (const ColumnVector& x, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
149 const ColumnVector& xdot, realtype t, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
150 realtype cj, const octave_value& idaj); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
151 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
152 typedef |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
153 SparseMatrix (*DAEJacFuncSparse) (const ColumnVector& x, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
154 const ColumnVector& xdot, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
155 realtype t, realtype cj, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
156 const octave_value& idaj); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
157 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
158 typedef |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
159 Matrix (*DAEJacCellDense) (Matrix *dfdy, Matrix *dfdyp, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
160 realtype cj); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
161 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
162 typedef |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
163 SparseMatrix (*DAEJacCellSparse) (SparseMatrix *dfdy, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
164 SparseMatrix *dfdyp, realtype cj); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
165 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
166 //Default |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
167 IDA (void) |
27182 | 168 : m_t0 (0.0), m_y0 (), m_yp0 (), m_havejac (false), m_havejacfun (false), |
169 m_havejacsparse (false), m_mem (nullptr), m_num (), m_ida_fun (), | |
170 m_ida_jac (), m_dfdy (nullptr), m_dfdyp (nullptr), m_spdfdy (nullptr), | |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
171 m_spdfdyp (nullptr), m_fun (nullptr), m_jacfun (nullptr), |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
172 m_jacspfun (nullptr), m_jacdcell (nullptr), m_jacspcell (nullptr), |
27182 | 173 m_sunJacMatrix (nullptr), m_sunLinearSolver (nullptr) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
174 { } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
175 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
176 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
177 IDA (realtype t, ColumnVector y, ColumnVector yp, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
178 const octave_value& ida_fcn, DAERHSFuncIDA daefun) |
27182 | 179 : m_t0 (t), m_y0 (y), m_yp0 (yp), m_havejac (false), m_havejacfun (false), |
180 m_havejacsparse (false), m_mem (nullptr), m_num (), m_ida_fun (ida_fcn), | |
181 m_ida_jac (), m_dfdy (nullptr), m_dfdyp (nullptr), m_spdfdy (nullptr), | |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
182 m_spdfdyp (nullptr), m_fun (daefun), m_jacfun (nullptr), |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
183 m_jacspfun (nullptr), m_jacdcell (nullptr), m_jacspcell (nullptr), |
27182 | 184 m_sunJacMatrix (nullptr), m_sunLinearSolver (nullptr) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
185 { } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
186 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
187 |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
188 ~IDA (void) |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
189 { |
27182 | 190 IDAFree (&m_mem); |
191 SUNLinSolFree (m_sunLinearSolver); | |
192 SUNMatDestroy (m_sunJacMatrix); | |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
193 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
194 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
195 IDA& |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
196 set_jacobian (const octave_value& jac, DAEJacFuncDense j) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
197 { |
27182 | 198 m_jacfun = j; |
199 m_ida_jac = jac; | |
200 m_havejac = true; | |
201 m_havejacfun = true; | |
202 m_havejacsparse = false; | |
203 | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
204 return *this; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
205 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
206 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
207 IDA& |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
208 set_jacobian (const octave_value& jac, DAEJacFuncSparse j) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
209 { |
27182 | 210 m_jacspfun = j; |
211 m_ida_jac = jac; | |
212 m_havejac = true; | |
213 m_havejacfun = true; | |
214 m_havejacsparse = true; | |
215 | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
216 return *this; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
217 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
218 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
219 IDA& |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
220 set_jacobian (Matrix *dy, Matrix *dyp, DAEJacCellDense j) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
221 { |
27182 | 222 m_jacdcell = j; |
223 m_dfdy = dy; | |
224 m_dfdyp = dyp; | |
225 m_havejac = true; | |
226 m_havejacfun = false; | |
227 m_havejacsparse = false; | |
228 | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
229 return *this; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
230 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
231 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
232 IDA& |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
233 set_jacobian (SparseMatrix *dy, SparseMatrix *dyp, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
234 DAEJacCellSparse j) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
235 { |
27182 | 236 m_jacspcell = j; |
237 m_spdfdy = dy; | |
238 m_spdfdyp = dyp; | |
239 m_havejac = true; | |
240 m_havejacfun = false; | |
241 m_havejacsparse = true; | |
242 | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
243 return *this; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
244 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
245 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
246 void set_userdata (void); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
247 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
248 void initialize (void); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
249 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
250 static ColumnVector NVecToCol (N_Vector& v, octave_f77_int_type n); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
251 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
252 static N_Vector ColToNVec (const ColumnVector& data, octave_f77_int_type n); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
253 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
254 void |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
255 set_up (const ColumnVector& y); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
256 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
257 void |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
258 set_tolerance (ColumnVector& abstol, realtype reltol); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
259 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
260 void |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
261 set_tolerance (realtype abstol, realtype reltol); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
262 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
263 static int |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
264 resfun (realtype t, N_Vector yy, N_Vector yyp, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
265 N_Vector rr, void *user_data); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
266 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
267 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
268 resfun_impl (realtype t, N_Vector& yy, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
269 N_Vector& yyp, N_Vector& rr); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
270 static int |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
271 jacdense (realtype t, realtype cj, N_Vector yy, N_Vector yyp, |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
272 N_Vector, SUNMatrix JJ, void *user_data, N_Vector, |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
273 N_Vector, N_Vector) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
274 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
275 IDA *self = static_cast <IDA *> (user_data); |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
276 self->jacdense_impl (t, cj, yy, yyp, JJ); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
277 return 0; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
278 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
279 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
280 void |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
281 jacdense_impl (realtype t, realtype cj, |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
282 N_Vector& yy, N_Vector& yyp, SUNMatrix& JJ); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
283 |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
284 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
285 static int |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
286 jacsparse (realtype t, realtype cj, N_Vector yy, N_Vector yyp, |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
287 N_Vector, SUNMatrix Jac, void *user_data, N_Vector, |
22914
b7ffd93b8d06
* __ode15__.cc: Avoid unused parameter warnings.
John W. Eaton <jwe@octave.org>
parents:
22913
diff
changeset
|
288 N_Vector, N_Vector) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
289 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
290 IDA *self = static_cast <IDA *> (user_data); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
291 self->jacsparse_impl (t, cj, yy, yyp, Jac); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
292 return 0; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
293 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
294 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
295 void |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
296 jacsparse_impl (realtype t, realtype cj, |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
297 N_Vector& yy, N_Vector& yyp, SUNMatrix& Jac); |
26898
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
298 # endif |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
299 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
300 void set_maxstep (realtype maxstep); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
301 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
302 void set_initialstep (realtype initialstep); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
303 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
304 bool |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
305 interpolate (octave_idx_type& cont, Matrix& output, ColumnVector& tout, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
306 int refine, realtype tend, bool haveoutputfcn, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
307 bool haveoutputsel, const octave_value& output_fcn, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
308 ColumnVector& outputsel, bool haveeventfunction, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
309 const octave_value& event_fcn, ColumnVector& te, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
310 Matrix& ye, ColumnVector& ie, ColumnVector& oldval, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
311 ColumnVector& oldisterminal, ColumnVector& olddir, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
312 octave_idx_type& temp, ColumnVector& yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
313 const octave_idx_type num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
314 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
315 bool |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
316 outputfun (const octave_value& output_fcn, bool haveoutputsel, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
317 const ColumnVector& output, realtype tout, realtype tend, |
22918
0b5d9978d7b1
* __ode15__.cc: Pass std::string arg by const reference.
John W. Eaton <jwe@octave.org>
parents:
22917
diff
changeset
|
318 ColumnVector& outputsel, const std::string& flag); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
319 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
320 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
321 bool |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
322 event (const octave_value& event_fcn, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
323 ColumnVector& te, Matrix& ye, ColumnVector& ie, |
22918
0b5d9978d7b1
* __ode15__.cc: Pass std::string arg by const reference.
John W. Eaton <jwe@octave.org>
parents:
22917
diff
changeset
|
324 realtype tsol, const ColumnVector& y, const std::string& flag, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
325 const ColumnVector& yp, ColumnVector& oldval, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
326 ColumnVector& oldisterminal, ColumnVector& olddir, |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
327 octave_idx_type cont, octave_idx_type& temp, realtype told, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
328 ColumnVector& yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
329 const octave_idx_type num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
330 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
331 void set_maxorder (int maxorder); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
332 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
333 octave_value_list |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
334 integrate (const octave_idx_type numt, const ColumnVector& tt, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
335 const ColumnVector& y0, const ColumnVector& yp0, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
336 const int refine, bool haverefine, bool haveoutputfcn, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
337 const octave_value& output_fcn, bool haveoutputsel, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
338 ColumnVector& outputsel, bool haveeventfunction, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
339 const octave_value& event_fcn, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
340 const octave_idx_type num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
341 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
342 void print_stat (void); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
343 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
344 private: |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
345 |
27182 | 346 realtype m_t0; |
347 ColumnVector m_y0; | |
348 ColumnVector m_yp0; | |
349 bool m_havejac; | |
350 bool m_havejacfun; | |
351 bool m_havejacsparse; | |
352 void *m_mem; | |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
353 octave_f77_int_type m_num; |
27182 | 354 octave_value m_ida_fun; |
355 octave_value m_ida_jac; | |
356 Matrix *m_dfdy; | |
357 Matrix *m_dfdyp; | |
358 SparseMatrix *m_spdfdy; | |
359 SparseMatrix *m_spdfdyp; | |
360 DAERHSFuncIDA m_fun; | |
361 DAEJacFuncDense m_jacfun; | |
362 DAEJacFuncSparse m_jacspfun; | |
363 DAEJacCellDense m_jacdcell; | |
364 DAEJacCellSparse m_jacspcell; | |
365 SUNMatrix m_sunJacMatrix; | |
366 SUNLinearSolver m_sunLinearSolver; | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
367 }; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
368 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
369 int |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
370 IDA::resfun (realtype t, N_Vector yy, N_Vector yyp, N_Vector rr, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
371 void *user_data) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
372 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
373 IDA *self = static_cast <IDA *> (user_data); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
374 self->resfun_impl (t, yy, yyp, rr); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
375 return 0; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
376 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
377 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
378 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
379 IDA::resfun_impl (realtype t, N_Vector& yy, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
380 N_Vector& yyp, N_Vector& rr) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
381 { |
27182 | 382 ColumnVector y = IDA::NVecToCol (yy, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
383 |
27182 | 384 ColumnVector yp = IDA::NVecToCol (yyp, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
385 |
27182 | 386 ColumnVector res = (*m_fun) (y, yp, t, m_ida_fun); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
387 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
388 realtype *puntrr = nv_data_s (rr); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
389 |
27182 | 390 for (octave_idx_type i = 0; i < m_num; i++) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
391 puntrr[i] = res(i); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
392 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
393 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
394 void |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
395 IDA::set_up (const ColumnVector& y) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
396 { |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
397 N_Vector yy = ColToNVec (y, m_num); |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
398 |
27182 | 399 if (m_havejacsparse) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
400 { |
26898
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
401 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU) |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
402 # if defined (HAVE_SUNSPARSEMATRIX_REALLOCATE) |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
403 // Initially allocate memory for 0 entries. We will reallocate when we |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
404 // get the Jacobian matrix from the user and know the actual number of |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
405 // entries. |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
406 m_sunJacMatrix = SUNSparseMatrix (m_num, m_num, 0, CSC_MAT); |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
407 # else |
29445
b5f3ae7610cf
Use gnulib macros that account for the output type in integer overflow checks.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
408 octave_f77_int_type max_elems; |
b5f3ae7610cf
Use gnulib macros that account for the output type in integer overflow checks.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
409 if (math::int_multiply_overflow (m_num, m_num, &max_elems)) |
28849
8b0675c2cfe0
Add functions to check for integer overflow on multiplication (bug #59094).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28741
diff
changeset
|
410 error ("Unable to allocate memory for sparse Jacobian"); |
8b0675c2cfe0
Add functions to check for integer overflow on multiplication (bug #59094).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28741
diff
changeset
|
411 |
29445
b5f3ae7610cf
Use gnulib macros that account for the output type in integer overflow checks.
Markus Mützel <markus.muetzel@gmx.de>
parents:
29359
diff
changeset
|
412 m_sunJacMatrix = SUNSparseMatrix (m_num, m_num, max_elems, CSC_MAT); |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
413 # endif |
27182 | 414 if (! m_sunJacMatrix) |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
415 error ("Unable to create sparse Jacobian for Sundials"); |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
416 |
27182 | 417 m_sunLinearSolver = SUNLinSol_KLU (yy, m_sunJacMatrix); |
418 if (! m_sunLinearSolver) | |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
419 error ("Unable to create KLU sparse solver"); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
420 |
27182 | 421 if (IDASetLinearSolver (m_mem, m_sunLinearSolver, m_sunJacMatrix)) |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
422 error ("Unable to set sparse linear solver"); |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
423 |
27182 | 424 IDASetJacFn (m_mem, IDA::jacsparse); |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
425 |
23022
305cdc1d444b
* __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing.
John W. Eaton <jwe@octave.org>
parents:
22919
diff
changeset
|
426 # else |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
427 error ("SUNDIALS SUNLINSOL KLU was unavailable or disabled when " |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
428 "Octave was built"); |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
429 |
23022
305cdc1d444b
* __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing.
John W. Eaton <jwe@octave.org>
parents:
22919
diff
changeset
|
430 # endif |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
431 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
432 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
433 else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
434 { |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
435 |
27182 | 436 m_sunJacMatrix = SUNDenseMatrix (m_num, m_num); |
437 if (! m_sunJacMatrix) | |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
438 error ("Unable to create dense Jacobian for Sundials"); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
439 |
27182 | 440 m_sunLinearSolver = SUNLinSol_Dense (yy, m_sunJacMatrix); |
441 if (! m_sunLinearSolver) | |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
442 error ("Unable to create dense linear solver"); |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
443 |
27182 | 444 if (IDASetLinearSolver (m_mem, m_sunLinearSolver, m_sunJacMatrix)) |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
445 error ("Unable to set dense linear solver"); |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
446 |
27182 | 447 if (m_havejac && IDASetJacFn (m_mem, IDA::jacdense) != 0) |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
448 error ("Unable to set dense Jacobian function"); |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
449 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
450 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
451 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
452 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
453 void |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
454 IDA::jacdense_impl (realtype t, realtype cj, |
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
455 N_Vector& yy, N_Vector& yyp, SUNMatrix& JJ) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
456 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
457 { |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
458 octave_f77_int_type Neq = NV_LENGTH_S (yy); |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
459 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
460 ColumnVector y = NVecToCol (yy, Neq); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
461 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
462 ColumnVector yp = NVecToCol (yyp, Neq); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
463 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
464 Matrix jac; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
465 |
27182 | 466 if (m_havejacfun) |
467 jac = (*m_jacfun) (y, yp, t, cj, m_ida_jac); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
468 else |
27182 | 469 jac = (*m_jacdcell) (m_dfdy, m_dfdyp, cj); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
470 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
471 octave_f77_int_type num_jac = to_f77_int (jac.numel ()); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
472 std::copy (jac.fortran_vec (), |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
473 jac.fortran_vec () + num_jac, |
27182 | 474 SUNDenseMatrix_Data (JJ)); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
475 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
476 |
26894
ee6300e77c92
Update detection of sundials in the build system (bug #52475).
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26893
diff
changeset
|
477 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
478 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
479 IDA::jacsparse_impl (realtype t, realtype cj, N_Vector& yy, N_Vector& yyp, |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
480 SUNMatrix& Jac) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
481 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
482 { |
27182 | 483 ColumnVector y = NVecToCol (yy, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
484 |
27182 | 485 ColumnVector yp = NVecToCol (yyp, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
486 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
487 SparseMatrix jac; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
488 |
27182 | 489 if (m_havejacfun) |
490 jac = (*m_jacspfun) (y, yp, t, cj, m_ida_jac); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
491 else |
27182 | 492 jac = (*m_jacspcell) (m_spdfdy, m_spdfdyp, cj); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
493 |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
494 # if defined (HAVE_SUNSPARSEMATRIX_REALLOCATE) |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
495 octave_f77_int_type nnz = to_f77_int (jac.nnz ()); |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
496 if (nnz > SUNSparseMatrix_NNZ (Jac)) |
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
497 { |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
498 // Allocate memory for sparse Jacobian defined in user function. |
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
499 // This will always be required at least once since we set the number |
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
500 // of non-zero elements to zero initially. |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
501 if (SUNSparseMatrix_Reallocate (Jac, nnz)) |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
502 error ("Unable to allocate sufficient memory for IDA sparse matrix"); |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
503 } |
28741
2cd4a32cbc4b
maint: Change "#if" indentation for consistency in __ode15__.cc.
Rik <rik@octave.org>
parents:
28739
diff
changeset
|
504 # endif |
28739
3eb2fab71028
Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905).
Bill Greene <w.h.greene@gmail.com>
parents:
28716
diff
changeset
|
505 |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
506 SUNMatZero_Sparse (Jac); |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
507 // We have to use "sunindextype *" here but still need to check that |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
508 // conversion of each element to "octave_f77_int_type" is save. |
26897
ba0c9e84f6a8
allow building with sundials library that uses 32-bit sunindextype (bug #52475)
John W. Eaton <jwe@octave.org>
parents:
26895
diff
changeset
|
509 sunindextype *colptrs = SUNSparseMatrix_IndexPointers (Jac); |
ba0c9e84f6a8
allow building with sundials library that uses 32-bit sunindextype (bug #52475)
John W. Eaton <jwe@octave.org>
parents:
26895
diff
changeset
|
510 sunindextype *rowvals = SUNSparseMatrix_IndexValues (Jac); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
511 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
512 for (octave_f77_int_type i = 0; i < m_num + 1; i++) |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
513 colptrs[i] = to_f77_int (jac.cidx (i)); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
514 |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
515 double *d = SUNSparseMatrix_Data (Jac); |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
516 for (octave_f77_int_type i = 0; i < to_f77_int (jac.nnz ()); i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
517 { |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
518 rowvals[i] = to_f77_int (jac.ridx (i)); |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
519 d[i] = jac.data (i); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
520 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
521 } |
26898
d94876e7a0aa
Remove calls to deprecated sundials functions.
Carlo de Falco <carlo.defalco@polimi.it>
parents:
26897
diff
changeset
|
522 # endif |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
523 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
524 ColumnVector |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
525 IDA::NVecToCol (N_Vector& v, octave_f77_int_type n) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
526 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
527 ColumnVector data (n); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
528 realtype *punt = nv_data_s (v); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
529 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
530 for (octave_f77_int_type i = 0; i < n; i++) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
531 data(i) = punt[i]; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
532 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
533 return data; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
534 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
535 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
536 N_Vector |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
537 IDA::ColToNVec (const ColumnVector& data, octave_f77_int_type n) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
538 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
539 N_Vector v = N_VNew_Serial (n); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
540 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
541 realtype *punt = nv_data_s (v); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
542 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
543 for (octave_f77_int_type i = 0; i < n; i++) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
544 punt[i] = data(i); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
545 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
546 return v; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
547 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
548 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
549 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
550 IDA::set_userdata (void) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
551 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
552 void *userdata = this; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
553 |
27182 | 554 if (IDASetUserData (m_mem, userdata) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
555 error ("User data not set"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
556 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
557 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
558 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
559 IDA::initialize (void) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
560 { |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
561 m_num = to_f77_int (m_y0.numel ()); |
27182 | 562 m_mem = IDACreate (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
563 |
27182 | 564 N_Vector yy = ColToNVec (m_y0, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
565 |
27182 | 566 N_Vector yyp = ColToNVec (m_yp0, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
567 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
568 IDA::set_userdata (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
569 |
27182 | 570 if (IDAInit (m_mem, IDA::resfun, m_t0, yy, yyp) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
571 error ("IDA not initialized"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
572 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
573 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
574 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
575 IDA::set_tolerance (ColumnVector& abstol, realtype reltol) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
576 { |
27182 | 577 N_Vector abs_tol = ColToNVec (abstol, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
578 |
27182 | 579 if (IDASVtolerances (m_mem, reltol, abs_tol) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
580 error ("IDA: Tolerance not set"); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
581 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
582 N_VDestroy_Serial (abs_tol); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
583 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
584 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
585 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
586 IDA::set_tolerance (realtype abstol, realtype reltol) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
587 { |
27182 | 588 if (IDASStolerances (m_mem, reltol, abstol) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
589 error ("IDA: Tolerance not set"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
590 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
591 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
592 octave_value_list |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
593 IDA::integrate (const octave_idx_type numt, const ColumnVector& tspan, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
594 const ColumnVector& y, const ColumnVector& yp, |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
595 const int refine, bool haverefine, bool haveoutputfcn, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
596 const octave_value& output_fcn, bool haveoutputsel, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
597 ColumnVector& outputsel, bool haveeventfunction, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
598 const octave_value& event_fcn, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
599 const octave_idx_type num_event_args) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
600 { |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
601 // Set up output |
27182 | 602 ColumnVector tout, yout (m_num), ypout (m_num), ysel (outputsel.numel ()); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
603 ColumnVector ie, te, oldval, oldisterminal, olddir; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
604 Matrix output, ye; |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
605 octave_idx_type cont = 0, temp = 0; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
606 bool status = 0; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
607 std::string string = ""; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
608 ColumnVector yold = y; |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
609 |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
610 realtype tsol = tspan(0); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
611 realtype tend = tspan(numt-1); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
612 |
27182 | 613 N_Vector yyp = ColToNVec (yp, m_num); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
614 |
27182 | 615 N_Vector yy = ColToNVec (y, m_num); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
616 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
617 // Initialize OutputFcn |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
618 if (haveoutputfcn) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
619 status = IDA::outputfun (output_fcn, haveoutputsel, y, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
620 tsol, tend, outputsel, "init"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
621 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
622 // Initialize Events |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
623 if (haveeventfunction) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
624 status = IDA::event (event_fcn, te, ye, ie, tsol, y, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
625 "init", yp, oldval, oldisterminal, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
626 olddir, cont, temp, tsol, yold, num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
627 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
628 if (numt > 2) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
629 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
630 // First output value |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
631 tout.resize (numt); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
632 tout(0) = tsol; |
27182 | 633 output.resize (numt, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
634 |
27182 | 635 for (octave_idx_type i = 0; i < m_num; i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
636 output.elem (0, i) = y.elem (i); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
637 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
638 //Main loop |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
639 for (octave_idx_type j = 1; j < numt && status == 0; j++) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
640 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
641 // IDANORMAL already interpolates tspan(j) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
642 |
27182 | 643 if (IDASolve (m_mem, tspan (j), &tsol, yy, yyp, IDA_NORMAL) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
644 error ("IDASolve failed"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
645 |
27182 | 646 yout = NVecToCol (yy, m_num); |
647 ypout = NVecToCol (yyp, m_num); | |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
648 tout(j) = tsol; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
649 |
27182 | 650 for (octave_idx_type i = 0; i < m_num; i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
651 output.elem (j, i) = yout.elem (i); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
652 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
653 if (haveoutputfcn) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
654 status = IDA::outputfun (output_fcn, haveoutputsel, yout, tsol, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
655 tend, outputsel, string); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
656 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
657 if (haveeventfunction) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
658 status = IDA::event (event_fcn, te, ye, ie, tout(j), yout, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
659 string, ypout, oldval, oldisterminal, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
660 olddir, j, temp, tout(j-1), yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
661 num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
662 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
663 // If integration is stopped, return only the reached steps |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
664 if (status == 1) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
665 { |
27182 | 666 output.resize (j + 1, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
667 tout.resize (j + 1); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
668 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
669 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
670 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
671 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
672 else // numel (tspan) == 2 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
673 { |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
674 // First output value |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
675 tout.resize (1); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
676 tout(0) = tsol; |
27182 | 677 output.resize (1, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
678 |
27182 | 679 for (octave_idx_type i = 0; i < m_num; i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
680 output.elem (0, i) = y.elem (i); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
681 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
682 bool posdirection = (tend > tsol); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
683 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
684 //main loop |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
685 while (((posdirection == 1 && tsol < tend) |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
686 || (posdirection == 0 && tsol > tend)) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
687 && status == 0) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
688 { |
27182 | 689 if (IDASolve (m_mem, tend, &tsol, yy, yyp, IDA_ONE_STEP) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
690 error ("IDASolve failed"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
691 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
692 if (haverefine) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
693 status = IDA::interpolate (cont, output, tout, refine, tend, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
694 haveoutputfcn, haveoutputsel, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
695 output_fcn, outputsel, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
696 haveeventfunction, event_fcn, te, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
697 ye, ie, oldval, oldisterminal, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
698 olddir, temp, yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
699 num_event_args); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
700 |
27182 | 701 ypout = NVecToCol (yyp, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
702 cont += 1; |
27182 | 703 output.resize (cont + 1, m_num); // This may be not efficient |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
704 tout.resize (cont + 1); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
705 tout(cont) = tsol; |
27182 | 706 yout = NVecToCol (yy, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
707 |
27182 | 708 for (octave_idx_type i = 0; i < m_num; i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
709 output.elem (cont, i) = yout.elem (i); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
710 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
711 if (haveoutputfcn && ! haverefine && tout(cont) < tend) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
712 status = IDA::outputfun (output_fcn, haveoutputsel, yout, tsol, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
713 tend, outputsel, string); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
714 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
715 if (haveeventfunction && ! haverefine && tout(cont) < tend) |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
716 status = IDA::event (event_fcn, te, ye, ie, tout(cont), yout, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
717 string, ypout, oldval, oldisterminal, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
718 olddir, cont, temp, tout(cont-1), yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
719 num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
720 } |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
721 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
722 if (status == 0) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
723 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
724 // Interpolate in tend |
27182 | 725 N_Vector dky = N_VNew_Serial (m_num); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
726 |
27182 | 727 if (IDAGetDky (m_mem, tend, 0, dky) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
728 error ("IDA failed to interpolate y"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
729 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
730 tout(cont) = tend; |
27182 | 731 yout = NVecToCol (dky, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
732 |
27182 | 733 for (octave_idx_type i = 0; i < m_num; i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
734 output.elem (cont, i) = yout.elem (i); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
735 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
736 // Plot final value |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
737 if (haveoutputfcn) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
738 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
739 status = IDA::outputfun (output_fcn, haveoutputsel, yout, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
740 tend, tend, outputsel, string); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
741 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
742 // Events during last step |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
743 if (haveeventfunction) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
744 status = IDA::event (event_fcn, te, ye, ie, tend, yout, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
745 string, ypout, oldval, oldisterminal, |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
746 olddir, cont, temp, tout(cont-1), |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
747 yold, num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
748 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
749 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
750 N_VDestroy_Serial (dky); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
751 } |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
752 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
753 // Cleanup plotter |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
754 status = IDA::outputfun (output_fcn, haveoutputsel, yout, tend, tend, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
755 outputsel, "done"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
756 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
757 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
758 |
29039
1aa69571a313
Use 1-based indexing for "ie" variable in ode15i/s (bug #59063).
Rik <rik@octave.org>
parents:
28952
diff
changeset
|
759 // Index of Events (ie) variable must use 1-based indexing |
1aa69571a313
Use 1-based indexing for "ie" variable in ode15i/s (bug #59063).
Rik <rik@octave.org>
parents:
28952
diff
changeset
|
760 return ovl (tout, output, te, ye, ie + 1.0); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
761 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
762 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
763 bool |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
764 IDA::event (const octave_value& event_fcn, |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
765 ColumnVector& te, Matrix& ye, ColumnVector& ie, realtype tsol, |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
766 const ColumnVector& y, const std::string& flag, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
767 const ColumnVector& yp, ColumnVector& oldval, |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
768 ColumnVector& oldisterminal, ColumnVector& olddir, |
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
769 octave_idx_type cont, octave_idx_type& temp, realtype told, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
770 ColumnVector& yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
771 const octave_idx_type num_event_args) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
772 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
773 bool status = 0; |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
774 |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
775 octave_value_list args; |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
776 if (num_event_args == 2) |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
777 args = ovl (tsol, y); |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
778 else |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
779 args = ovl (tsol, y, yp); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
780 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
781 // cont is the number of steps reached by the solver |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
782 // temp is the number of events registered |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
783 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
784 if (flag == "init") |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
785 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
786 octave_value_list output = feval (event_fcn, args, 3); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
787 oldval = output(0).vector_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
788 oldisterminal = output(1).vector_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
789 olddir = output(2).vector_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
790 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
791 else if (flag == "") |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
792 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
793 ColumnVector index (0); |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
794 octave_value_list output = feval (event_fcn, args, 3); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
795 ColumnVector val = output(0).vector_value (); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
796 ColumnVector isterminal = output(1).vector_value (); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
797 ColumnVector dir = output(2).vector_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
798 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
799 // Get the index of the changed values |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
800 for (octave_idx_type i = 0; i < val.numel (); i++) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
801 { |
29060
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
802 // Check for sign change and whether a rising / falling edge |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
803 // either passes through zero or detaches from zero (bug #59063) |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
804 if ((dir(i) != -1 |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
805 && ((val(i) >= 0 && oldval(i) < 0) |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
806 || (val(i) > 0 && oldval(i) <= 0))) // increasing |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
807 || (dir(i) != 1 |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
808 && ((val(i) <= 0 && oldval(i) > 0) |
b1b09b88585a
ode15: Detect time events when time is a multiple of the output step size (bug #59063).
Markus Meisinger <chloros2@gmx.de>
parents:
29039
diff
changeset
|
809 || (val(i) < 0 && oldval(i) >= 0)))) // decreasing |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
810 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
811 index.resize (index.numel () + 1); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
812 index (index.numel () - 1) = i; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
813 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
814 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
815 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
816 if (cont == 1 && index.numel () > 0) // Events in first step |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
817 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
818 temp = 1; // register only the first event |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
819 te.resize (1); |
27182 | 820 ye.resize (1, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
821 ie.resize (1); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
822 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
823 // Linear interpolation |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
824 ie(0) = index(0); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
825 te(0) = tsol - val (index(0)) * (tsol - told) |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
826 / (val (index(0)) - oldval (index(0))); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
827 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
828 ColumnVector ytemp |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
829 = y - ((tsol - te(0)) * (y - yold) / (tsol - told)); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
830 |
27182 | 831 for (octave_idx_type i = 0; i < m_num; i++) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
832 ye.elem (0, i) = ytemp.elem (i); |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
833 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
834 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
835 else if (index.numel () > 0) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
836 // Not first step: register all events and test if stop integration or not |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
837 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
838 te.resize (temp + index.numel ()); |
27182 | 839 ye.resize (temp + index.numel (), m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
840 ie.resize (temp + index.numel ()); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
841 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
842 for (octave_idx_type i = 0; i < index.numel (); i++) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
843 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
844 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
845 if (isterminal (index(i)) == 1) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
846 status = 1; // Stop integration |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
847 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
848 // Linear interpolation |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
849 ie(temp+i) = index(i); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
850 te(temp+i) = tsol - val(index(i)) * (tsol - told) |
27932
b018f553fd85
maint: Use Octave coding conventions in libinterp/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
851 / (val(index(i)) - oldval(index(i))); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
852 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
853 ColumnVector ytemp |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
854 = y - (tsol - te (temp + i)) * (y - yold) / (tsol - told); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
855 |
27182 | 856 for (octave_idx_type j = 0; j < m_num; j++) |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
857 ye.elem (temp + i, j) = ytemp.elem (j); |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
858 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
859 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
860 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
861 temp += index.numel (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
862 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
863 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
864 // Update variables |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
865 yold = y; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
866 told = tsol; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
867 olddir = dir; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
868 oldval = val; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
869 oldisterminal = isterminal; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
870 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
871 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
872 return status; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
873 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
874 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
875 bool |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
876 IDA::interpolate (octave_idx_type& cont, Matrix& output, ColumnVector& tout, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
877 int refine, realtype tend, bool haveoutputfcn, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
878 bool haveoutputsel, const octave_value& output_fcn, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
879 ColumnVector& outputsel, bool haveeventfunction, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
880 const octave_value& event_fcn, ColumnVector& te, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
881 Matrix& ye, ColumnVector& ie, ColumnVector& oldval, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
882 ColumnVector& oldisterminal, ColumnVector& olddir, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
883 octave_idx_type& temp, ColumnVector& yold, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
884 const octave_idx_type num_event_args) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
885 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
886 realtype h = 0, tcur = 0; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
887 bool status = 0; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
888 |
27182 | 889 N_Vector dky = N_VNew_Serial (m_num); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
890 |
27182 | 891 N_Vector dkyp = N_VNew_Serial (m_num); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
892 |
27182 | 893 ColumnVector yout (m_num); |
894 ColumnVector ypout (m_num); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
895 std::string string = ""; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
896 |
27182 | 897 if (IDAGetLastStep (m_mem, &h) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
898 error ("IDA failed to return last step"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
899 |
27182 | 900 if (IDAGetCurrentTime (m_mem, &tcur) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
901 error ("IDA failed to return the current time"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
902 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
903 realtype tin = tcur - h; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
904 |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
905 realtype step = h / refine; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
906 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
907 for (octave_idx_type i = 1; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
908 i < refine && tin + step * i < tend && status == 0; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
909 i++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
910 { |
27182 | 911 if (IDAGetDky (m_mem, tin + step*i, 0, dky) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
912 error ("IDA failed to interpolate y"); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
913 |
27182 | 914 if (IDAGetDky (m_mem, tin + step*i, 1, dkyp) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
915 error ("IDA failed to interpolate yp"); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
916 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
917 cont += 1; |
27182 | 918 output.resize (cont + 1, m_num); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
919 tout.resize (cont + 1); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
920 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
921 tout(cont) = tin + step * i; |
27182 | 922 yout = NVecToCol (dky, m_num); |
923 ypout = NVecToCol (dkyp, m_num); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
924 |
27182 | 925 for (octave_idx_type j = 0; j < m_num; j++) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
926 output.elem (cont, j) = yout.elem (j); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
927 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
928 if (haveoutputfcn) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
929 status = IDA::outputfun (output_fcn, haveoutputsel, yout, |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
930 tout(cont), tend, outputsel, ""); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
931 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
932 if (haveeventfunction) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
933 status = IDA::event (event_fcn, te, ye, ie, tout(cont), |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
934 yout, string, ypout, oldval, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
935 oldisterminal, olddir, cont, temp, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
936 tout(cont-1), yold, num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
937 } |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
938 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
939 N_VDestroy_Serial (dky); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
940 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
941 return status; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
942 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
943 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
944 bool |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
945 IDA::outputfun (const octave_value& output_fcn, bool haveoutputsel, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
946 const ColumnVector& yout, realtype tsol, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
947 realtype tend, ColumnVector& outputsel, |
22918
0b5d9978d7b1
* __ode15__.cc: Pass std::string arg by const reference.
John W. Eaton <jwe@octave.org>
parents:
22917
diff
changeset
|
948 const std::string& flag) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
949 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
950 bool status = 0; |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
951 |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
952 octave_value_list output; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
953 output(2) = flag; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
954 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
955 ColumnVector ysel (outputsel.numel ()); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
956 if (haveoutputsel) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
957 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
958 for (octave_idx_type i = 0; i < outputsel.numel (); i++) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
959 ysel(i) = yout(outputsel(i)); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
960 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
961 output(1) = ysel; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
962 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
963 else |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
964 output(1) = yout; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
965 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
966 if (flag == "init") |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
967 { |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
968 ColumnVector toutput (2); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
969 toutput(0) = tsol; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
970 toutput(1) = tend; |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
971 output(0) = toutput; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
972 |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
973 feval (output_fcn, output, 0); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
974 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
975 else if (flag == "") |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
976 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
977 output(0) = tsol; |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
978 octave_value_list val = feval (output_fcn, output, 1); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
979 status = val(0).bool_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
980 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
981 else |
25103
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25098
diff
changeset
|
982 { |
078b795c5219
maint: style check C++ ahead of 4.4 release.
Rik <rik@octave.org>
parents:
25098
diff
changeset
|
983 // Cleanup plotter |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
984 output(0) = tend; |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
985 feval (output_fcn, output, 0); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
986 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
987 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
988 return status; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
989 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
990 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
991 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
992 IDA::set_maxstep (realtype maxstep) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
993 { |
27182 | 994 if (IDASetMaxStep (m_mem, maxstep) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
995 error ("IDA: Max Step not set"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
996 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
997 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
998 void |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
999 IDA::set_initialstep (realtype initialstep) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1000 { |
27182 | 1001 if (IDASetInitStep (m_mem, initialstep) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1002 error ("IDA: Initial Step not set"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1003 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1004 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1005 void |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1006 IDA::set_maxorder (int maxorder) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1007 { |
27182 | 1008 if (IDASetMaxOrd (m_mem, maxorder) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1009 error ("IDA: Max Order not set"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1010 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1011 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1012 void |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1013 IDA::print_stat (void) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1014 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1015 long int nsteps = 0, netfails = 0, nrevals = 0; |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1016 |
27182 | 1017 if (IDAGetNumSteps (m_mem, &nsteps) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1018 error ("IDA failed to return the number of internal steps"); |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1019 |
27182 | 1020 if (IDAGetNumErrTestFails (m_mem, &netfails) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1021 error ("IDA failed to return the number of internal errors"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1022 |
27182 | 1023 if (IDAGetNumResEvals (m_mem, &nrevals) != 0) |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1024 error ("IDA failed to return the number of residual evaluations"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1025 |
26000
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1026 octave_stdout << nsteps << " successful steps\n"; |
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1027 octave_stdout << netfails << " failed attempts\n"; |
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1028 octave_stdout << nrevals << " function evaluations\n"; |
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1029 // octave_stdout << " partial derivatives\n"; |
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1030 // octave_stdout << " LU decompositions\n"; |
97e63ba8a34c
* __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout.
John W. Eaton <jwe@octave.org>
parents:
25438
diff
changeset
|
1031 // octave_stdout << " solutions of linear systems\n"; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1032 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1033 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1034 ColumnVector |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1035 ida_user_function (const ColumnVector& x, const ColumnVector& xdot, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1036 double t, const octave_value& ida_fc) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1037 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1038 octave_value_list tmp; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1039 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1040 try |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1041 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
1042 tmp = feval (ida_fc, ovl (t, x, xdot), 1); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1043 } |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1044 catch (execution_exception& ee) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1045 { |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1046 err_user_supplied_eval (ee, "__ode15__"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1047 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1048 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1049 return tmp(0).vector_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1050 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1051 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1052 Matrix |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1053 ida_dense_jac (const ColumnVector& x, const ColumnVector& xdot, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1054 double t, double cj, const octave_value& ida_jc) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1055 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1056 octave_value_list tmp; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1057 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1058 try |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1059 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
1060 tmp = feval (ida_jc, ovl (t, x, xdot), 2); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1061 } |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1062 catch (execution_exception& ee) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1063 { |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1064 err_user_supplied_eval (ee, "__ode15__"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1065 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1066 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1067 return tmp(0).matrix_value () + cj * tmp(1).matrix_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1068 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1069 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1070 SparseMatrix |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1071 ida_sparse_jac (const ColumnVector& x, const ColumnVector& xdot, |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1072 double t, double cj, const octave_value& ida_jc) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1073 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1074 octave_value_list tmp; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1075 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1076 try |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1077 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23588
diff
changeset
|
1078 tmp = feval (ida_jc, ovl (t, x, xdot), 2); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1079 } |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1080 catch (execution_exception& ee) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1081 { |
29163
8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
Rik <rik@octave.org>
parents:
29060
diff
changeset
|
1082 err_user_supplied_eval (ee, "__ode15__"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1083 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1084 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1085 return tmp(0).sparse_matrix_value () + cj * tmp(1).sparse_matrix_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1086 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1087 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1088 Matrix |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1089 ida_dense_cell_jac (Matrix *dfdy, Matrix *dfdyp, double cj) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1090 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1091 return (*dfdy) + cj * (*dfdyp); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1092 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1093 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1094 SparseMatrix |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1095 ida_sparse_cell_jac (SparseMatrix *spdfdy, SparseMatrix *spdfdyp, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1096 double cj) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1097 { |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1098 return (*spdfdy) + cj * (*spdfdyp); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1099 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1100 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1101 octave_value_list |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1102 do_ode15 (const octave_value& ida_fcn, |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23432
diff
changeset
|
1103 const ColumnVector& tspan, |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
1104 const octave_idx_type numt, |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1105 const realtype t0, |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23432
diff
changeset
|
1106 const ColumnVector& y0, |
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23432
diff
changeset
|
1107 const ColumnVector& yp0, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1108 const octave_scalar_map& options, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1109 const octave_idx_type num_event_args) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1110 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1111 octave_value_list retval; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1112 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1113 // Create object |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1114 IDA dae (t0, y0, yp0, ida_fcn, ida_user_function); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1115 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1116 // Set Jacobian |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1117 bool havejac = options.getfield ("havejac").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1118 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1119 bool havejacsparse = options.getfield ("havejacsparse").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1120 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1121 bool havejacfun = options.getfield ("havejacfun").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1122 |
27182 | 1123 Matrix ida_dfdy, ida_dfdyp; |
1124 SparseMatrix ida_spdfdy, ida_spdfdyp; | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1125 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1126 if (havejac) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1127 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1128 if (havejacfun) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1129 { |
27182 | 1130 octave_value ida_jac = options.getfield ("Jacobian"); |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1131 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1132 if (havejacsparse) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1133 dae.set_jacobian (ida_jac, ida_sparse_jac); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1134 else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1135 dae.set_jacobian (ida_jac, ida_dense_jac); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1136 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1137 else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1138 { |
27182 | 1139 Cell jaccell = options.getfield ("Jacobian").cell_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1140 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1141 if (havejacsparse) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1142 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1143 ida_spdfdy = jaccell(0).sparse_matrix_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1144 ida_spdfdyp = jaccell(1).sparse_matrix_value (); |
27182 | 1145 |
1146 dae.set_jacobian (&ida_spdfdy, &ida_spdfdyp, | |
1147 ida_sparse_cell_jac); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1148 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1149 else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1150 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1151 ida_dfdy = jaccell(0).matrix_value (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1152 ida_dfdyp = jaccell(1).matrix_value (); |
27182 | 1153 |
1154 dae.set_jacobian (&ida_dfdy, &ida_dfdyp, ida_dense_cell_jac); | |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1155 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1156 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1157 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1158 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1159 // Initialize IDA |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1160 dae.initialize (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1161 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1162 // Set tolerances |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1163 realtype rel_tol = options.getfield ("RelTol").double_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1164 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1165 bool haveabstolvec = options.getfield ("haveabstolvec").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1166 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1167 if (haveabstolvec) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1168 { |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1169 ColumnVector abs_tol = options.getfield ("AbsTol").vector_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1170 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1171 dae.set_tolerance (abs_tol, rel_tol); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1172 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1173 else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1174 { |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1175 realtype abs_tol = options.getfield ("AbsTol").double_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1176 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1177 dae.set_tolerance (abs_tol, rel_tol); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1178 } |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1179 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1180 //Set max step |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1181 realtype maxstep = options.getfield ("MaxStep").double_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1182 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1183 dae.set_maxstep (maxstep); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1184 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1185 //Set initial step |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1186 if (! options.getfield ("InitialStep").isempty ()) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1187 { |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1188 realtype initialstep = options.getfield ("InitialStep").double_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1189 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1190 dae.set_initialstep (initialstep); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1191 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1192 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1193 //Set max order FIXME: it doesn't work |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1194 int maxorder = options.getfield ("MaxOrder").int_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1195 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1196 dae.set_maxorder (maxorder); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1197 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1198 //Set Refine |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1199 const int refine = options.getfield ("Refine").int_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1200 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1201 bool haverefine = (refine > 1); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1202 |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1203 octave_value output_fcn; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1204 ColumnVector outputsel; |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1205 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1206 // OutputFcn |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1207 bool haveoutputfunction |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1208 = options.getfield ("haveoutputfunction").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1209 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1210 if (haveoutputfunction) |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1211 output_fcn = options.getfield ("OutputFcn"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1212 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1213 // OutputSel |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1214 bool haveoutputsel = options.getfield ("haveoutputselection").bool_value (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1215 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1216 if (haveoutputsel) |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1217 outputsel = options.getfield ("OutputSel").vector_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1218 |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1219 octave_value event_fcn; |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1220 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1221 // Events |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1222 bool haveeventfunction |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1223 = options.getfield ("haveeventfunction").bool_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1224 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1225 if (haveeventfunction) |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1226 event_fcn = options.getfield ("Events"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1227 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1228 // Set up linear solver |
26893
25284d620919
Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
Bill Greene <w.h.greene@gmail.com>
parents:
26392
diff
changeset
|
1229 dae.set_up (y0); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1230 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1231 // Integrate |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1232 retval = dae.integrate (numt, tspan, y0, yp0, refine, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1233 haverefine, haveoutputfunction, |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1234 output_fcn, haveoutputsel, outputsel, |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1235 haveeventfunction, event_fcn, num_event_args); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1236 |
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1237 // Statistics |
28694
d91935bd879c
maint: Use Octave coding conventions in __ode15__.cc.
Rik <rik@octave.org>
parents:
27932
diff
changeset
|
1238 bool havestats = options.getfield ("havestats").bool_value (); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1239 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1240 if (havestats) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1241 dae.print_stat (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1242 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1243 return retval; |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1244 } |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1245 } |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1246 #endif |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1247 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1248 |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29445
diff
changeset
|
1249 OCTAVE_NAMESPACE_BEGIN |
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29445
diff
changeset
|
1250 |
22913
69342e4f0dcf
* __ode15__.cc: Don't check nargout.
John W. Eaton <jwe@octave.org>
parents:
22912
diff
changeset
|
1251 DEFUN_DLD (__ode15__, args, , |
69342e4f0dcf
* __ode15__.cc: Don't check nargout.
John W. Eaton <jwe@octave.org>
parents:
22912
diff
changeset
|
1252 doc: /* -*- texinfo -*- |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1253 @deftypefn {} {@var{t}, @var{y} =} __ode15__ (@var{fun}, @var{tspan}, @var{y0}, @var{yp0}, @var{options}, @var{num_event_args}) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1254 Undocumented internal function. |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1255 @end deftypefn */) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1256 { |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1257 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1258 #if defined (HAVE_SUNDIALS) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1259 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1260 // Check number of parameters |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1261 if (args.length () != 6) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1262 print_usage (); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1263 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1264 // Check odefun |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1265 octave_value ida_fcn = args(0); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1266 |
26907
1d3730539776
use octave_value instead of pointer to octave_function in __ode15__
John W. Eaton <jwe@octave.org>
parents:
26905
diff
changeset
|
1267 if (! ida_fcn.is_function_handle ()) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1268 error ("__ode15__: odefun must be a function handle"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1269 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1270 // Check input tspan |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1271 ColumnVector tspan |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1272 = args(1).xvector_value ("__ode15__: TRANGE must be a vector of numbers"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1273 |
28716
9beec32ba3d6
Overhaul usage of integer types in __ode15__.cc (bug #58795).
Markus Mützel <markus.muetzel@gmx.de>
parents:
28709
diff
changeset
|
1274 octave_idx_type numt = tspan.numel (); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1275 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1276 realtype t0 = tspan (0); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1277 |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1278 if (numt < 2) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1279 error ("__ode15__: TRANGE must contain at least 2 elements"); |
26392
9ec0a1e5d4d3
__ode15__.cc: Fix static analyzer detected issues (bug #55347).
Rik <rik@octave.org>
parents:
26376
diff
changeset
|
1280 else if (tspan.issorted () == UNSORTED || tspan(0) == tspan(numt - 1)) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1281 error ("__ode15__: TRANGE must be strictly monotonic"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1282 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1283 // input y0 and yp0 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1284 ColumnVector y0 |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1285 = args(2).xvector_value ("__ode15__: initial state y0 must be a vector"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1286 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1287 ColumnVector yp0 |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1288 = args(3).xvector_value ("__ode15__: initial state yp0 must be a vector"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1289 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1290 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1291 if (y0.numel () != yp0.numel ()) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1292 error ("__ode15__: initial state y0 and yp0 must have the same length"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1293 else if (y0.numel () < 1) |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1294 error ("__ode15__: initial state yp0 must be a vector or a scalar"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1295 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1296 |
23584
7ed6b258db91
maint: Deprecate is_map and replace with isstruct.
Rik <rik@octave.org>
parents:
23577
diff
changeset
|
1297 if (! args(4).isstruct ()) |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1298 error ("__ode15__: OPTS argument must be a structure"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1299 |
22917
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1300 octave_scalar_map options |
c1ac4ac3ebbc
* __ode15__.cc: Style fixes.
John W. Eaton <jwe@octave.org>
parents:
22915
diff
changeset
|
1301 = args(4).xscalar_map_value ("__ode15__: OPTS argument must be a scalar structure"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1302 |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1303 // Provided number of arguments in the ode callback function |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1304 octave_idx_type num_event_args |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1305 = args(5).xidx_type_value ("__ode15__: NUM_EVENT_ARGS must be an integer"); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1306 |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1307 if (num_event_args != 2 && num_event_args != 3) |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1308 error ("__ode15__: number of input arguments in event callback must be 2 or 3"); |
22910
23847979b91e
maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents:
22903
diff
changeset
|
1309 |
29296
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1310 return octave::do_ode15 (ida_fcn, tspan, numt, t0, y0, yp0, options, |
7bf91e98bfc6
__ode15__(): Consider the correct number of input arguments in the event callback (bug #59477).
Markus Meisinger <chloros2@gmx.de>
parents:
29163
diff
changeset
|
1311 num_event_args); |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1312 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1313 #else |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1314 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1315 octave_unused_parameter (args); |
22911
82551783527f
* __ode15__.cc: Fix compilation if Sundials is missing.
John W. Eaton <jwe@octave.org>
parents:
22910
diff
changeset
|
1316 |
22901
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1317 err_disabled_feature ("__ode15__", "sundials_ida, sundials_nvecserial"); |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1318 |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1319 #endif |
4c56f3ffec04
Add functions ode15i and ode15s
Francesco Faccio <francesco.faccio@mail.polimi.it>
parents:
diff
changeset
|
1320 } |
26905
91e5d37aaba0
__ode15__.cc: mark internal function as tested for BIST purposes
Mike Miller <mtmiller@octave.org>
parents:
26903
diff
changeset
|
1321 |
91e5d37aaba0
__ode15__.cc: mark internal function as tested for BIST purposes
Mike Miller <mtmiller@octave.org>
parents:
26903
diff
changeset
|
1322 /* |
91e5d37aaba0
__ode15__.cc: mark internal function as tested for BIST purposes
Mike Miller <mtmiller@octave.org>
parents:
26903
diff
changeset
|
1323 ## No test needed for internal helper function. |
91e5d37aaba0
__ode15__.cc: mark internal function as tested for BIST purposes
Mike Miller <mtmiller@octave.org>
parents:
26903
diff
changeset
|
1324 %!assert (1) |
91e5d37aaba0
__ode15__.cc: mark internal function as tested for BIST purposes
Mike Miller <mtmiller@octave.org>
parents:
26903
diff
changeset
|
1325 */ |
29958
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29445
diff
changeset
|
1326 |
32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
29445
diff
changeset
|
1327 OCTAVE_NAMESPACE_END |