Changeset 1250 for LMDZ4/branches/LMDZ4-dev/libf/phylmd/cvltr.F90

Timestamp:

Oct 29, 2009, 2:55:23 PM (15 years ago)

Author:

yann meurdesoif

Message:

Optimisations SX9

YM

File:

• LMDZ4/branches/LMDZ4-dev/libf/phylmd/cvltr.F90 (modified) (3 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/cvltr.F90

@@ -28 +28 @@
 
 ! Variables locales     
-  REAL,DIMENSION(klon,klev)       :: zed
+! REAL,DIMENSION(klon,klev)       :: zed
   REAL,DIMENSION(klon,klev,klev)  :: zmd
   REAL,DIMENSION(klon,klev,klev)  :: za
@@ -34 +34 @@
   REAL,DIMENSION(klon,klev)       :: zmfp,zmfu
   INTEGER                         :: i,k,j 
+  REAL                            :: pdtimeRG
 
 ! =========================================
 ! calcul des tendances liees au downdraft
 ! =========================================
-  zed(:,:)=0.
-  zmfd(:,:)=0.
-  zmfa(:,:)=0.
-  zmfu(:,:)=0.
-  zmfp(:,:)=0.
-  zmd(:,:,:)=0.
-  za(:,:,:)=0.
+!cdir collapse
+  DO j=1,klev
+  DO i=1,klon
+!   zed(i,j)=0.
+    zmfd(i,j)=0.
+    zmfa(i,j)=0.
+    zmfu(i,j)=0.
+    zmfp(i,j)=0.
+  END DO
+  END DO
+!cdir collapse
+  DO k=1,klev
+  DO j=1,klev
+  DO i=1,klon
+    zmd(i,j,k)=0.
+    za (i,j,k)=0.
+  END DO
+  END DO
+  END DO
 ! entrainement
-  DO k=1,klev-1
-     DO i=1,klon
-        zed(i,k)=max(0.,mp(i,k)-mp(i,k+1))
-     END DO
-  END DO
+! DO k=1,klev-1
+!    DO i=1,klon
+!       zed(i,k)=max(0.,mp(i,k)-mp(i,k+1))
+!    END DO
+! END DO
 
 ! calcul de la matrice d echange
 ! matrice de distribution de la masse entrainee en k
 
-  DO k=1,klev
+  DO k=1,klev-1
      DO i=1,klon
-        zmd(i,k,k)=zed(i,k)
+        zmd(i,k,k)=max(0.,mp(i,k)-mp(i,k+1))
      END DO
   END DO
@@ -126 +139 @@
   DO k=1, klev
      DO i=1, klon
+        dx(i,k)=paprs(i,k)-paprs(i,k+1)
+     ENDDO
+  ENDDO
+  pdtimeRG=pdtime*RG
+!cdir collapse
+  DO k=1, klev
+     DO i=1, klon
         dx(i,k)=(zmfd(i,k)+zmfu(i,k)       &
-             +zmfa(i,k)+zmfp(i,k))*pdtime  &
-             *RG/(paprs(i,k)-paprs(i,k+1)) 
+                +zmfa(i,k)+zmfp(i,k))*pdtimeRG/dx(i,k)
         !          print*,'dx',k,dx(i,k)
      ENDDO