Merge branch 'main' into update-meson-windows

mdolab · Feb 5, 2024 · 80d9154 · 80d9154
2 parents cd89189 + 7f26d43
commit 80d9154
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/pyoptsparse/pySLSQP/source/slsqp.f b/pyoptsparse/pySLSQP/source/slsqp.f
@@ -180,11 +180,11 @@ SUBROUTINE SLSQP (M,MEQ,LA,N,X,XL,XU,F,C,G,A,ACC,ITER,
      1        JW(L_JW), LA, M, MEQ, MINEQ, MODE, N, N1, IPRINT, IOUT,
      2        NFUNC, NGRAD,
      3        IEXACT, INCONS, IRESET, ITERMX, LINE, N2, N3
-     
+
       DOUBLE PRECISION ACC, A(LA,N+1), C(LA), F, G(N+1),
-     *     X(N), XL(N), XU(N), W(L_W), 
+     *     X(N), XL(N), XU(N), W(L_W),
      *     ALPHA, F0, GS, H1, H2, H3, H4, T, T0, TOL
-     
+
       EXTERNAL SLFUNC,SLGRAD
 
       CHARACTER*(*) IFILE
@@ -279,9 +279,9 @@ SUBROUTINE SLSQP (M,MEQ,LA,N,X,XL,XU,F,C,G,A,ACC,ITER,
      * ITERMX,LINE,N1,N2,N3)
 C
       IF (ABS(MODE).EQ.1) GOTO 4
-C      
+C
     3 CONTINUE
-    
+
 C
 C   PRINT FINAL
 C
@@ -297,20 +297,26 @@ SUBROUTINE SLSQP (M,MEQ,LA,N,X,XL,XU,F,C,G,A,ACC,ITER,
 C     ------------------------------------------------------------------
 C                                FORMATS
 C     ------------------------------------------------------------------
-C  
+C
  1000 FORMAT(////,3X,
      1 60H------------------------------------------------------------,
      2 15H---------------,
-     3 /,5X,59HSTART OF THE SEQUENTIAL LEAST SQUARES PROGRAMMING ALGORITHM,
-     4     /,3X, 
-     5 60H------------------------------------------------------------,
-     6 15H---------------)
- 1100 FORMAT(/,5X,11HPARAMETERS:,/,8X,5HACC =,D13.4,/,8X,9HMAXITER =,
-     1     I3,/,8X,8HIPRINT =,I4,/,6HIOUT =,I4//)
+     3 /,
+     4 5X,13HSTART OF THE ,
+     5 46HSEQUENTIAL LEAST SQUARES PROGRAMMING ALGORITHM,
+     6 /,3X,
+     7 60H------------------------------------------------------------,
+     8 15H---------------)
+ 1100 FORMAT(/,5X,
+     1 11HPARAMETERS:,
+     2 /,8X,5HACC =,D13.4,
+     3 /,8X,9HMAXITER =,I4,
+     4 /,8X,8HIPRINT =,I4,
+     5 /,8X,6HIOUT =,I4//)
  1200 FORMAT(5X,6HITER =,I5,5X,5HOBJ =,7E16.8,5X,10HX-VECTOR =)
- 1400 FORMAT (3X,7E13.4)
+ 1400 FORMAT(3X,7E13.4)
  1450 FORMAT(8X,30HNUMBER OF FUNC-CALLS:  NFUNC =,I4)
  1460 FORMAT(8X,30HNUMBER OF GRAD-CALLS:  NGRAD =,I4)
 C
       END
-      
+