# HG changeset patch
# User jwe
# Date 1022179213 0
# Node ID 8194e0b10a9a316da19ffc4cabca55d5abb05e0c
# Parent  3a8de88328af637cf4dea1bfcb0e5dca0c06e2fb
[project @ 2002-05-23 18:40:13 by jwe]

diff --git a/liboctave/ChangeLog b/liboctave/ChangeLog
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,5 +1,8 @@
 2002-05-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* LSODE.cc (LSODE::do_integrate): Define method flag and iopt
+	here, not as class data members.	
+
 	* LSODE.h (LSODE_options::x_absolute_tolerance): Now Array<double>.
 	Change all uses.
 	(LSODE_OPTIONS::absolute_tolerance): Return Array<double>, not double.
diff --git a/liboctave/LSODE.cc b/liboctave/LSODE.cc
--- a/liboctave/LSODE.cc
+++ b/liboctave/LSODE.cc
@@ -66,7 +66,6 @@
 
   istate = 1;
   itask = 1;
-  iopt = 0;
 
   liw = 20 + n;
   lrw = 22 + n * (9 + n);
@@ -87,7 +86,6 @@
 
   istate = 1;
   itask = 1;
-  iopt = 0;
 
   liw = 20 + n;
   lrw = 22 + n * (9 + n);
@@ -183,10 +181,8 @@
 	rwork.elem (i) = 0;
     }
 
-  if (jac)
-    method_flag = 21;
-  else
-    method_flag = 22;
+  int method_flag = jac ? 21 : 22;
+  int iopt = 0;
 
   integration_error = 0;
 
diff --git a/liboctave/LSODE.h b/liboctave/LSODE.h
--- a/liboctave/LSODE.h
+++ b/liboctave/LSODE.h
@@ -165,12 +165,10 @@
   int n;
   int integration_error;
   int restart;
-  int method_flag;
   Array<int> iwork;
   Array<double> rwork;
   int istate;
   int itask;
-  int iopt;
   int liw;
   int lrw;
   int sanity_checked;