diff -Naur scalapack-2.2.0-orig/TOOLS/pclaprnt.f scalapack-2.2.0/TOOLS/pclaprnt.f
--- scalapack-2.2.0-orig/TOOLS/pclaprnt.f	2023-02-25 08:28:00.665223700 +0100
+++ scalapack-2.2.0/TOOLS/pclaprnt.f	2023-02-25 08:28:23.338152600 +0100
@@ -162,7 +162,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -228,7 +228,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -239,7 +239,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -305,7 +305,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pclaread.f scalapack-2.2.0/TOOLS/pclaread.f
--- scalapack-2.2.0-orig/TOOLS/pclaread.f	2023-02-25 08:28:00.667211700 +0100
+++ scalapack-2.2.0/TOOLS/pclaread.f	2023-02-25 08:28:20.124526700 +0100
@@ -95,7 +95,7 @@
 *
       DO 50 J = 1, N, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), N-J+1 )
-         DO 40 H = 0, JB-1
+         DO H = 0, JB-1
 *
 *           Loop over block of rows
 *
@@ -128,7 +128,7 @@
 *
             II = 1
             ICURROW = DESCA( RSRC_ )
-   40    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pclawrite.f scalapack-2.2.0/TOOLS/pclawrite.f
--- scalapack-2.2.0-orig/TOOLS/pclawrite.f	2023-02-25 08:28:00.668220000 +0100
+++ scalapack-2.2.0/TOOLS/pclawrite.f	2023-02-25 08:28:17.578962700 +0100
@@ -77,7 +77,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -137,7 +137,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -148,7 +148,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -210,7 +210,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pdlaprnt.f scalapack-2.2.0/TOOLS/pdlaprnt.f
--- scalapack-2.2.0-orig/TOOLS/pdlaprnt.f	2023-02-25 08:28:00.613063200 +0100
+++ scalapack-2.2.0/TOOLS/pdlaprnt.f	2023-02-25 08:28:31.288104100 +0100
@@ -162,7 +162,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -222,7 +222,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -233,7 +233,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -293,7 +293,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pdlaread.f scalapack-2.2.0/TOOLS/pdlaread.f
--- scalapack-2.2.0-orig/TOOLS/pdlaread.f	2023-02-25 08:28:00.676024600 +0100
+++ scalapack-2.2.0/TOOLS/pdlaread.f	2023-02-25 08:28:28.894447800 +0100
@@ -94,7 +94,7 @@
 *
       DO 50 J = 1, N, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), N-J+1 )
-         DO 40 H = 0, JB-1
+         DO H = 0, JB-1
 *
 *           Loop over block of rows
 *
@@ -125,7 +125,7 @@
 *
             II = 1
             ICURROW = DESCA( RSRC_ )
-   40    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pdlawrite.f scalapack-2.2.0/TOOLS/pdlawrite.f
--- scalapack-2.2.0-orig/TOOLS/pdlawrite.f	2023-02-25 08:28:00.614449100 +0100
+++ scalapack-2.2.0/TOOLS/pdlawrite.f	2023-02-25 08:28:25.668221200 +0100
@@ -77,7 +77,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -133,7 +133,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -144,7 +144,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -200,7 +200,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pilaprnt.f scalapack-2.2.0/TOOLS/pilaprnt.f
--- scalapack-2.2.0-orig/TOOLS/pilaprnt.f	2023-02-25 08:28:00.619809600 +0100
+++ scalapack-2.2.0/TOOLS/pilaprnt.f	2023-02-25 08:29:05.436109500 +0100
@@ -162,7 +162,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -222,7 +222,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -233,7 +233,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -293,7 +293,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pslaprnt.f scalapack-2.2.0/TOOLS/pslaprnt.f
--- scalapack-2.2.0-orig/TOOLS/pslaprnt.f	2023-02-25 08:28:00.690068700 +0100
+++ scalapack-2.2.0/TOOLS/pslaprnt.f	2023-02-25 08:29:29.965359900 +0100
@@ -162,7 +162,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -222,7 +222,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -233,7 +233,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -293,7 +293,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pslaread.f scalapack-2.2.0/TOOLS/pslaread.f
--- scalapack-2.2.0-orig/TOOLS/pslaread.f	2023-02-25 08:28:00.623635800 +0100
+++ scalapack-2.2.0/TOOLS/pslaread.f	2023-02-25 08:28:35.540714400 +0100
@@ -94,7 +94,7 @@
 *
       DO 50 J = 1, N, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), N-J+1 )
