source: ThirdParty/FilterSQP/trunk/filtersqp.patch @ 1214

Last change on this file since 1214 was 1214, checked in by andreasw, 13 years ago

added patch for FilterSQP code

File size: 1.4 KB
RevLine 
[1214]1diff -Naur sources-orig/src/bqpd.f sources/src/bqpd.f
2--- sources-orig/src/bqpd.f     2008-11-06 00:05:51.000000000 +0000
3+++ sources/src/bqpd.f  2008-11-06 00:06:13.000000000 +0000
4@@ -437,6 +437,12 @@
5       enddo
6       gtol=1.D1*gtol
7       print *, 'gtol = ', gtol
8+      aaaa = 1.D0
9+      bbbb = 0.D0
10+      if (gtol .eq. aaaa/bbbb) then
11+        ifail = 8
12+        return
13+      endif
14    16 continue
15 c     if(info(1).ge.117)iprint=3
16 c     if(info(1).ge.90)stop
17diff -Naur sources-orig/src/filter.f sources/src/filter.f
18--- sources-orig/src/filter.f   2008-11-06 00:05:51.000000000 +0000
19+++ sources/src/filter.f        2008-11-06 00:06:13.000000000 +0000
20@@ -442,6 +442,9 @@
21 c     ... ensure that the initial point is feasible wrt linear c/s
22       call linear_feasible (n, m, x, c, blo, bup, cstype, lin_feas)
23       if (.not. lin_feas) then
24+         do i=1,n
25+            d(i) = 0.d0
26+         enddo
27          call objfun1(x,n,f,s,user,iuser,flag)
28          hc = h_one (m, c, blo(n1), bup(n1))
29          phi = f + hc
30diff -Naur sources-orig/src/sparseL.f sources/src/sparseL.f
31--- sources-orig/src/sparseL.f  2008-11-06 00:05:51.000000000 +0000
32+++ sources/src/sparseL.f       2008-11-06 00:06:13.000000000 +0000
33@@ -1701,6 +1701,7 @@
34       common/epsc/eps,tol,emin
35       common/noutc/nout
36       parameter (thresh=1.D-1,growth=1.D1)
37+      qr_ = 0
38 c     write(nout,*)'update_L:  p,q =',pp,qq
39       nup=nup+1
40       if(qq.gt.n)then
Note: See TracBrowser for help on using the repository browser.