octave: libinterp/dldfcn/__ode15_

annotate libinterp/dldfcn/ode15.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	610a85b0ff62
children	1daf8bfceac3

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
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	192
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	193 ~IDA ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	194 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	195 IDAFree (&m_mem);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	196 SUNLinSolFree (m_sunLinearSolver);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	197 SUNMatDestroy (m_sunJacMatrix);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	198 # if defined (HAVE_SUNDIALS_SUNCONTEXT)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	199 SUNContext_Free (&m_sunContext);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	200 # endif
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26909 diff changeset	201 }
22915 7766e3ef6c69 * __ode15__.cc: Avoid old-style cast warnings. John W. Eaton <jwe@octave.org> parents: 22914 diff changeset	202
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	203 IDA&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	204 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	205 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	206 m_jacfcn = j;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	207 m_ida_jac = jac;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	208 m_havejac = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	209 m_havejacfcn = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	210 m_havejacsparse = false;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	211
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	212 return *this;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	213 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	214
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	215 IDA&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	216 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	217 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	218 m_jacspfcn = j;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	219 m_ida_jac = jac;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	220 m_havejac = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	221 m_havejacfcn = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	222 m_havejacsparse = true;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	223
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	224 return *this;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	225 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	226
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	227 IDA&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	228 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	229 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	230 m_jacdcell = j;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	231 m_dfdy = dy;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	232 m_dfdyp = dyp;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	233 m_havejac = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	234 m_havejacfcn = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	235 m_havejacsparse = false;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	236
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	237 return *this;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	238 }
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	239
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	240 IDA&
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	241 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	242 DAEJacCellSparse j)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	243 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	244 m_jacspcell = j;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	245 m_spdfdy = dy;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	246 m_spdfdyp = dyp;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	247 m_havejac = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	248 m_havejacfcn = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	249 m_havejacsparse = true;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	250
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	251 return *this;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	252 }
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	253
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	254 void set_userdata ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	255
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	256 void initialize ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	257
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	258 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	259
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 29969 diff changeset	260 # 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	261 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	262 # else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	263 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	264 # endif
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	265
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	266 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	267 set_up (const ColumnVector& y);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	268
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	269 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	270 set_tolerance (ColumnVector& abstol, realtype reltol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	271
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	272 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	273 set_tolerance (realtype abstol, realtype reltol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	274
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	275 static int
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	276 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	277 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	278
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	279 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	280 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	281 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	282 static int
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	283 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	284 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	285 N_Vector, N_Vector)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	286 {
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	287 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	288 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	289 return 0;
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	290 }
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 void
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	293 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	294 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	295
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	296 # 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	297 static int
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	298 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	299 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	300 N_Vector, N_Vector)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	301 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	302 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	303 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	304 return 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	305 }
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 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	308 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	309 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	310 # endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	311
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	312 void set_maxstep (realtype maxstep);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	313
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	314 void set_initialstep (realtype initialstep);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	315
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	316 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	317 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	318 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	319 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	320 ColumnVector& outputsel, bool haveeventfunction,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	321 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	322 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	323 ColumnVector& oldisterminal, ColumnVector& olddir,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	324 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	325 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	326
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	327 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	328 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	329 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	330 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	331
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 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	334 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	335 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	336 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	337 const ColumnVector& yp, ColumnVector& oldval,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	338 ColumnVector& oldisterminal, ColumnVector& olddir,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	339 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	340 ColumnVector& yold,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	341 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	342
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	343 void set_maxorder (int maxorder);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	344
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	345 octave_value_list
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	346 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	347 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	348 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	349 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	350 ColumnVector& outputsel, bool haveeventfunction,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	351 const octave_value& event_fcn,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	352 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	353
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	354 void print_stat ();
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	355
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	356 private:
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	357
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	358 realtype m_t0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	359 ColumnVector m_y0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	360 ColumnVector m_yp0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	361 bool m_havejac;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	362 bool m_havejacfcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	363 bool m_havejacsparse;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	364 void *m_mem;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	365 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	366 octave_value m_ida_fcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	367 octave_value m_ida_jac;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	368 Matrix *m_dfdy;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	369 Matrix *m_dfdyp;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	370 SparseMatrix *m_spdfdy;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	371 SparseMatrix *m_spdfdyp;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	372 DAERHSFuncIDA m_fcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	373 DAEJacFuncDense m_jacfcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	374 DAEJacFuncSparse m_jacspfcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	375 DAEJacCellDense m_jacdcell;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	376 DAEJacCellSparse m_jacspcell;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	377 # if defined (HAVE_SUNDIALS_SUNCONTEXT)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	378 SUNContext m_sunContext;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	379 # endif
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	380 SUNMatrix m_sunJacMatrix;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	381 SUNLinearSolver m_sunLinearSolver;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	382 };
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 int
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	385 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	386 void *user_data)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	387 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	388 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	389 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	390 return 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	391 }
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 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	394 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	395 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	396 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	397 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	398
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	399 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	400
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	401 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	402
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	403 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	404
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	405 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	406 puntrr[i] = res(i);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	407 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	408
30547 b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 29969 diff changeset	409 # 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	410 # 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	411 # else
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 29969 diff changeset	412 # 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	413 # endif
b876de975edf __ode15__: Adapt for changed API of SUNDIALS version 6 (bug #61701). Markus Mützel <markus.muetzel@gmx.de> parents: 29969 diff changeset	414
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	415 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	416 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	417 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	418 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	419
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	420 if (m_havejacsparse)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	421 {
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	422 # 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	423 # 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	424 // 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	425 // 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	426 // entries.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	427 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	428 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	429 # else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	430 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	431 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	432 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	433
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	434 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	435 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	436 # endif
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	437 if (! m_sunJacMatrix)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	438 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	439
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	440 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	441 OCTAVE_SUNCONTEXT);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	442 if (! m_sunLinearSolver)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	443 error ("Unable to create KLU sparse solver");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	444
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	445 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	446 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	447
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	448 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	449
23022 305cdc1d444b * __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing. John W. Eaton <jwe@octave.org> parents: 22919 diff changeset	450 # else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	451 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	452 "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	453
23022 305cdc1d444b * __ode15__.cc: Disable sparse jacobian handling if IDAKLU is missing. John W. Eaton <jwe@octave.org> parents: 22919 diff changeset	454 # 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	455
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	456 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	457 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	458 {
26893 25284d620919 Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475). Bill Greene <w.h.greene@gmail.com> parents: 26392 diff changeset	459
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	460 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	461 if (! m_sunJacMatrix)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	462 error ("Unable to create dense Jacobian for Sundials");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	463
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	464 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	465 OCTAVE_SUNCONTEXT);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	466 if (! m_sunLinearSolver)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	467 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	468
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	469 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	470 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	471
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	472 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	473 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	474
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	475 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	476 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	477
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	478 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	479 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	480 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	481
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	482 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	483 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	484
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	485 ColumnVector y = NVecToCol (yy, Neq);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	486
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	487 ColumnVector yp = NVecToCol (yyp, Neq);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	488
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	489 Matrix jac;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	490
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	491 if (m_havejacfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	492 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	493 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	494 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	495
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	496 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	497 std::copy (jac.fortran_vec (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	498 jac.fortran_vec () + num_jac,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	499 SUNDenseMatrix_Data (JJ));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	500 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	501
26894 ee6300e77c92 Update detection of sundials in the build system (bug #52475). Carlo de Falco <carlo.defalco@polimi.it> parents: 26893 diff changeset	502 # 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	503 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	504 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	505 SUNMatrix& Jac)
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	506
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	507 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	508 ColumnVector y = NVecToCol (yy, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	509
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	510 ColumnVector yp = NVecToCol (yyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	511
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	512 SparseMatrix jac;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	513
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	514 if (m_havejacfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	515 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	516 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	517 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	518
28741 2cd4a32cbc4b maint: Change "#if" indentation for consistency in __ode15__.cc. Rik <rik@octave.org> parents: 28739 diff changeset	519 # 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	520 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	521 if (nnz > SUNSparseMatrix_NNZ (Jac))
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	522 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	523 // 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	524 // This will always be required at least once since we set the number
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	525 // of non-zero elements to zero initially.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	526 if (SUNSparseMatrix_Reallocate (Jac, nnz))
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	527 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	528 }
28741 2cd4a32cbc4b maint: Change "#if" indentation for consistency in __ode15__.cc. Rik <rik@octave.org> parents: 28739 diff changeset	529 # endif
28739 3eb2fab71028 Allocate memory for Jacobian in __ode15__ more efficiently (bug #55905). Bill Greene <w.h.greene@gmail.com> parents: 28716 diff changeset	530
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	531 SUNMatZero_Sparse (Jac);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	532 // 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	533 // 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	534 sunindextype *colptrs = SUNSparseMatrix_IndexPointers (Jac);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	535 sunindextype *rowvals = SUNSparseMatrix_IndexValues (Jac);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	536
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	537 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	538 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	539
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	540 double *d = SUNSparseMatrix_Data (Jac);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	541 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	542 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	543 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	544 d[i] = jac.data (i);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	545 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	546 }
26898 d94876e7a0aa Remove calls to deprecated sundials functions. Carlo de Falco <carlo.defalco@polimi.it> parents: 26897 diff changeset	547 # endif
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	548
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	549 ColumnVector
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	550 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	551 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	552 ColumnVector data (n);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	553 realtype *punt = nv_data_s (v);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	554
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	555 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	556 data(i) = punt[i];
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	557
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	558 return data;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	559 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	560
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	561 N_Vector
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	562 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	563 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	564 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	565
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	566 realtype *punt = nv_data_s (v);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	567
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	568 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	569 punt[i] = data(i);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	570
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	571 return v;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	572 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	573
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	574 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	575 IDA::set_userdata ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	576 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	577 void *userdata = this;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	578
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	579 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	580 error ("User data not set");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	581 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	582
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	583 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	584 IDA::initialize ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	585 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	586 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	587 # 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	588 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	589 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	590 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	591 # else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	592 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	593 # endif
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	594
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	595 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	596
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	597 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	598
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	599 IDA::set_userdata ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	600
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	601 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	602 error ("IDA not initialized");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	603 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	604
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	605 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	606 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	607 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	608 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	609
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	610 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	611 error ("IDA: Tolerance not set");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	612
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	613 N_VDestroy_Serial (abs_tol);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	614 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	615
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	616 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	617 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	618 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	619 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	620 error ("IDA: Tolerance not set");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	621 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	622
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	623 octave_value_list
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	624 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	625 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	626 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	627 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	628 ColumnVector& outputsel, bool haveeventfunction,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	629 const octave_value& event_fcn,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	630 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	631 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	632 // Set up output
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	633 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	634 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	635 Matrix output, ye;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	636 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	637 bool status = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	638 std::string string = "";
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	639 ColumnVector yold = y;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	640
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	641 realtype tsol = tspan(0);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	642 realtype tend = tspan(numt-1);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	643
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	644 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	645
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	646 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	647
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	648 // Initialize OutputFcn
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	649 if (haveoutputfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	650 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	651 tsol, tend, outputsel, "init");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	652
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	653 // Initialize Events
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	654 if (haveeventfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	655 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	656 "init", yp, oldval, oldisterminal,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	657 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	658
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	659 if (numt > 2)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	660 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	661 // First output value
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	662 tout.resize (numt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	663 tout(0) = tsol;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	664 output.resize (numt, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	665
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	666 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	667 output.elem (0, i) = y.elem (i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	668
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	669 //Main loop
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	670 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	671 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	672 // IDANORMAL already interpolates tspan(j)
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	673
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	674 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	675 error ("IDASolve failed");
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	676
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	677 yout = NVecToCol (yy, m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	678 ypout = NVecToCol (yyp, m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	679 tout(j) = tsol;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	680
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	681 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	682 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	683
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	684 if (haveoutputfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	685 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	686 tend, outputsel, string);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	687
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	688 if (haveeventfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	689 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	690 string, ypout, oldval, oldisterminal,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	691 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	692 num_event_args);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	693
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	694 // 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	695 if (status == 1)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	696 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	697 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	698 tout.resize (j + 1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	699 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	700
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	701 }
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 else // numel (tspan) == 2
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	704 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	705 // First output value
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	706 tout.resize (1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	707 tout(0) = tsol;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	708 output.resize (1, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	709
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	710 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	711 output.elem (0, i) = y.elem (i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	712
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	713 bool posdirection = (tend > tsol);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	714
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	715 //main loop
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	716 while (((posdirection == 1 && tsol < tend)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	717 \|\| (posdirection == 0 && tsol > tend))
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	718 && status == 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	719 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	720 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	721 error ("IDASolve failed");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	722
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	723 if (haverefine)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	724 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	725 haveoutputfcn, haveoutputsel,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	726 output_fcn, outputsel,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	727 haveeventfunction, event_fcn, te,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	728 ye, ie, oldval, oldisterminal,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	729 olddir, temp, yold,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	730 num_event_args);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	731
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	732 ypout = NVecToCol (yyp, m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	733 cont += 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	734 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	735 tout.resize (cont + 1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	736 tout(cont) = tsol;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	737 yout = NVecToCol (yy, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	738
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	739 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	740 output.elem (cont, i) = yout.elem (i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	741
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	742 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	743 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	744 tend, outputsel, string);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	745
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	746 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	747 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	748 string, ypout, oldval, oldisterminal,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	749 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	750 num_event_args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	751 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	752
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	753 if (status == 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	754 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	755 // Interpolate in tend
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	756 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	757
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	758 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	759 error ("IDA failed to interpolate y");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	760
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	761 tout(cont) = tend;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	762 yout = NVecToCol (dky, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	763
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	764 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	765 output.elem (cont, i) = yout.elem (i);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	766
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	767 // Plot final value
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	768 if (haveoutputfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	769 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	770 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	771 tend, tend, outputsel, string);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	772
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	773 // Events during last step
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	774 if (haveeventfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	775 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	776 string, ypout, oldval, oldisterminal,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	777 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	778 yold, num_event_args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	779 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	780
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	781 N_VDestroy_Serial (dky);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	782 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	783
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	784 // Cleanup plotter
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	785 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	786 outputsel, "done");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	787
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	788 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	789
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	790 // 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	791 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	792 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	793
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	794 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	795 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	796 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	797 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	798 const ColumnVector& yp, ColumnVector& oldval,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	799 ColumnVector& oldisterminal, ColumnVector& olddir,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	800 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	801 ColumnVector& yold,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	802 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	803 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	804 bool status = false;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	805
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	806 octave_value_list args;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	807 if (num_event_args == 2)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	808 args = ovl (tsol, y);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	809 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	810 args = ovl (tsol, y, yp);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	811
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	812 // 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	813 // temp is the number of events registered
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	814
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	815 interpreter& interp = __get_interpreter__ ();
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	816
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	817 if (flag == "init")
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	818 {
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	819 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	820 oldval = output(0).vector_value ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	821 oldisterminal = output(1).vector_value ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	822 olddir = output(2).vector_value ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	823 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	824 else if (flag == "")
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	825 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	826 ColumnVector index (0);
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	827 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	828 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	829 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	830 ColumnVector dir = output(2).vector_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	831
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	832 // 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	833 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	834 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	835 // 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	836 // 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	837 if ((dir(i) != -1
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	838 && ((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	839 \|\| (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	840 \|\| (dir(i) != 1
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	841 && ((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	842 \|\| (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	843 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	844 index.resize (index.numel () + 1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	845 index (index.numel () - 1) = i;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	846 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	847 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	848
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	849 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	850 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	851 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	852 te.resize (1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	853 ye.resize (1, m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	854 ie.resize (1);
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	855
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	856 // Linear interpolation
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	857 ie(0) = index(0);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	858 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	859 / (val (index(0)) - oldval (index(0)));
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	860
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	861 ColumnVector ytemp
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	862 = 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	863
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	864 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	865 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	866
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	867 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	868 else if (index.numel () > 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	869 // 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	870 // if stop integration or not
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	871 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	872 te.resize (temp + index.numel ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	873 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	874 ie.resize (temp + index.numel ());
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	875
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	876 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	877 {
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	878
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	879 if (isterminal (index(i)) == 1)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	880 status = 1; // Stop integration
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	881
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	882 // Linear interpolation
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	883 ie(temp+i) = index(i);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	884 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	885 / (val(index(i)) - oldval(index(i)));
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	886
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	887 ColumnVector ytemp
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	888 = 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	889
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	890 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	891 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	892
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	893 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	894
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	895 temp += index.numel ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	896 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	897
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	898 // Update variables
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	899 yold = y;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	900 told = tsol;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	901 olddir = dir;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	902 oldval = val;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	903 oldisterminal = isterminal;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	904 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	905
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	906 return status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	907 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	908
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	909 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	910 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	911 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	912 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	913 ColumnVector& outputsel, bool haveeventfunction,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	914 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	915 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	916 ColumnVector& oldisterminal, ColumnVector& olddir,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	917 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	918 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	919 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	920 realtype h = 0, tcur = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	921 bool status = false;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	922
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	923 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	924
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	925 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	926
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	927 ColumnVector yout (m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	928 ColumnVector ypout (m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	929 std::string string = "";
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	930
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	931 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	932 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	933
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	934 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	935 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	936
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	937 realtype tin = tcur - h;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	938
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	939 realtype step = h / refine;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	940
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	941 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	942 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	943 i++)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	944 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	945 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	946 error ("IDA failed to interpolate y");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	947
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	948 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	949 error ("IDA failed to interpolate yp");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	950
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	951 cont += 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	952 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	953 tout.resize (cont + 1);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	954
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	955 tout(cont) = tin + step * i;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	956 yout = NVecToCol (dky, m_num);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	957 ypout = NVecToCol (dkyp, m_num);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	958
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	959 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	960 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	961
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	962 if (haveoutputfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	963 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	964 tout(cont), tend, outputsel, "");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	965
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	966 if (haveeventfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	967 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	968 yout, string, ypout, oldval,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	969 oldisterminal, olddir, cont, temp,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	970 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	971 }
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	972
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	973 N_VDestroy_Serial (dky);
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	974
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	975 return status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	976 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	977
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	978 bool
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	979 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	980 const ColumnVector& yout, realtype tsol,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	981 realtype tend, ColumnVector& outputsel,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	982 const std::string& flag)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	983 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	984 bool status = false;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	985
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	986 octave_value_list output;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	987 output(2) = flag;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	988
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	989 ColumnVector ysel (outputsel.numel ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	990 if (haveoutputsel)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	991 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	992 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	993 ysel(i) = yout(outputsel(i));
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	994
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	995 output(1) = ysel;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	996 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	997 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	998 output(1) = yout;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	999
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1000 interpreter& interp = __get_interpreter__ ();
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1001
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1002 if (flag == "init")
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1003 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1004 ColumnVector toutput (2);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1005 toutput(0) = tsol;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1006 toutput(1) = tend;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1007 output(0) = toutput;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1008
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1009 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	1010 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1011 else if (flag == "")
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1012 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1013 output(0) = tsol;
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1014 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	1015 status = val(0).bool_value ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1016 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1017 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1018 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1019 // Cleanup plotter
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1020 output(0) = tend;
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1021 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	1022 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1023
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1024 return status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1025 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1026
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1027 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1028 IDA::set_maxstep (realtype maxstep)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1029 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1030 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	1031 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	1032 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1033
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1034 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1035 IDA::set_initialstep (realtype initialstep)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1036 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1037 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	1038 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	1039 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1040
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1041 void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1042 IDA::set_maxorder (int maxorder)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1043 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1044 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	1045 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	1046 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1047
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1048 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31730 diff changeset	1049 IDA::print_stat ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1050 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1051 long int nsteps = 0, netfails = 0, nrevals = 0;
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1052
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1053 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	1054 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	1055
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1056 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	1057 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	1058
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1059 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	1060 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	1061
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1062 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	1063 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	1064 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	1065 // octave_stdout << " partial derivatives\n";
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1066 // octave_stdout << " LU decompositions\n";
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1067 // 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	1068 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1069
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1070 static ColumnVector
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1071 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	1072 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	1073 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1074 octave_value_list tmp;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1075
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1076 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1077 {
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1078 interpreter& interp = __get_interpreter__ ();
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1079
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1080 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	1081 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1082 catch (execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1083 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1084 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	1085 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1086
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1087 return tmp(0).vector_value ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1088 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1089
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1090 static Matrix
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1091 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	1092 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	1093 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1094 octave_value_list tmp;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1095
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1096 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1097 {
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1098 interpreter& interp = __get_interpreter__ ();
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1099
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1100 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	1101 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1102 catch (execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1103 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1104 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	1105 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1106
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1107 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	1108 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1109
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1110 static SparseMatrix
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1111 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	1112 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	1113 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1114 octave_value_list tmp;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1115
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1116 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1117 {
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1118 interpreter& interp = __get_interpreter__ ();
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1119
610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1120 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	1121 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1122 catch (execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1123 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1124 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	1125 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1126
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1127 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	1128 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1129
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1130 static Matrix
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1131 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	1132 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1133 return (dfdy) + cj (*dfdyp);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1134 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1135
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1136 static SparseMatrix
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1137 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	1138 double cj)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1139 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1140 return (spdfdy) + cj (*spdfdyp);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1141 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1142
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1143 static octave_value_list
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1144 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	1145 const ColumnVector& tspan,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1146 const octave_idx_type numt,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1147 const realtype t0,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1148 const ColumnVector& y0,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1149 const ColumnVector& yp0,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1150 const octave_scalar_map& options,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1151 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	1152 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1153 octave_value_list retval;
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1154
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1155 // Create object
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1156 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	1157
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1158 // Set Jacobian
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1159 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	1160
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1161 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	1162
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1163 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	1164
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1165 Matrix ida_dfdy, ida_dfdyp;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1166 SparseMatrix ida_spdfdy, ida_spdfdyp;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1167
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1168 if (havejac)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1169 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1170 if (havejacfcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1171 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1172 octave_value ida_jac = options.getfield ("Jacobian");
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1173
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1174 if (havejacsparse)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1175 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	1176 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1177 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	1178 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1179 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1180 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1181 Cell jaccell = options.getfield ("Jacobian").cell_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1182
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1183 if (havejacsparse)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1184 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1185 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	1186 ida_spdfdyp = jaccell(1).sparse_matrix_value ();
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1187
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1188 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	1189 ida_sparse_cell_jac);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1190 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1191 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1192 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1193 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	1194 ida_dfdyp = jaccell(1).matrix_value ();
27182 0beeb6817376 __ode15__.cc style fixes John W. Eaton <jwe@octave.org> parents: 27108 diff changeset	1195
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1196 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	1197 }
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 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1200
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1201 // Initialize IDA
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1202 dae.initialize ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1203
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1204 // Set tolerances
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1205 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	1206
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1207 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	1208
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1209 if (haveabstolvec)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1210 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1211 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	1212
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1213 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	1214 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1215 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1216 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1217 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	1218
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1219 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	1220 }
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1221
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1222 //Set max step
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1223 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	1224
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1225 dae.set_maxstep (maxstep);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1226
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1227 //Set initial step
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1228 if (! options.getfield ("InitialStep").isempty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1229 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1230 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	1231
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1232 dae.set_initialstep (initialstep);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1233 }
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1234
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1235 //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	1236 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	1237
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1238 dae.set_maxorder (maxorder);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1239
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1240 //Set Refine
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1241 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	1242
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1243 bool haverefine = (refine > 1);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1244
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1245 octave_value output_fcn;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1246 ColumnVector outputsel;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1247
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1248 // OutputFcn
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1249 bool haveoutputfunction
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1250 = options.getfield ("haveoutputfunction").bool_value ();
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1251
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1252 if (haveoutputfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1253 output_fcn = options.getfield ("OutputFcn");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1254
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1255 // OutputSel
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1256 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	1257
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1258 if (haveoutputsel)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1259 outputsel = options.getfield ("OutputSel").vector_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1260
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1261 octave_value event_fcn;
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1262
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1263 // Events
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1264 bool haveeventfunction
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1265 = options.getfield ("haveeventfunction").bool_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1266
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1267 if (haveeventfunction)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1268 event_fcn = options.getfield ("Events");
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1269
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1270 // Set up linear solver
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1271 dae.set_up (y0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1272
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1273 // Integrate
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1274 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	1275 haverefine, haveoutputfunction,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1276 output_fcn, haveoutputsel, outputsel,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1277 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	1278
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1279 // Statistics
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1280 bool havestats = options.getfield ("havestats").bool_value ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1281
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1282 if (havestats)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1283 dae.print_stat ();
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1284
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1285 return retval;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1286 }
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1287
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1288 #endif
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1289
22913 69342e4f0dcf * __ode15__.cc: Don't check nargout. John W. Eaton <jwe@octave.org> parents: 22912 diff changeset	1290 DEFUN_DLD (__ode15__, args, ,
69342e4f0dcf * __ode15__.cc: Don't check nargout. John W. Eaton <jwe@octave.org> parents: 22912 diff changeset	1291 doc: /* -- texinfo --
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1292 @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	1293 Undocumented internal function.
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1294 @end deftypefn */)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1295 {
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1296
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1297 #if defined (HAVE_SUNDIALS)
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1298
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1299 // 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	1300 if (args.length () != 6)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1301 print_usage ();
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1302
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1303 // 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	1304 octave_value ida_fcn = args(0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1305
26907 1d3730539776 use octave_value instead of pointer to octave_function in __ode15__ John W. Eaton <jwe@octave.org> parents: 26905 diff changeset	1306 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	1307 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	1308
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1309 // Check input tspan
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1310 ColumnVector tspan
c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1311 = 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	1312
28716 9beec32ba3d6 Overhaul usage of integer types in __ode15__.cc (bug #58795). Markus Mützel <markus.muetzel@gmx.de> parents: 28709 diff changeset	1313 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	1314
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1315 realtype t0 = tspan(0);
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1316
22910 23847979b91e maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 22903 diff changeset	1317 if (numt < 2)
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1318 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	1319 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	1320 error ("__ode15__: TRANGE must be strictly monotonic");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1321
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1322 // input y0 and yp0
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1323 ColumnVector y0
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1324 = 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	1325
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1326 ColumnVector yp0
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1327 = 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	1328
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 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	1331 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	1332 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	1333 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	1334
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1335
23584 7ed6b258db91 maint: Deprecate is_map and replace with isstruct. Rik <rik@octave.org> parents: 23577 diff changeset	1336 if (! args(4).isstruct ())
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1337 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	1338
22917 c1ac4ac3ebbc * __ode15__.cc: Style fixes. John W. Eaton <jwe@octave.org> parents: 22915 diff changeset	1339 octave_scalar_map options
30896 c9788d7f6e65 maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. Rik <rik@octave.org> parents: 30565 diff changeset	1340 = 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	1341
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	1342 // 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	1343 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	1344 = 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	1345
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	1346 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	1347 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	1348
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29960 diff changeset	1349 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	1350
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1351 #else
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1352
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1353 octave_unused_parameter (args);
22911 82551783527f * __ode15__.cc: Fix compilation if Sundials is missing. John W. Eaton <jwe@octave.org> parents: 22910 diff changeset	1354
22901 4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1355 err_disabled_feature ("__ode15__", "sundials_ida, sundials_nvecserial");
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1356
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1357 #endif
4c56f3ffec04 Add functions ode15i and ode15s Francesco Faccio <francesco.faccio@mail.polimi.it> parents: diff changeset	1358 }
26905 91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1359
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 ## 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	1362 %!assert (1)
91e5d37aaba0 __ode15__.cc: mark internal function as tested for BIST purposes Mike Miller <mtmiller@octave.org> parents: 26903 diff changeset	1363 */
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29445 diff changeset	1364
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31603 diff changeset	1365 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/dldfcn/__ode15__.cc @ 31771:21f9b34eb893

annotate libinterp/dldfcn/ode15.cc @ 31771:21f9b34eb893