New changes from l2g

w

dataassim/math/optimization/lbfgsroutines.f

@@ -192,7 +192,7 @@ c     ************
  
       integer   l1,l2,l3,lws,lr,lz,lt,ld,lwa,lwy,lsy,lss,lwt,lwn,lsnd
 
-      if (task .eq. 'START') then
+      if (task .eqv. 'START') then
          isave(1)  = m*n
          isave(2)  = m**2
          isave(3)  = 4*m**2
@@ -442,7 +442,7 @@ c     ************
       double precision one,zero
       parameter        (one=1.0d0,zero=0.0d0)
       
-      if (task .eq. 'START') then
+      if (task .eqv. 'START') then
 
          call timer(time1)
 
@@ -508,7 +508,7 @@ c                                open a summary file 'iterate.dat'
 c        Check the input arguments for errors.
 
          call errclb(n,m,factr,l,u,nbd,task,info,k)
-         if (task(1:5) .eq. 'ERROR') then
+         if (task(1:5) .eqv. 'ERROR') then
             call prn3lb(n,x,f,task,iprint,info,itfile,
      +                  iter,nfgv,nintol,nskip,nact,sbgnrm,
      +                  zero,nint,word,iback,stp,xstep,k,
@@ -571,11 +571,11 @@ c          restore local variables.
 c        After returning from the driver go to the point where execution
 c        is to resume.
 
-         if (task(1:5) .eq. 'FG_LN') goto 666
-         if (task(1:5) .eq. 'NEW_X') goto 777
-         if (task(1:5) .eq. 'FG_ST') goto 111
-         if (task(1:4) .eq. 'STOP') then
-            if (task(7:9) .eq. 'CPU') then
+         if (task(1:5) .eqv. 'FG_LN') goto 666
+         if (task(1:5) .eqv. 'NEW_X') goto 777
+         if (task(1:5) .eqv. 'FG_ST') goto 111
+         if (task(1:4) .eqv. 'STOP') then
+            if (task(7:9) .eqv. 'CPU') then
 c                                          restore the previous iterate.
                call dcopy(n,t,1,x,1)
                call dcopy(n,r,1,g,1)
@@ -771,7 +771,7 @@ c             refresh the lbfgs memory and restart the iteration.
             lnscht = lnscht + cpu2 - cpu1
             goto 222
          endif
-      else if (task(1:5) .eq. 'FG_LN') then
+      else if (task(1:5) .eqv. 'FG_LN') then
 c          return to the driver for calculating f and g; reenter at 666.
          goto 1000
       else 
@@ -2444,7 +2444,7 @@ c     **********
       double precision ftol,gtol,xtol
       parameter        (ftol=1.0d-3,gtol=0.9d0,xtol=0.1d0)
 
-      if (task(1:5) .eq. 'FG_LN') goto 556
+      if (task(1:5) .eqv. 'FG_LN') goto 556
 
       dtd = ddot(n,d,1,d,1)
       dnorm = sqrt(dtd)
@@ -2789,7 +2789,7 @@ c     ************
 
       integer i
 
-      if (task(1:5) .eq. 'ERROR') goto 999
+      if (task(1:5) .eqv. 'ERROR') goto 999
 
       if (iprint .ge. 0) then
          write (6,3003)
@@ -3271,7 +3271,7 @@ c
 c     task = 'START'
 c  10 continue
 c        call dcsrch( ... )
-c        if (task .eq. 'FG') then
+c        if (task .eqv. 'FG') then
 c           Evaluate the function and the gradient at stp 
 c           goto 10
 c           end if
@@ -3377,7 +3377,7 @@ c     **********
 
 c     Initialization block.
 
-      if (task(1:5) .eq. 'START') then
+      if (task(1:5) .eqv. 'START') then
 
 c        Check the input arguments for errors.
 
@@ -3392,7 +3392,7 @@ c        Check the input arguments for errors.
 
 c        Exit if there are errors on input.
 
-         if (task(1:5) .eq. 'ERROR') return
+         if (task(1:5) .eqv. 'ERROR') return
 
 c        Initialize local variables.
 
@@ -3479,7 +3479,7 @@ c     Test for convergence.
 
 c     Test for termination.
 
-      if (task(1:4) .eq. 'WARN' .or. task(1:4) .eq. 'CONV') goto 1000
+      if (task(1:4) .eqv. 'WARN' .or. task(1:4) .eqv. 'CONV') goto 1000
 
 c     A modified function is used to predict the step during the
 c     first stage if a lower function value has been obtained but