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

Last change on this file since 3293 was 1554, checked in by andreasw, 10 years ago

merging patch correction from stable/1.0 into trunk

File size: 1.4 KB
RevLine 
[1219]1diff -Naur source-orig/src/bqpd.f source/src/bqpd.f
[1554]2--- source-orig/src/bqpd.f      2006-12-20 10:17:53.000000000 -0500
3+++ source/src/bqpd.f   2010-05-20 12:03:00.000000000 -0400
4@@ -434,6 +434,12 @@
5         if(lcyc(i).ne.lcyc(i+ncyc))goto16
[1214]6       enddo
7       gtol=1.D1*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
[1219]17diff -Naur source-orig/src/filter.f source/src/filter.f
[1554]18--- source-orig/src/filter.f    2006-12-20 10:17:53.000000000 -0500
19+++ source/src/filter.f 2010-05-20 10:23:16.000000000 -0400
20@@ -447,6 +447,9 @@
[1214]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
[1219]30diff -Naur source-orig/src/sparseL.f source/src/sparseL.f
[1554]31--- source-orig/src/sparseL.f   2006-12-20 10:17:56.000000000 -0500
32+++ source/src/sparseL.f        2010-05-20 10:30:58.000000000 -0400
[1214]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.