octave: libinterp/dldfcn/__ode15_

annotate libinterp/dldfcn/ode15.cc @ 31898:0db880f38b1f

maint: Use "nonzero" rather than "non-zero" in code base. * file-editor-tab.cc, __ichol__.cc, interpreter.cc, mex.cc, oct-stream.cc, __ode15__.cc, ov-base-diag.cc, ov-base-mat.cc, ov-perm.cc, parse.h, CDiagMatrix.cc, Range.cc, dDiagMatrix.cc, dec2bin.m, dec2hex.m: Use "nonzero" rather than "non-zero" in code base.

author	Rik <rik@octave.org>
date	Wed, 08 Mar 2023 09:28:28 -0800
parents	1daf8bfceac3
children	2e484f9f1f18

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

Mercurial > octave

annotate libinterp/dldfcn/__ode15__.cc @ 31898:0db880f38b1f

annotate libinterp/dldfcn/ode15.cc @ 31898:0db880f38b1f