Changeset 5704 for LMDZ6/trunk/libf/phylmd/cv_routines.f90

Timestamp:

Jun 13, 2025, 9:45:10 PM (4 weeks ago)

Author:

yann meurdesoif

Message:

Convection GPU porting : suppress potential dependency between columns, may change results (cv_undilute1)

YM

File:

• LMDZ6/trunk/libf/phylmd/cv_routines.f90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/cv_routines.f90

@@ -250 +250 @@
 
   ! Compute icbmax.
-
-  icbmax = 2
-  DO i = 1, len
-    icbmax = max(icbmax, icb(i))
-  END DO
+  !ym do not do that, independance between column
+  !ym icbmax = 2
+  !ym DO i = 1, len
+  !ym  icbmax = max(icbmax, icb(i))
+  !ym END DO
 
   RETURN
@@ -261 +261 @@
 SUBROUTINE cv_undilute1(len, nd, t, q, qs, gz, p, nk, icb, icbmax, tp, tvp, &
     clw)
-  USE lmdz_cv_ini, ONLY : cl,clmcpv,cpd,cpv,eps,epsi,lv0,minorig,rrv,t0
+  USE lmdz_cv_ini, ONLY : cl,clmcpv,cpd,cpv,eps,epsi,lv0,minorig,rrv,t0,nl
 
   IMPLICIT NONE
@@ -306 +306 @@
   ! ***   Calculate lifted parcel quantities below cloud base   ***
 
-  DO k = minorig, icbmax - 1
+  !ym bad dependance between column => icbmax computed in cv_feed
+!ym  DO k = minorig, icbmax - 1
+  DO k = minorig, nd
     DO i = 1, len
-      tp(i, k) = tnk(i) - (gz(i,k)-gznk(i))/cpp(i)
-      tvp(i, k) = tp(i, k)*(1.+qnk(i)*epsi)
+      IF (k <= MAX(2,icb(i))-1) THEN
+        tp(i, k) = tnk(i) - (gz(i,k)-gznk(i))/cpp(i)
+        tvp(i, k) = tp(i, k)*(1.+qnk(i)*epsi)
+      ENDIF
     END DO
   END DO
@@ -359 +363 @@
     tvp(i, icb(i)) = tp(i, icb(i))*(1.+rg*epsi)
   END DO
-
-  DO k = minorig, icbmax
+  
+  !ym bad dependance between column => ibmax computed in cv_feed
+!ym  DO k = minorig, icbmax
+  DO k = minorig, nd
     DO i = 1, len
-      tvp(i, k) = tvp(i, k) - tp(i, k)*qnk(i)
+      IF (k <= MAX(2,icb(i))) THEN
+        tvp(i, k) = tvp(i, k) - tp(i, k)*qnk(i)
+      ENDIF
     END DO
   END DO