-         DO 40 H = 0, JB-1
+         DO H = 0, JB-1
 *
 *           Loop over block of rows
 *
@@ -125,7 +125,7 @@
 *
             II = 1
             ICURROW = DESCA( RSRC_ )
-   40    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pslawrite.f scalapack-2.2.0/TOOLS/pslawrite.f
--- scalapack-2.2.0-orig/TOOLS/pslawrite.f	2023-02-25 08:28:00.691205600 +0100
+++ scalapack-2.2.0/TOOLS/pslawrite.f	2023-02-25 08:28:33.590862800 +0100
@@ -77,7 +77,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -133,7 +133,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -144,7 +144,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -200,7 +200,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pzlaprnt.f scalapack-2.2.0/TOOLS/pzlaprnt.f
--- scalapack-2.2.0-orig/TOOLS/pzlaprnt.f	2023-02-25 08:28:00.627994300 +0100
+++ scalapack-2.2.0/TOOLS/pzlaprnt.f	2023-02-25 08:28:13.805945100 +0100
@@ -162,7 +162,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -228,7 +228,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -239,7 +239,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRPRNT .AND. ICURCOL.EQ.ICPRNT ) THEN
@@ -305,7 +305,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pzlaread.f scalapack-2.2.0/TOOLS/pzlaread.f
--- scalapack-2.2.0-orig/TOOLS/pzlaread.f	2023-02-25 08:28:00.701267600 +0100
+++ scalapack-2.2.0/TOOLS/pzlaread.f	2023-02-25 08:28:08.521222700 +0100
@@ -95,7 +95,7 @@
 *
       DO 50 J = 1, N, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), N-J+1 )
-         DO 40 H = 0, JB-1
+         DO H = 0, JB-1
 *
 *           Loop over block of rows
 *
@@ -128,7 +128,7 @@
 *
             II = 1
             ICURROW = DESCA( RSRC_ )
-   40    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
diff -Naur scalapack-2.2.0-orig/TOOLS/pzlawrite.f scalapack-2.2.0/TOOLS/pzlawrite.f
--- scalapack-2.2.0-orig/TOOLS/pzlawrite.f	2023-02-25 08:28:00.703082200 +0100
+++ scalapack-2.2.0/TOOLS/pzlawrite.f	2023-02-25 08:28:05.541512400 +0100
@@ -77,7 +77,7 @@
 *
       JN = MIN( ICEIL( JA, DESCA( NB_ ) ) * DESCA( NB_ ), JA+N-1 )
       JB = JN-JA+1
-      DO 60 H = 0, JB-1
+      DO H = 0, JB-1
          IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
          IB = IN-IA+1
          IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -137,7 +137,7 @@
 *
         II = IIA
         ICURROW = IAROW
-   60 CONTINUE
+      ENDDO
 *
       IF( MYCOL.EQ.ICURCOL )
      $   JJ = JJ + JB
@@ -148,7 +148,7 @@
 *
       DO 130 J = JN+1, JA+N-1, DESCA( NB_ )
          JB = MIN(  DESCA( NB_ ), JA+N-J )
-         DO 120 H = 0, JB-1
+         DO H = 0, JB-1
             IN = MIN( ICEIL( IA, DESCA( MB_ ) ) * DESCA( MB_ ), IA+M-1 )
             IB = IN-IA+1
             IF( ICURROW.EQ.IRWRIT .AND. ICURCOL.EQ.ICWRIT ) THEN
@@ -210,7 +210,7 @@
 *
             II = IIA
             ICURROW = IAROW
-  120    CONTINUE
+         ENDDO
 *
          IF( MYCOL.EQ.ICURCOL )
      $      JJ = JJ + JB
