changeset 4917:4f39dbdea431

of-optiminterp: add dev 6.0 patch * src/of-optiminterp-1-dev-fixes.patch: new file * dist-files.mk: add ref to of-optiminterp-1-dev-fixes.patch
author John Donoghue
date Thu, 03 Jan 2019 09:02:52 -0500
parents 8b862c9f48ba
children 48b9473dd2ad
files dist-files.mk src/of-optiminterp-1-dev-fixes.patch
diffstat 2 files changed, 16 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Thu Jan 03 09:00:59 2019 -0500
+++ b/dist-files.mk	Thu Jan 03 09:02:52 2019 -0500
@@ -513,6 +513,7 @@
   of-odepkg.mk \
   of-optim-1-fixes.patch \
   of-optim.mk \
+  of-optiminterp-1-dev-fixes.patch \
   of-optiminterp.mk \
   of-quaternion-1-cross-fixes.patch \
   of-quaternion.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-optiminterp-1-dev-fixes.patch	Thu Jan 03 09:02:52 2019 -0500
@@ -0,0 +1,15 @@
+diff -ur optiminterp-0.3.5.orig/src/optiminterp.cc optiminterp-0.3.5/src/optiminterp.cc
+--- optiminterp-0.3.5.orig/src/optiminterp.cc	2019-01-02 14:57:31.522221800 -0500
++++ optiminterp-0.3.5/src/optiminterp.cc	2019-01-02 14:58:27.823641722 -0500
+@@ -130,11 +130,6 @@
+ 	    ( n,nf,gn,on,nparam,ox.fortran_vec(),of.fortran_vec(),ovar.fortran_vec(),
+               param.fortran_vec(),m,gx.fortran_vec(),gf.fortran_vec(),gvar.fortran_vec()));
+ 
+-  if (f77_exception_encountered) {
+-      error ("unrecoverable error in optiminterp");
+-      return retval;
+-  }
+-
+   gf = gf.transpose();
+ 
+   retval(0) = gf;