octave: libinterp/dldfcn/__ode15_

annotate libinterp/dldfcn/ode15.cc @ 27919:1891570abac8

update Octave Project Developers copyright for the new year In files that have the "Octave Project Developers" copyright notice, update for 2020.

author	John W. Eaton <jwe@octave.org>
date	Mon, 06 Jan 2020 22:29:51 -0500
parents	b442ec6dda5c
children	bd51beb6205e

rev	line source
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1 /*
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	2
27919 1891570abac8 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 27918 diff changeset	3 Copyright (C) 2016-2020 The Octave Project Developers
27918 b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27182 diff changeset	4
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27182 diff changeset	5 See the file COPYRIGHT.md in the top-level directory of this distribution
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27182 diff changeset	6 or <https://octave.org/COPYRIGHT.html/>.
b442ec6dda5c use centralized file for copyright info for individual contributors John W. Eaton <jwe@octave.org> parents: 27182 diff changeset	7
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	8
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	9 This file is part of Octave.
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	10
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	11 Octave is free software: you can redistribute it and/or modify it
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	12 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	13 the Free Software Foundation, either version 3 of the License, or
24007 e8a74d95b4f3 maint: Use same format for Copyright statement throught code base. Rik <rik@octave.org> parents: 23795 diff changeset	14 (at your option) any later version.
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	15
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	16 Octave is distributed in the hope that it will be useful, but
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	17 WITHOUT ANY WARRANTY; without even the implied warranty of
24007 e8a74d95b4f3 maint: Use same format for Copyright statement throught code base. Rik <rik@octave.org> parents: 23795 diff changeset	18 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e8a74d95b4f3 maint: Use same format for Copyright statement throught code base. Rik <rik@octave.org> parents: 23795 diff changeset	19 GNU General Public License for more details.
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	20
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	21 You should have received a copy of the GNU General Public License
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	22 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24444 diff changeset	23 <https://www.gnu.org/licenses/>.
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	24
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
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	27 #if defined (HAVE_CONFIG_H)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	28 # include "config.h"
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	29 #endif
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	30
22911 82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	31 #include "dColVector.h"
82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	32 #include "dMatrix.h"
82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	33 #include "dSparse.h"
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	34
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 23022 diff changeset	35 #include "Cell.h"
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	36 #include "defun-dld.h"
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	37 #include "error.h"
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 23022 diff changeset	38 #include "errwarn.h"
a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 23022 diff changeset	39 #include "oct-map.h"
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	40 #include "ov.h"
23024 a6a7b054e4ba Rationalize #includes in libinterp/dldfcn directory. Rik <rik@octave.org> parents: 23022 diff changeset	41 #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	42 #include "pager.h"
22911 82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	43 #include "parse.h"
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	44
22911 82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	45 #if defined (HAVE_SUNDIALS)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	46
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	47 # 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	48 # 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	49 # endif
5dce8aa80652 configure: disable SUNDIALS if the IDADENSE API is not found (bug #52475) Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	50
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	51 # if defined (HAVE_IDA_IDA_H)
d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	52 # include <ida/ida.h>
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	53 # elif defined (HAVE_IDA_H)
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	54 # include <ida.h>
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	55 # endif
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	56 # 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	57 # include <ida/ida_direct.h>
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	58 # elif defined (HAVE_IDA_DIRECT_H)
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	59 # 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	60 # endif
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	61
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	62 # 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	63 # 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	64 # endif
305cdc1d444b * __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing. John W. Eaton <jwe@octave.org> parents: 22919 diff changeset	65
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	66 # 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	67 # 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	68 # include <klu.h>
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	69 # endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	70 # 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	71 # 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	72 # endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	73 # 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	74 # 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	75 # endif
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	76 # 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	77 # 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	78 # endif
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	79 # 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	80 # endif
ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	81
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	82 namespace octave
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	83 {
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	84 # 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	85 static inline int
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	86 IDASetJacFn (void *ida_mem, IDADlsJacFn jac)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	87 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	88 return IDADlsSetJacFn (ida_mem, jac);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	89 }
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	90 # endif
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	91
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	92 # 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	93 static inline int
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	94 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	95 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	96 return IDADlsSetLinearSolver (ida_mem, LS, A);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	97 }
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	98 # endif
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	99
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	100 # 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	101 static inline SUNLinearSolver
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	102 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	103 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	104 return SUNDenseLinearSolver (y, A);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	105 }
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	106 # endif
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	107
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	108 # 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	109 # 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	110 static inline SUNLinearSolver
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	111 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	112 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	113 return SUNKLU (y, A);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	114 }
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	115 # endif
26903 73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	116 # endif
73b141d5a888 improve configure checks for sundials (bug #55911) John W. Eaton <jwe@octave.org> parents: 26898 diff changeset	117
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	118 static inline realtype *
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	119 nv_data_s (N_Vector& v)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	120 {
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	121 #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	122 // 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	123 // 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	124 // diagnostic may still be enabled for the rest of the file.
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24007 diff changeset	125 # pragma GCC diagnostic push
53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24007 diff changeset	126 # pragma GCC diagnostic ignored "-Wold-style-cast"
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	127 #endif
7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	128
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	129 return NV_DATA_S (v);
23085 dffa2b8c9482 maint: strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23075 diff changeset	130
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	131 #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	132 // Restore prevailing warning state for remainder of the file.
24444 53ca76c5cc8d maint: Indent pragmas as other preprocessor directives. John W. Eaton <jwe@octave.org> parents: 24007 diff changeset	133 # pragma GCC diagnostic pop
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	134 #endif
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	135 }
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	136
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	137 class IDA
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	138 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	139 public:
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	140
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	141 typedef
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	142 ColumnVector (*DAERHSFuncIDA) (const ColumnVector& x,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	143 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	144 realtype t, const octave_value& idaf);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	145
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	146 typedef
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	147 Matrix (*DAEJacFuncDense) (const ColumnVector& x,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	148 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	149 realtype cj, const octave_value& idaj);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	150
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	151 typedef
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	152 SparseMatrix (*DAEJacFuncSparse) (const ColumnVector& x,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	153 const ColumnVector& xdot,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	154 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	155 const octave_value& idaj);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	156
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	157 typedef
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	158 Matrix (DAEJacCellDense) (Matrix dfdy, Matrix *dfdyp,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	159 realtype cj);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	160
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	161 typedef
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	162 SparseMatrix (DAEJacCellSparse) (SparseMatrix dfdy,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	163 SparseMatrix *dfdyp, realtype cj);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	164
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	165 //Default
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	166 IDA (void)
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	167 : m_t0 (0.0), m_y0 (), m_yp0 (), m_havejac (false), m_havejacfun (false),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	168 m_havejacsparse (false), m_mem (nullptr), m_num (), m_ida_fun (),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	169 m_ida_jac (), m_dfdy (nullptr), m_dfdyp (nullptr), m_spdfdy (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	170 m_spdfdyp (nullptr), m_fun (nullptr), m_jacfun (nullptr), m_jacspfun (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	171 m_jacdcell (nullptr), m_jacspcell (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	172 m_sunJacMatrix (nullptr), m_sunLinearSolver (nullptr)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	173 { }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	174
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 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	177 const octave_value& ida_fcn, DAERHSFuncIDA daefun)
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	178 : m_t0 (t), m_y0 (y), m_yp0 (yp), m_havejac (false), m_havejacfun (false),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	179 m_havejacsparse (false), m_mem (nullptr), m_num (), m_ida_fun (ida_fcn),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	180 m_ida_jac (), m_dfdy (nullptr), m_dfdyp (nullptr), m_spdfdy (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	181 m_spdfdyp (nullptr), m_fun (daefun), m_jacfun (nullptr), m_jacspfun (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	182 m_jacdcell (nullptr), m_jacspcell (nullptr),
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	183 m_sunJacMatrix (nullptr), m_sunLinearSolver (nullptr)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	184 { }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	185
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	186
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	187 ~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	188 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	189 IDAFree (&m_mem);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	190 SUNLinSolFree (m_sunLinearSolver);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	191 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	192 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	193
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	194 IDA&
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	195 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	196 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	197 m_jacfun = j;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	198 m_ida_jac = jac;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	199 m_havejac = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	200 m_havejacfun = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	201 m_havejacsparse = false;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	202
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	203 return *this;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	204 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	205
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	206 IDA&
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	207 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	208 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	209 m_jacspfun = j;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	210 m_ida_jac = jac;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	211 m_havejac = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	212 m_havejacfun = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	213 m_havejacsparse = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	214
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	215 return *this;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	216 }
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 IDA&
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	219 set_jacobian (Matrix dy, Matrix dyp, DAEJacCellDense j)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	220 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	221 m_jacdcell = j;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	222 m_dfdy = dy;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	223 m_dfdyp = dyp;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	224 m_havejac = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	225 m_havejacfun = false;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	226 m_havejacsparse = false;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	227
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	228 return *this;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	229 }
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 IDA&
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	232 set_jacobian (SparseMatrix dy, SparseMatrix dyp,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	233 DAEJacCellSparse j)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	234 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	235 m_jacspcell = j;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	236 m_spdfdy = dy;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	237 m_spdfdyp = dyp;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	238 m_havejac = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	239 m_havejacfun = false;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	240 m_havejacsparse = true;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	241
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	242 return *this;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	243 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	244
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	245 void set_userdata (void);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	246
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	247 void initialize (void);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	248
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	249 static ColumnVector NVecToCol (N_Vector& v, long int n);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	250
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	251 static N_Vector ColToNVec (const ColumnVector& data, long int n);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	252
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	253 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	254 set_up (const ColumnVector& y);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	255
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	256 void
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	257 set_tolerance (ColumnVector& abstol, realtype reltol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	258
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	259 void
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	260 set_tolerance (realtype abstol, realtype reltol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	261
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	262 static int
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	263 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	264 N_Vector rr, void *user_data);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	265
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	266 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	267 resfun_impl (realtype t, N_Vector& yy,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	268 N_Vector& yyp, N_Vector& rr);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	269 static int
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	270 jacdense (realtype t, realtype cj, N_Vector yy,
25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	271 N_Vector yyp, N_Vector, SUNMatrix JJ, void *user_data,
22914 b7ffd93b8d06 * __ode15__.cc: Avoid unused parameter warnings. John W. Eaton <jwe@octave.org> parents: 22913 diff changeset	272 N_Vector, N_Vector, N_Vector)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	273 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	274 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	275 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	276 return 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	277 }
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 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	280 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	281 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	282
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	283 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	284 static int
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	285 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	286 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	287 N_Vector, N_Vector)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	288 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	289 IDA self = static_cast <IDA > (user_data);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	290 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	291 return 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	292 }
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 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	295 jacsparse_impl (realtype t, realtype cj, N_Vector& 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	296 N_Vector& yyp, SUNMatrix& Jac);
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	297 # endif
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	298
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	299 void set_maxstep (realtype maxstep);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	300
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	301 void set_initialstep (realtype initialstep);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	302
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	303 bool
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	304 interpolate (int& cont, Matrix& output, ColumnVector& tout,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	305 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	306 bool haveoutputsel, const octave_value& output_fcn,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	307 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	308 const octave_value& event_fcn, ColumnVector& te,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	309 Matrix& ye, ColumnVector& ie, ColumnVector& oldval,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	310 ColumnVector& oldisterminal, ColumnVector& olddir,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	311 int& temp, ColumnVector& yold);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	312
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	313 bool
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	314 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	315 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	316 ColumnVector& outputsel, const std::string& flag);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	317
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	318
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	319 bool
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	320 event (const octave_value& event_fcn,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	321 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	322 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	323 const ColumnVector& yp, ColumnVector& oldval,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	324 ColumnVector& oldisterminal, ColumnVector& olddir,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	325 int cont, int& temp, realtype told, ColumnVector& yold);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	326
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	327 void set_maxorder (int maxorder);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	328
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	329 octave_value_list
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	330 integrate (const int numt, const ColumnVector& tt,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	331 const ColumnVector& y0, const ColumnVector& yp0,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	332 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	333 const octave_value& output_fcn, bool haveoutputsel,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	334 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	335 const octave_value& event_fcn);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	336
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	337 void print_stat (void);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	338
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	339 private:
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	340
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	341 realtype m_t0;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	342 ColumnVector m_y0;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	343 ColumnVector m_yp0;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	344 bool m_havejac;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	345 bool m_havejacfun;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	346 bool m_havejacsparse;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	347 void *m_mem;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	348 int m_num;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	349 octave_value m_ida_fun;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	350 octave_value m_ida_jac;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	351 Matrix *m_dfdy;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	352 Matrix *m_dfdyp;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	353 SparseMatrix *m_spdfdy;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	354 SparseMatrix *m_spdfdyp;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	355 DAERHSFuncIDA m_fun;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	356 DAEJacFuncDense m_jacfun;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	357 DAEJacFuncSparse m_jacspfun;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	358 DAEJacCellDense m_jacdcell;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	359 DAEJacCellSparse m_jacspcell;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	360 SUNMatrix m_sunJacMatrix;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	361 SUNLinearSolver m_sunLinearSolver;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	362 };
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	363
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	364 int
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	365 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	366 void *user_data)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	367 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	368 IDA self = static_cast <IDA > (user_data);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	369 self->resfun_impl (t, yy, yyp, rr);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	370 return 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	371 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	372
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	373 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	374 IDA::resfun_impl (realtype t, N_Vector& yy,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	375 N_Vector& yyp, N_Vector& rr)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	376 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	377 ColumnVector y = IDA::NVecToCol (yy, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	378
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	379 ColumnVector yp = IDA::NVecToCol (yyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	380
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	381 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	382
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	383 realtype *puntrr = nv_data_s (rr);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	384
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	385 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	386 puntrr[i] = res(i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	387 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	388
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	389 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	390 IDA::set_up (const ColumnVector& y)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	391 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	392 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	393
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	394 if (m_havejacsparse)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	395 {
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	396 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
26895 a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	397 // FIXME : one should not allocate space for a full Jacobian
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	398 // when using a sparse format. Consider allocating less space
a1acd11bad19 Directly include klu.h in __ode15__.cc (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26894 diff changeset	399 // then possibly using SUNSparseMatrixReallocate to increase it.
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	400 m_sunJacMatrix = SUNSparseMatrix (m_num, m_num, m_num*m_num, CSC_MAT);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	401 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	402 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	403
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	404 m_sunLinearSolver = SUNLinSol_KLU (yy, m_sunJacMatrix);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	405 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	406 error ("Unable to create KLU sparse solver");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	407
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	408 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	409 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	410
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	411 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	412
23022 305cdc1d444b * __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing. John W. Eaton <jwe@octave.org> parents: 22919 diff changeset	413 # else
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	414 error ("SUNDIALS SUNLINSOL KLU is not available in this version of Octave");
23022 305cdc1d444b * __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing. John W. Eaton <jwe@octave.org> parents: 22919 diff changeset	415 # 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	416
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	417 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	418 else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	419 {
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	420
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	421 m_sunJacMatrix = SUNDenseMatrix (m_num, m_num);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	422 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	423 error ("Unable to create dense Jacobian for Sundials");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	424
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	425 m_sunLinearSolver = SUNLinSol_Dense (yy, m_sunJacMatrix);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	426 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	427 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	428
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	429 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	430 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	431
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	432 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	433 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	434
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	435 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	436 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	437
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	438 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	439 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	440 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	441
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	442 {
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	443 long int Neq = NV_LENGTH_S(yy);
25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	444
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	445 ColumnVector y = NVecToCol (yy, Neq);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	446
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	447 ColumnVector yp = NVecToCol (yyp, Neq);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	448
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	449 Matrix jac;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	450
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	451 if (m_havejacfun)
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	452 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	453 else
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	454 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	455
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	456 std::copy (jac.fortran_vec (),
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	457 jac.fortran_vec () + jac.numel (),
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	458 SUNDenseMatrix_Data (JJ));
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	459 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	460
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	461 # if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	462 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	463 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	464 SUNMatrix& Jac)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	465
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	466 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	467 ColumnVector y = NVecToCol (yy, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	468
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	469 ColumnVector yp = NVecToCol (yyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	470
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	471 SparseMatrix jac;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	472
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	473 if (m_havejacfun)
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	474 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	475 else
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	476 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	477
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	478 SUNMatZero_Sparse (Jac);
26897 ba0c9e84f6a8 allow building with sundials library that uses 32-bit sunindextype (bug #52475) John W. Eaton <jwe@octave.org> parents: 26895 diff changeset	479 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	480 sunindextype *rowvals = SUNSparseMatrix_IndexValues (Jac);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	481
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	482 for (int i = 0; i < m_num + 1; i++)
22903 51c9eded34ee Fix access method to sundials 2.7.0 sparse matrix structure. Carlo de Falco <carlo.defalco@polimi.it> parents: 22902 diff changeset	483 colptrs[i] = jac.cidx(i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	484
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	485 double *d = SUNSparseMatrix_Data (Jac);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	486 for (int i = 0; i < jac.nnz (); i++)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	487 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	488 rowvals[i] = jac.ridx(i);
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	489 d[i] = jac.data(i);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	490 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	491 }
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	492 # endif
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	493
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	494 ColumnVector
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	495 IDA::NVecToCol (N_Vector& v, long int n)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	496 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	497 ColumnVector data (n);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	498 realtype *punt = nv_data_s (v);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	499
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	500 for (octave_idx_type i = 0; i < n; i++)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	501 data(i) = punt[i];
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	502
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	503 return data;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	504 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	505
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	506 N_Vector
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	507 IDA::ColToNVec (const ColumnVector& data, long int n)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	508 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	509 N_Vector v = N_VNew_Serial (n);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	510
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	511 realtype *punt = nv_data_s (v);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	512
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	513 for (octave_idx_type i = 0; i < n; i++)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	514 punt[i] = data(i);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	515
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	516 return v;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	517 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	518
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	519 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	520 IDA::set_userdata (void)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	521 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	522 void *userdata = this;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	523
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	524 if (IDASetUserData (m_mem, userdata) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	525 error ("User data not set");
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
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	528 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	529 IDA::initialize (void)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	530 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	531 m_num = m_y0.numel ();
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	532 m_mem = IDACreate ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	533
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	534 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	535
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	536 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	537
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	538 IDA::set_userdata ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	539
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	540 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	541 error ("IDA not initialized");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	542 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	543
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	544 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	545 IDA::set_tolerance (ColumnVector& abstol, realtype reltol)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	546 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	547 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	548
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	549 if (IDASVtolerances (m_mem, reltol, abs_tol) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	550 error ("IDA: Tolerance not set");
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	551
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	552 N_VDestroy_Serial (abs_tol);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	553 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	554
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	555 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	556 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	557 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	558 if (IDASStolerances (m_mem, reltol, abstol) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	559 error ("IDA: Tolerance not set");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	560 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	561
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	562 octave_value_list
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	563 IDA::integrate (const int numt, const ColumnVector& tspan,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	564 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	565 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	566 const octave_value& output_fcn, bool haveoutputsel,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	567 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	568 const octave_value& event_fcn)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	569 {
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	570 // Set up output
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	571 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	572 ColumnVector ie, te, oldval, oldisterminal, olddir;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	573 Matrix output, ye;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	574 int cont = 0, temp = 0;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	575 bool status = 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	576 std::string string = "";
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	577 ColumnVector yold = y;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	578
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	579 realtype tsol = tspan(0);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	580 realtype tend = tspan(numt-1);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	581
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	582 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	583
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	584 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	585
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	586 // Initialize OutputFcn
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	587 if (haveoutputfcn)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	588 status = IDA::outputfun (output_fcn, haveoutputsel, y,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	589 tsol, tend, outputsel, "init");
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 // Initialize Events
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	592 if (haveeventfunction)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	593 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	594 "init", yp, oldval, oldisterminal,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	595 olddir, cont, temp, tsol, yold);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	596
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	597 if (numt > 2)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	598 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	599 // First output value
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	600 tout.resize (numt);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	601 tout(0) = tsol;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	602 output.resize (numt, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	603
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	604 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	605 output.elem (0, i) = y.elem (i);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	606
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	607 //Main loop
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	608 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	609 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	610 // IDANORMAL already interpolates tspan(j)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	611
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	612 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	613 error ("IDASolve failed");
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	614
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	615 yout = NVecToCol (yy, m_num);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	616 ypout = NVecToCol (yyp, m_num);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	617 tout(j) = tsol;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	618
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	619 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	620 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	621
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	622 if (haveoutputfcn)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	623 status = IDA::outputfun (output_fcn, haveoutputsel, yout, tsol,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	624 tend, outputsel, string);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	625
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	626 if (haveeventfunction)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	627 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	628 string, ypout, oldval, oldisterminal,
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	629 olddir, j, temp, tout(j-1), yold);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	630
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	631 // 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	632 if (status == 1)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	633 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	634 output.resize (j + 1, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	635 tout.resize (j + 1);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	636 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	637
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	638 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	639 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	640 else // numel (tspan) == 2
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	641 {
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	642 // First output value
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	643 tout.resize (1);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	644 tout(0) = tsol;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	645 output.resize (1, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	646
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	647 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	648 output.elem (0, i) = y.elem (i);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	649
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	650 bool posdirection = (tend > tsol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	651
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	652 //main loop
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	653 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	654 \|\| (posdirection == 0 && tsol > tend))
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	655 && status == 0)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	656 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	657 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	658 error ("IDASolve failed");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	659
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	660 if (haverefine)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	661 status = IDA::interpolate (cont, output, tout, refine, tend,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	662 haveoutputfcn, haveoutputsel,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	663 output_fcn, outputsel,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	664 haveeventfunction, event_fcn, te,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	665 ye, ie, oldval, oldisterminal,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	666 olddir, temp, yold);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	667
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	668 ypout = NVecToCol (yyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	669 cont += 1;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	670 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	671 tout.resize (cont + 1);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	672 tout(cont) = tsol;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	673 yout = NVecToCol (yy, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	674
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	675 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	676 output.elem (cont, i) = yout.elem (i);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	677
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	678 if (haveoutputfcn && ! haverefine && tout(cont) < tend)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	679 status = IDA::outputfun (output_fcn, haveoutputsel, yout, tsol,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	680 tend, outputsel, string);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	681
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	682 if (haveeventfunction && ! haverefine && tout(cont) < tend)
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	683 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	684 string, ypout, oldval, oldisterminal,
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	685 olddir, cont, temp, tout(cont-1), yold);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	686 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	687
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	688 if (status == 0)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	689 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	690 // Interpolate in tend
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	691 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	692
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	693 if (IDAGetDky (m_mem, tend, 0, dky) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	694 error ("IDA failed to interpolate y");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	695
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	696 tout(cont) = tend;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	697 yout = NVecToCol (dky, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	698
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	699 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	700 output.elem (cont, i) = yout.elem (i);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	701
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	702 // Plot final value
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	703 if (haveoutputfcn)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	704 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	705 status = IDA::outputfun (output_fcn, haveoutputsel, yout,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	706 tend, tend, outputsel, string);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	707
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	708 // Events during last step
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	709 if (haveeventfunction)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	710 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	711 string, ypout, oldval, oldisterminal,
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	712 olddir, cont, temp, tout(cont-1),
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	713 yold);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	714 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	715
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	716 N_VDestroy_Serial (dky);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	717 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	718
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	719 // Cleanup plotter
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	720 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	721 outputsel, "done");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	722
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
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	725 return ovl (tout, output, te, ye, ie);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	726 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	727
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	728 bool
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	729 IDA::event (const octave_value& event_fcn,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	730 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	731 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	732 const ColumnVector& yp, ColumnVector& oldval,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	733 ColumnVector& oldisterminal, ColumnVector& olddir, int cont,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	734 int& temp, realtype told, ColumnVector& yold)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	735 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	736 bool status = 0;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	737
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	738 octave_value_list args = ovl (tsol, y, yp);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	739
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	740 // 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	741 // temp is the number of events registered
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	742
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	743 if (flag == "init")
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	744 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	745 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	746 oldval = output(0).vector_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	747 oldisterminal = output(1).vector_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	748 olddir = output(2).vector_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	749 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	750 else if (flag == "")
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	751 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	752 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	753 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	754 ColumnVector val = output(0).vector_value ();
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	755 ColumnVector isterminal = output(1).vector_value ();
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	756 ColumnVector dir = output(2).vector_value ();
22901 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 // Get the index of the changed values
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	759 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	760 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	761 if ((val(i) > 0 && oldval(i) < 0 && dir(i) != -1) // increasing
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	762 \|\| (val(i) < 0 && oldval(i) > 0 && dir(i) != 1)) // decreasing
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	763 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	764 index.resize (index.numel () + 1);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	765 index (index.numel () - 1) = i;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	766 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	767 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	768
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	769 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	770 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	771 temp = 1; // register only the first event
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	772 te.resize (1);
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	773 ye.resize (1, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	774 ie.resize (1);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	775
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	776 // Linear interpolation
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	777 ie(0) = index(0);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	778 te(0) = tsol - val (index(0)) * (tsol - told)
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	779 / (val (index(0)) - oldval (index(0)));
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	780
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	781 ColumnVector ytemp
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	782 = 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	783
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	784 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	785 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	786
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	787 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	788 else if (index.numel () > 0)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	789 // 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	790 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	791 te.resize (temp + index.numel ());
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	792 ye.resize (temp + index.numel (), m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	793 ie.resize (temp + index.numel ());
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	794
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	795 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	796 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	797
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	798 if (isterminal (index(i)) == 1)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	799 status = 1; // Stop integration
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	800
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	801 // Linear interpolation
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	802 ie(temp+i) = index(i);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	803 te(temp+i) = tsol - val(index(i)) * (tsol - told)
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	804 / (val(index(i)) - oldval(index(i)));
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	805
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	806 ColumnVector ytemp
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	807 = 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	808
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	809 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	810 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	811
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	812 }
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 temp += index.numel ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	815 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	816
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	817 // Update variables
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	818 yold = y;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	819 told = tsol;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	820 olddir = dir;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	821 oldval = val;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	822 oldisterminal = isterminal;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	823 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	824
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	825 return status;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	826 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	827
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	828 bool
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	829 IDA::interpolate (int& cont, Matrix& output, ColumnVector& tout,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	830 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	831 bool haveoutputsel, const octave_value& output_fcn,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	832 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	833 const octave_value& event_fcn, ColumnVector& te,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	834 Matrix& ye, ColumnVector& ie, ColumnVector& oldval,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	835 ColumnVector& oldisterminal, ColumnVector& olddir,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	836 int& temp, ColumnVector& yold)
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 realtype h = 0, tcur = 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	839 bool status = 0;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	840
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	841 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	842
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	843 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	844
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	845 ColumnVector yout (m_num);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	846 ColumnVector ypout (m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	847 std::string string = "";
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	848
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	849 if (IDAGetLastStep (m_mem, &h) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	850 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	851
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	852 if (IDAGetCurrentTime (m_mem, &tcur) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	853 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	854
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	855 realtype tin = tcur - h;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	856
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	857 realtype step = h / refine;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	858
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	859 for (octave_idx_type i = 1;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	860 i < refine && tin + step * i < tend && status == 0;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	861 i++)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	862 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	863 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	864 error ("IDA failed to interpolate y");
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	865
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	866 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	867 error ("IDA failed to interpolate yp");
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	868
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	869 cont += 1;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	870 output.resize (cont + 1, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	871 tout.resize (cont + 1);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	872
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	873 tout(cont) = tin + step * i;
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	874 yout = NVecToCol (dky, m_num);
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	875 ypout = NVecToCol (dkyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	876
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	877 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	878 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	879
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	880 if (haveoutputfcn)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	881 status = IDA::outputfun (output_fcn, haveoutputsel, yout,
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	882 tout(cont), tend, outputsel, "");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	883
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	884 if (haveeventfunction)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	885 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	886 yout, string, ypout, oldval,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	887 oldisterminal, olddir, cont, temp,
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	888 tout(cont-1), yold);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	889 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	890
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	891 N_VDestroy_Serial (dky);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	892
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	893 return status;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	894 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	895
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	896 bool
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	897 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	898 const ColumnVector& yout, realtype tsol,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	899 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	900 const std::string& flag)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	901 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	902 bool status = 0;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	903
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	904 octave_value_list output;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	905 output(2) = flag;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	906
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	907 ColumnVector ysel (outputsel.numel ());
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	908 if (haveoutputsel)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	909 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	910 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	911 ysel(i) = yout(outputsel(i));
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	912
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	913 output(1) = ysel;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	914 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	915 else
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	916 output(1) = yout;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	917
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	918 if (flag == "init")
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	919 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	920 ColumnVector toutput(2);
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	921 toutput(0) = tsol;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	922 toutput(1) = tend;
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	923 output(0) = toutput;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	924
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	925 feval (output_fcn, output, 0);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	926 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	927 else if (flag == "")
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	928 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	929 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	930 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	931 status = val(0).bool_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	932 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	933 else
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25098 diff changeset	934 {
078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25098 diff changeset	935 // Cleanup plotter
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	936 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	937 feval (output_fcn, output, 0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	938 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	939
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	940 return status;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	941 }
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 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	944 IDA::set_maxstep (realtype maxstep)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	945 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	946 if (IDASetMaxStep (m_mem, maxstep) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	947 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	948 }
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 void
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	951 IDA::set_initialstep (realtype initialstep)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	952 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	953 if (IDASetInitStep (m_mem, initialstep) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	954 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	955 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	956
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	957 void
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	958 IDA::set_maxorder (int maxorder)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	959 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	960 if (IDASetMaxOrd (m_mem, maxorder) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	961 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	962 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	963
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	964 void
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	965 IDA::print_stat (void)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	966 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	967 long int nsteps = 0, netfails = 0, nrevals = 0;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	968
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	969 if (IDAGetNumSteps (m_mem, &nsteps) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	970 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	971
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	972 if (IDAGetNumErrTestFails (m_mem, &netfails) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	973 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	974
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	975 if (IDAGetNumResEvals (m_mem, &nrevals) != 0)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	976 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	977
26000 97e63ba8a34c * __ode15__.cc (IDA::print_stat): Use octave_stdout instead of std::cout. John W. Eaton <jwe@octave.org> parents: 25438 diff changeset	978 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	979 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	980 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	981 // 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	982 // 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	983 // octave_stdout << " solutions of linear systems\n";
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	984 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	985
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	986 ColumnVector
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	987 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	988 double t, const octave_value& ida_fc)
22901 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 octave_value_list tmp;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	991
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	992 try
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	993 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	994 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	995 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	996 catch (execution_exception& e)
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 err_user_supplied_eval (e, "__ode15__");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	999 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1000
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1001 return tmp(0).vector_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1002 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1003
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1004 Matrix
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1005 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	1006 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	1007 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1008 octave_value_list tmp;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1009
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1010 try
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1011 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	1012 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	1013 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	1014 catch (execution_exception& e)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1015 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1016 err_user_supplied_eval (e, "__ode15__");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1017 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1018
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1019 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	1020 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1021
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1022 SparseMatrix
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1023 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	1024 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	1025 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1026 octave_value_list tmp;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1027
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1028 try
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1029 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	1030 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	1031 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23588 diff changeset	1032 catch (execution_exception& e)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1033 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1034 err_user_supplied_eval (e, "__ode15__");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1035 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1036
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1037 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	1038 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1039
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1040 Matrix
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1041 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	1042 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1043 return (dfdy) + cj (*dfdyp);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1044 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1045
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1046 SparseMatrix
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1047 ida_sparse_cell_jac (SparseMatrix spdfdy, SparseMatrix spdfdyp,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1048 double cj)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1049 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1050 return (spdfdy) + cj (*spdfdyp);
22901 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
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1053 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	1054 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	1055 const ColumnVector& tspan,
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1056 const int numt,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1057 const realtype t0,
23433 c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	1058 const ColumnVector& y0,
c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	1059 const ColumnVector& yp0,
c9fab0bc983e maint: Use convention 'int& x' for naming references. Rik <rik@octave.org> parents: 23432 diff changeset	1060 const octave_scalar_map& options)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1061 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1062 octave_value_list retval;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1063
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1064 // Create object
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1065 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	1066
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1067 // Set Jacobian
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1068 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	1069
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1070 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	1071
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1072 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	1073
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1074 Matrix ida_dfdy, ida_dfdyp;
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1075 SparseMatrix ida_spdfdy, ida_spdfdyp;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1076
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1077 if (havejac)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1078 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1079 if (havejacfun)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1080 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1081 octave_value ida_jac = options.getfield ("Jacobian");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1082
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1083 if (havejacsparse)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1084 dae.set_jacobian (ida_jac, ida_sparse_jac);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1085 else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1086 dae.set_jacobian (ida_jac, ida_dense_jac);
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 else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1089 {
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1090 Cell jaccell = options.getfield ("Jacobian").cell_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1091
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1092 if (havejacsparse)
22901 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 ida_spdfdy = jaccell(0).sparse_matrix_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1095 ida_spdfdyp = jaccell(1).sparse_matrix_value ();
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1096
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1097 dae.set_jacobian (&ida_spdfdy, &ida_spdfdyp,
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1098 ida_sparse_cell_jac);
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 else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1101 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1102 ida_dfdy = jaccell(0).matrix_value ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1103 ida_dfdyp = jaccell(1).matrix_value ();
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1104
0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1105 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	1106 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1107 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1108 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1109
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1110 // Initialize IDA
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1111 dae.initialize ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1112
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1113 // Set tolerances
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1114 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	1115
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1116 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	1117
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1118 if (haveabstolvec)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1119 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1120 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	1121
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1122 dae.set_tolerance (abs_tol, rel_tol);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1123 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1124 else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1125 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1126 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	1127
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1128 dae.set_tolerance (abs_tol, rel_tol);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1129 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1130
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1131 //Set max step
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1132 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	1133
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1134 dae.set_maxstep (maxstep);
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1135
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1136 //Set initial step
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23565 diff changeset	1137 if (! options.getfield("InitialStep").isempty ())
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1138 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1139 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	1140
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1141 dae.set_initialstep (initialstep);
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
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1144 //Set max order FIXME: it doesn't work
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1145 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	1146
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1147 dae.set_maxorder (maxorder);
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 //Set Refine
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1150 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	1151
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1152 bool haverefine = (refine > 1);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1153
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1154 octave_value output_fcn;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1155 ColumnVector outputsel;
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 // OutputFcn
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1158 bool haveoutputfunction
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1159 = options.getfield("haveoutputfunction").bool_value ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1160
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1161 if (haveoutputfunction)
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1162 output_fcn = options.getfield("OutputFcn");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1163
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1164 // OutputSel
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1165 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	1166
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1167 if (haveoutputsel)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1168 outputsel = options.getfield("OutputSel").vector_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1169
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1170 octave_value event_fcn;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1171
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1172 // Events
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1173 bool haveeventfunction
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1174 = options.getfield("haveeventfunction").bool_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1175
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1176 if (haveeventfunction)
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1177 event_fcn = options.getfield("Events");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1178
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1179 // 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	1180 dae.set_up (y0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1181
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1182 // Integrate
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1183 retval = dae.integrate (numt, tspan, y0, yp0, refine,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1184 haverefine, haveoutputfunction,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1185 output_fcn, haveoutputsel, outputsel,
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1186 haveeventfunction, event_fcn);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1187
23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1188 // Statistics
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1189 bool havestats = options.getfield("havestats").bool_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1190
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1191 if (havestats)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1192 dae.print_stat ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1193
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1194 return retval;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1195 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1196 }
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1197 #endif
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1198
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1199
22913 69342e4f0dcf * __ode15__.cc: Don't check nargout. John W. Eaton <jwe@octave.org> parents: 22912 diff changeset	1200 DEFUN_DLD (__ode15__, args, ,
69342e4f0dcf * __ode15__.cc: Don't check nargout. John W. Eaton <jwe@octave.org> parents: 22912 diff changeset	1201 doc: /* -- texinfo --
23565 3a730821e4a2 doc: Peridoc grammarcheck of documentation. Rik <rik@octave.org> parents: 23480 diff changeset	1202 @deftypefn {} {@var{t}, @var{y} =} __ode15__ (@var{fun}, @var{tspan}, @var{y0}, @var{yp0}, @var{options})
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1203 Undocumented internal function.
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1204 @end deftypefn */)
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
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1207 #if defined (HAVE_SUNDIALS)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1208
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1209 // Check number of parameters
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1210 int nargin = args.length ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1211
22913 69342e4f0dcf * __ode15__.cc: Don't check nargout. John W. Eaton <jwe@octave.org> parents: 22912 diff changeset	1212 if (nargin != 5)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1213 print_usage ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1214
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1215 // 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	1216 octave_value ida_fcn = args(0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1217
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1218 if (! ida_fcn.is_function_handle ())
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1219 error ("__ode15__: odefun must be a function handle");
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 // Check input tspan
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1222 ColumnVector tspan
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1223 = 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	1224
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1225 int numt = tspan.numel ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1226
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1227 realtype t0 = tspan (0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1228
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1229 if (numt < 2)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1230 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	1231 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	1232 error ("__ode15__: TRANGE must be strictly monotonic");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1233
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1234 // input y0 and yp0
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1235 ColumnVector y0
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1236 = 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	1237
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1238 ColumnVector yp0
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1239 = 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	1240
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1241
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1242 if (y0.numel () != yp0.numel ())
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1243 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	1244 else if (y0.numel () < 1)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1245 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	1246
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1247
23584 7ed6b258db91 maint: Deprecate is_map and replace with isstruct. Rik <rik@octave.org> parents: 23577 diff changeset	1248 if (! args(4).isstruct ())
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1249 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	1250
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1251 octave_scalar_map options
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1252 = 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	1253
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1254
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1255 return octave::do_ode15 (ida_fcn, tspan, numt, t0, y0, yp0, options);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1256
22901 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 #else
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 octave_unused_parameter (args);
22911 82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	1261
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1262 err_disabled_feature ("__ode15__", "sundials_ida, sundials_nvecserial");
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 #endif
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1265 }
26905 91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1266
91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1267 /*
91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1268 ## 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	1269 %!assert (1)
91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1270 */

Mercurial > octave

annotate libinterp/dldfcn/__ode15__.cc @ 27919:1891570abac8

annotate libinterp/dldfcn/ode15.cc @ 27919:1891570abac8