Changeset 1088 for LMDZ4/branches/LMDZ4-dev

Timestamp:

Feb 3, 2009, 11:11:22 AM (16 years ago)

Author:

yann meurdesoif

Message:

Optimisation Othman Bouizi : qminimum

YM

Location:

LMDZ4/branches/LMDZ4-dev/libf

Files:

• dyn3d/qminimum.F (modified) (2 diffs)
• dyn3dpar/qminimum_p.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3d/qminimum.F

@@ -42 +42 @@
 c
       DO 1000 k = 1, llm
-      DO 1040 i = 1, ip1jmp1
-            zx_defau      = AMAX1( seuil_liq - q(i,k,iq_liq), 0.0 )
-            q(i,k,iq_vap) = q(i,k,iq_vap) - zx_defau
-            q(i,k,iq_liq) = q(i,k,iq_liq) + zx_defau
- 1040 CONTINUE
+        DO 1040 i = 1, ip1jmp1
+          if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then
+             q(i,k,iq_vap) = q(i,k,iq_vap) + q(i,k,iq_liq) - seuil_liq
+             q(i,k,iq_liq) = seuil_liq
+           endif
+ 1040   CONTINUE
  1000 CONTINUE
 c
@@ -56 +57 @@
       DO k = llm, 2, -1
 ccc      zx_abc = dpres(k) / dpres(k-1)
-      DO i = 1, ip1jmp1
-         zx_abc = deltap(i,k)/deltap(i,k-1)
-         zx_defau    = AMAX1( seuil_vap - q(i,k,iq), 0.0 )
-         q(i,k-1,iq) =  q(i,k-1,iq) - zx_defau * zx_abc
-         q(i,k,iq)   =  q(i,k,iq)   + zx_defau  
-      ENDDO
+        DO i = 1, ip1jmp1
+          if ( seuil_vap - q(i,k,iq) .gt. 0.d0 ) then
+            q(i,k-1,iq) =  q(i,k-1,iq) - ( seuil_vap - q(i,k,iq) ) *
+     &                     deltap(i,k) / deltap(i,k-1)
+            q(i,k,iq)   =  seuil_vap  
+          endif
+        ENDDO
       ENDDO
 c

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/qminimum_p.F

@@ -50 +50 @@
       DO 1000 k = 1, llm
       DO 1040 i = ijb, ije
-            zx_defau      = AMAX1( seuil_liq - q(i,k,iq_liq), 0.0 )
-            q(i,k,iq_vap) = q(i,k,iq_vap) - zx_defau
-            q(i,k,iq_liq) = q(i,k,iq_liq) + zx_defau
+            if (seuil_liq - q(i,k,iq_liq) .gt. 0.d0 ) then
+               q(i,k,iq_vap) = q(i,k,iq_vap) + q(i,k,iq_liq) - seuil_liq
+               q(i,k,iq_liq) = seuil_liq
+            endif
  1040 CONTINUE
  1000 CONTINUE
@@ -69 +70 @@
 c$OMP DO SCHEDULE(STATIC)
       DO i = ijb, ije
-         zx_abc = deltap(i,k)/deltap(i,k-1)
-         zx_defau    = AMAX1( seuil_vap - q(i,k,iq), 0.0 )
-         q(i,k-1,iq) =  q(i,k-1,iq) - zx_defau * zx_abc
-         q(i,k,iq)   =  q(i,k,iq)   + zx_defau  
+         if ( seuil_vap - q(i,k,iq) .gt. 0.d0 ) then
+            q(i,k-1,iq) =  q(i,k-1,iq) - ( seuil_vap - q(i,k,iq) ) *
+     &           deltap(i,k) / deltap(i,k-1)
+            q(i,k,iq)   =  seuil_vap  
+         endif
       ENDDO
 c$OMP END DO NOWAIT