Mercurial > octave-nkf

diff liboctave/DASSL.cc @ 3849:5266e351a19c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2001-11-02 04:50:09 by jwe]
author jwe
date Fri, 02 Nov 2001 04:50:10 +0000
parents b153b9fa7f1a
children 7da18459c08b
line wrap: on
line diff
--- a/liboctave/DASSL.cc	Mon Aug 13 17:26:42 2001 +0000
+++ b/liboctave/DASSL.cc	Fri Nov 02 04:50:10 2001 +0000
@@ -145,14 +145,17 @@
       tmp_state.elem (i) = state [i];
     }
 
-  tmp_delta = user_fun (tmp_state, tmp_deriv, time);
+  tmp_delta = user_fun (tmp_state, tmp_deriv, time, ires);
 
-  if (tmp_delta.length () == 0)
-    ires = -2;
-  else
+  if (ires >= 0)
     {
-      for (int i = 0; i < nn; i++)
-	delta [i] = tmp_delta.elem (i);
+      if (tmp_delta.length () == 0)
+	ires = -2;
+      else
+	{
+	  for (int i = 0; i < nn; i++)
+	    delta [i] = tmp_delta.elem (i);
+	}
     }
 
   return 0;
@@ -220,7 +223,9 @@
 
   if (! sanity_checked)
     {
-      ColumnVector res = (*user_fun) (x, xdot, t);
+      int ires = 0;
+
+      ColumnVector res = (*user_fun) (x, xdot, t, ires);
 
       if (res.length () != x.length ())
 	{