Changeset 1554 for ThirdParty/FilterSQP/trunk/filtersqp.patch
- Timestamp:
- May 20, 2010 12:24:36 PM (11 years ago)
- Location:
- ThirdParty/FilterSQP/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/FilterSQP/trunk
- Property svn:mergeinfo changed
/ThirdParty/FilterSQP/stable/1.0 merged: 1553
- Property svn:mergeinfo changed
-
ThirdParty/FilterSQP/trunk/filtersqp.patch
r1219 r1554 1 1 diff -Naur source-orig/src/bqpd.f source/src/bqpd.f 2 --- source-orig/src/bqpd.f 2008-11-06 00:05:51.000000000 +0000 3 +++ source/src/bqpd.f 2008-11-06 00:06:13.000000000 +0000 4 @@ -437,6 +437,12 @@ 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 5 6 enddo 6 7 gtol=1.D1*gtol 7 print *, 'gtol = ', gtol8 8 + aaaa = 1.D0 9 9 + bbbb = 0.D0 … … 16 16 c if(info(1).ge.90)stop 17 17 diff -Naur source-orig/src/filter.f source/src/filter.f 18 --- source-orig/src/filter.f 2008-11-06 00:05:51.000000000 +000019 +++ source/src/filter.f 2008-11-06 00:06:13.000000000 +000020 @@ -44 2,6 +442,9 @@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 @@ 21 21 c ... ensure that the initial point is feasible wrt linear c/s 22 22 call linear_feasible (n, m, x, c, blo, bup, cstype, lin_feas) … … 29 29 phi = f + hc 30 30 diff -Naur source-orig/src/sparseL.f source/src/sparseL.f 31 --- source-orig/src/sparseL.f 2008-11-06 00:05:51.000000000 +000032 +++ source/src/sparseL.f 2008-11-06 00:06:13.000000000 +000031 --- 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 33 33 @@ -1701,6 +1701,7 @@ 34 34 common/epsc/eps,tol,emin
Note: See TracChangeset
for help on using the changeset viewer.