Changeset 2257

Timestamp:

Apr 7, 2015, 11:47:46 AM (9 years ago)

Author:

jyg

Message:

Improvement of three loops in cv3_undilute2 in cv3_routines.F90

File:

• LMDZ5/trunk/libf/phylmd/cv3_routines.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phylmd/cv3_routines.F90

@@ -1352 +1352 @@
 ! first estimate of buoyancy:
 
-  DO i = 1, ncum
-    DO k = 1, nl
+!jyg : k-loop outside i-loop (07042015)
+  DO k = 1, nl
+    DO i = 1, ncum
       buoy(i, k) = tvp(i, k) - tv(i, k)
     END DO
@@ -1361 +1362 @@
 ! for safety, set buoy(icb)=buoybase
 
-  DO i = 1, ncum
-    DO k = 1, nl
+!jyg : k-loop outside i-loop (07042015)
+  DO k = 1, nl
+    DO i = 1, ncum
       IF ((k>=icb(i)) .AND. (k<=nl) .AND. (p(i,k)>=pbase(i))) THEN
         buoy(i, k) = buoybase(i)
       END IF
     END DO
+  END DO
+  DO i = 1, ncum
 !    buoy(icb(i),k)=buoybase(i)
     buoy(i, icb(i)) = buoybase(i)
@@ -1511 +1515 @@
   END DO
 
-  DO k = minorig + 1, nl
-    DO i = 1, ncum
-      IF ((k>=icb(i)) .AND. (k<=inb(i))) THEN
-
-        IF (cvflag_ice) THEN
+!jyg : cvflag_ice test outside the loops (07042015)
+!
+  IF (cvflag_ice) THEN
+!
+    DO k = minorig + 1, nl
+      DO i = 1, ncum
+        IF ((k>=icb(i)) .AND. (k<=inb(i))) THEN
           frac(i, k) = 1. - (t(i,k)-243.15)/(263.15-243.15)
           frac(i, k) = min(max(frac(i,k),0.0), 1.0)
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k)+frac(i,k)*lf(i,k))* &
                               ep(i, k)*clw(i, k)
-
-        ELSE
+        END IF
+      END DO
+    END DO
+!
+  ELSE
+!
+    DO k = minorig + 1, nl
+      DO i = 1, ncum
+        IF ((k>=icb(i)) .AND. (k<=inb(i))) THEN
           hp(i, k) = hnk(i) + (lv(i,k)+(cpd-cpv)*t(i,k))*ep(i, k)*clw(i, k)
         END IF
-
-      END IF
-    END DO
-  END DO
+      END DO
+    END DO
+!
+  END IF  ! (cvflag_ice)
 
   RETURN