Changeset 1554 for ThirdParty/FilterSQP/trunk/filtersqp.patch

Timestamp:

May 20, 2010 12:24:36 PM (11 years ago)

Author:

andreasw

Message:

merging patch correction from stable/1.0 into trunk

Location:

ThirdParty/FilterSQP/trunk

Files:

• . (modified) (1 prop)
• filtersqp.patch (modified) (3 diffs)

ThirdParty/FilterSQP/trunk/filtersqp.patch

@@ -1 +1 @@
 diff -Naur source-orig/src/bqpd.f source/src/bqpd.f
---- source-orig/src/bqpd.f      2008-11-06 00:05:51.000000000 +0000
-+++ source/src/bqpd.f   2008-11-06 00:06:13.000000000 +0000
-@@ -437,6 +437,12 @@
+--- source-orig/src/bqpd.f      2006-12-20 10:17:53.000000000 -0500
++++ source/src/bqpd.f   2010-05-20 12:03:00.000000000 -0400
+@@ -434,6 +434,12 @@
+         if(lcyc(i).ne.lcyc(i+ncyc))goto16
        enddo
        gtol=1.D1*gtol
-       print *, 'gtol = ', gtol
 +      aaaa = 1.D0
 +      bbbb = 0.D0
@@ -16 +16 @@
  c     if(info(1).ge.90)stop
 diff -Naur source-orig/src/filter.f source/src/filter.f
---- source-orig/src/filter.f    2008-11-06 00:05:51.000000000 +0000
-+++ source/src/filter.f 2008-11-06 00:06:13.000000000 +0000
-@@ -442,6 +442,9 @@
+--- source-orig/src/filter.f    2006-12-20 10:17:53.000000000 -0500
++++ source/src/filter.f 2010-05-20 10:23:16.000000000 -0400
+@@ -447,6 +447,9 @@
  c     ... ensure that the initial point is feasible wrt linear c/s
        call linear_feasible (n, m, x, c, blo, bup, cstype, lin_feas)
@@ -29 +29 @@
           phi = f + hc
 diff -Naur source-orig/src/sparseL.f source/src/sparseL.f
---- source-orig/src/sparseL.f   2008-11-06 00:05:51.000000000 +0000
-+++ source/src/sparseL.f        2008-11-06 00:06:13.000000000 +0000
+--- source-orig/src/sparseL.f   2006-12-20 10:17:56.000000000 -0500
++++ source/src/sparseL.f        2010-05-20 10:30:58.000000000 -0400
 @@ -1701,6 +1701,7 @@
        common/epsc/eps,tol,emin