source: ThirdParty/FilterSQP/branches/split/filtersqp.patch @ 1539

Last change on this file since 1539 was 1219, checked in by andreasw, 12 years ago

merged changeset 1218 into trunk
File size: 1.4 KB

  • src/bqpd.f 

    diff -Naur source-orig/src/bqpd.f source/src/bqpd.f
    old new  
    437437      enddo
    438438      gtol=1.D1*gtol
    439439      print *, 'gtol = ', gtol
     440      aaaa = 1.D0
     441      bbbb = 0.D0
     442      if (gtol .eq. aaaa/bbbb) then
     443        ifail = 8
     444        return
     445      endif
    440446   16 continue
    441447c     if(info(1).ge.117)iprint=3
    442448c     if(info(1).ge.90)stop

  • src/filter.f 

    diff -Naur source-orig/src/filter.f source/src/filter.f
    old new  
    442442c     ... ensure that the initial point is feasible wrt linear c/s
    443443      call linear_feasible (n, m, x, c, blo, bup, cstype, lin_feas)
    444444      if (.not. lin_feas) then
     445         do i=1,n
     446            d(i) = 0.d0
     447         enddo
    445448         call objfun1(x,n,f,s,user,iuser,flag)
    446449         hc = h_one (m, c, blo(n1), bup(n1))
    447450         phi = f + hc

  • src/sparseL.f 

    diff -Naur source-orig/src/sparseL.f source/src/sparseL.f
    old new  
    17011701      common/epsc/eps,tol,emin
    17021702      common/noutc/nout
    17031703      parameter (thresh=1.D-1,growth=1.D1)
     1704      qr_ = 0
    17041705c     write(nout,*)'update_L:  p,q =',pp,qq
    17051706      nup=nup+1
    17061707      if(qq.gt.n)then
Note: See TracBrowser for help on using the repository browser.