Changeset 5079 for LMDZ6/trunk/libf/dyn3d_common/advzp.F

Timestamp:

Jul 19, 2024, 11:28:59 AM (4 months ago)

Author:

abarral

Message:

[coherence with Fortran standards]
Replace obsolete DO with shared termination
(minor) replace obsolete bool operators

File:

• LMDZ6/trunk/libf/dyn3d_common/advzp.F (modified) (9 diffs)

LMDZ6/trunk/libf/dyn3d_common/advzp.F

@@ -135 +135 @@
 C  Conversion des flux de masses en kg
 
-      DO 500 l = 1,llm
-         DO 500 j = 1,jjp1
-            DO 500 i = 1,iip1  
+      DO l = 1,llm
+         DO j = 1,jjp1
+            DO i = 1,iip1  
             wgri (i,j,llm+1-l) = w (i,j,l)  
-  500 CONTINUE
+      END DO
+      END DO
+      END DO
       do j=1,jjp1
          do i=1,iip1
@@ -154 +156 @@
 C  boucle sur les latitudes
 C
-      DO 1 K=1,LAT
+      DO K=1,LAT
 C
 C  place limits on appropriate moments before transport
@@ -161 +163 @@
       IF(.NOT.LIMIT) GO TO 101
 C
-      DO 10 JV=1,NTRA
-      DO 10 L=1,NIV
-         DO 100 I=1,LON
-            IF(S0(I,K,L,JV).GT.0.) THEN
+      DO JV=1,NTRA
+      DO L=1,NIV
+         DO I=1,LON
+            IF(S0(I,K,L,JV)>0.) THEN
               SLPMAX=S0(I,K,L,JV)
               S1MAX =1.5*SLPMAX
@@ -180 +182 @@
               SYZ(I,K,L,JV)=0.
             ENDIF
- 100     CONTINUE
- 10   CONTINUE
+      END DO
+      END DO
+      END DO
 C
  101  CONTINUE
@@ -193 +196 @@
 C  2- reajusts moments remaining in the box
 C
-      DO 11 L=1,NIV-1
+      DO L=1,NIV-1
       LP=L+1
 C
-      DO 110 I=1,LON
-C
-         IF(WGRI(I,K,L).LT.0.) THEN
+      DO I=1,LON
+C
+         IF(WGRI(I,K,L)<0.) THEN
            FM(I,L)=-WGRI(I,K,L)*DTZ
            ALF(I)=FM(I,L)/SM(I,K,LP)
@@ -215 +218 @@
          ALF4 (I)=ALF1(I)*ALF1Q(I)
 C
- 110  CONTINUE
-C
-      DO 111 JV=1,NTRA
-      DO 1110 I=1,LON
-C
-         IF(WGRI(I,K,L).LT.0.) THEN
+      END DO
+C
+      DO JV=1,NTRA
+      DO I=1,LON
+C
+         IF(WGRI(I,K,L)<0.) THEN
 C
            F0 (I,L,JV)=ALF (I)* ( S0(I,K,LP,JV)-ALF1(I)*
@@ -273 +276 @@
          ENDIF
 C
- 1110 CONTINUE
- 111  CONTINUE
-C
- 11   CONTINUE
+      END DO
+      END DO
+C
+      END DO
 C
 C  puts the temporary moments Fi into appropriate neighboring boxes
 C
-      DO 12 L=1,NIV-1
+      DO L=1,NIV-1
       LP=L+1
 C
-      DO 120 I=1,LON
-C
-         IF(WGRI(I,K,L).LT.0.) THEN
+      DO I=1,LON
+C
+         IF(WGRI(I,K,L)<0.) THEN
            SM(I,K,L)=SM(I,K,L)+FM(I,L)
            ALF(I)=FM(I,L)/SM(I,K,L)
@@ -299 +302 @@
          ALF3(I)=ALF1(I)-ALF(I)
 C
- 120  CONTINUE
-C
-      DO 121 JV=1,NTRA
-      DO 1210 I=1,LON
-C
-         IF(WGRI(I,K,L).LT.0.) THEN
+      END DO
+C
+      DO JV=1,NTRA
+      DO I=1,LON
+C
+         IF(WGRI(I,K,L)<0.) THEN
 C
            TEMPTM=-ALF(I)*S0(I,K,L,JV)+ALF1(I)*F0(I,L,JV)
@@ -342 +345 @@
          ENDIF
 C
- 1210 CONTINUE
- 121  CONTINUE
-C
- 12   CONTINUE
+      END DO
+      END DO
+C
+      END DO
 C
 C  fin de la boucle principale sur les latitudes
 C
- 1    CONTINUE
+      END DO
 C
       DO l = 1,llm