comparison liboctave/DASPK.h @ 11502:4638800cd660

delete data pointer members from liboctave ODE/DAE classes; make destuctors virtual in ODE/DAE base classes
author John W. Eaton <jwe@octave.org>
date Thu, 13 Jan 2011 03:16:40 -0500
parents cbc402e64d83
children fd0a3ac60b0e
comparison
equal deleted inserted replaced
11501:331fcc41ca23 11502:4638800cd660
33 OCTAVE_API 33 OCTAVE_API
34 DASPK : public DAE, public DASPK_options 34 DASPK : public DAE, public DASPK_options
35 { 35 {
36 public: 36 public:
37 37
38 DASPK (void) : DAE (), DASPK_options (), initialized (false) { } 38 DASPK (void)
39 : DAE (), DASPK_options (), initialized (false), liw (0), lrw (0),
40 info (), iwork (), rwork (), abs_tol (), rel_tol () { }
39 41
40 DASPK (const ColumnVector& s, double tm, DAEFunc& f) 42 DASPK (const ColumnVector& s, double tm, DAEFunc& f)
41 : DAE (s, tm, f), DASPK_options (), initialized (false) { } 43 : DAE (s, tm, f), DASPK_options (), initialized (false), liw (0),
44 lrw (0), info (), iwork (), rwork (), abs_tol (), rel_tol () { }
42 45
43 DASPK (const ColumnVector& s, const ColumnVector& deriv, 46 DASPK (const ColumnVector& s, const ColumnVector& deriv,
44 double tm, DAEFunc& f) 47 double tm, DAEFunc& f)
45 : DAE (s, deriv, tm, f), DASPK_options (), initialized (false) { } 48 : DAE (s, deriv, tm, f), DASPK_options (), initialized (false),
49 liw (0), lrw (0), info (), iwork (), rwork (), abs_tol (),
50 rel_tol () { }
46 51
47 ~DASPK (void) { } 52 ~DASPK (void) { }
48 53
49 ColumnVector do_integrate (double t); 54 ColumnVector do_integrate (double t);
50 55
71 76
72 Array<double> rwork; 77 Array<double> rwork;
73 78
74 Array<double> abs_tol; 79 Array<double> abs_tol;
75 Array<double> rel_tol; 80 Array<double> rel_tol;
76
77 double *px;
78 double *pxdot;
79 double *pabs_tol;
80 double *prel_tol;
81 octave_idx_type *pinfo;
82 octave_idx_type *piwork;
83 double *prwork;
84 }; 81 };
85 82
86 #endif 83 #endif