octave: libinterp/dldfcn/__ode15_

annotate libinterp/dldfcn/ode15.cc @ 31607:aac27ad79be6 stable

maint: Re-indent code after switch to using namespace macros. * build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc, __ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc, __pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc, debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc, dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h, error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h, oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc, syminfo.cc, syminfo.h, symrcm.cc, 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, time.cc, toplev.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc, gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc, 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-int.cc, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc, ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h, octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc, op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h, anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h, parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, 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.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc, pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.cc, pt-colon.h, pt-const.cc, 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.cc, 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.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h, idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h, aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h, gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc, lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h, oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h, randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, 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.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h, lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc, oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc, oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h: Re-indent code after switch to using namespace macros.

author	Rik <rik@octave.org>
date	Thu, 01 Dec 2022 18:02:15 -0800
parents	e88a07dec498
children	597f3ee61a48

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

Mercurial > octave

annotate libinterp/dldfcn/__ode15__.cc @ 31607:aac27ad79be6 stable

annotate libinterp/dldfcn/ode15.cc @ 31607:aac27ad79be6 stable