Changeset 5712 for LMDZ6/trunk/libf/phylmd/cva_driver.f90

Timestamp:

Jun 16, 2025, 7:12:42 PM (6 weeks ago)

Author:

yann meurdesoif

Message:

Convection GPU porting : Compression of active convection point is now optional (default remain to true). For GPU runs, convection is not compressed and is computed on each column. The update is done only for column where convection is active

YM

File:

• LMDZ6/trunk/libf/phylmd/cva_driver.f90 (modified) (8 diffs)

LMDZ6/trunk/libf/phylmd/cva_driver.f90

@@ -6 +6 @@
   LOGICAL, SAVE :: debut = .TRUE.
   !$OMP THREADPRIVATE(debut)
+  LOGICAL, SAVE :: never_compress=.FALSE.   ! if true, compression is desactivated in convection
+  !$OMP THREADPRIVATE(never_compress)
 
   PUBLIC cva_driver_pre, cva_driver_post, cva_driver
@@ -32 +34 @@
     ! -- set simulation flags:
     ! (common cvflag)
+    never_compress = .FALSE.
+    CALL getin_p("convection_no_compression",never_compress)
+    IF (s2s_is_initialized()) never_compress = .TRUE.  ! for GPU, compression must be disabled
     CALL cv_flag(iflag_ice_thermo)
 
@@ -624 +629 @@
 
   INTEGER, PARAMETER                                       :: igout=1
+  LOGICAL :: is_convect(len)   ! is convection is active on column
 
 ! print *, 't1, t1_wake ',(k,t1(1,k),t1_wake(1,k),k=1,nd)
@@ -878 +884 @@
 !  gridpoints and the weights "coef_convective" (= 1. for convective gridpoints and = 0.
 !  elsewhere).
-  ncum = 0
-  coef_convective(:) = 0.
   DO i = 1, len
     IF (iflag1(i)==0) THEN
       coef_convective(i) = 1.
-      ncum = ncum + 1
-      idcum(ncum) = i
+      is_convect(i) = .TRUE.
+    ELSE
+      coef_convective(i) = 0.
+      is_convect(i) = .FALSE.      
     END IF
   END DO
 
-! print*,'len, ncum = ',len,ncum
+  
+  IF (never_compress) THEN 
+    compress = .FALSE.
+    DO i = 1,len
+      idcum(i) = i
+    ENDDO
+    ncum=len
+  ELSE
+    ncum = 0
+    DO i = 1, len
+      IF (iflag1(i)==0) THEN
+        ncum = ncum + 1
+        idcum(ncum) = i
+      END IF
+    END DO
+    
+    IF (ncum>0) THEN
+!   If the fraction of convective points is larger than comp_threshold, then compression
+!   is assumed useless.
+      compress = ncum .lt. len*comp_threshold
+      IF (.not. compress) THEN
+        DO i = 1,len
+          idcum(i) = i
+        ENDDO
+        ncum=len
+      ENDIF
+    ENDIF
+
+  ENDIF   
 
   IF (ncum>0) THEN
@@ -898 +932 @@
 
     IF (iflag_con==3) THEN
-! print*,'ncum tv1 ',ncum,tv1
-! print*,'tvp1 ',tvp1
-!jyg<
-!   If the fraction of convective points is larger than comp_threshold, then compression
-!   is assumed useless.
-!
-  compress = ncum .lt. len*comp_threshold
-!
-  IF (.not. compress) THEN
-    DO i = 1,len
-      idcum(i) = i
-    ENDDO
-  ENDIF
-!
-!>jyg
-        if (prt_level >= 9) &
-             PRINT *, 'cva_driver -> cv3a_compress'
+      if (prt_level >= 9) PRINT *, 'cva_driver -> cv3a_compress'
       CALL cv3a_compress(len, nloc, ncum, nd, ntra, compress, &
                          iflag1, nk1, icb1, icbs1, &
@@ -937 +955 @@
                          Ale, Alp, omega)
 
-! print*,'tv ',tv
-! print*,'tvp ',tvp
 
     END IF
 
     IF (iflag_con==4) THEN
-        if (prt_level >= 9) &
-             PRINT *, 'cva_driver -> cv_compress'
+      if (prt_level >= 9) PRINT *, 'cva_driver -> cv_compress'
       CALL cv_compress(len, nloc, ncum, nd, &
-                       iflag1, nk1, icb1, &
+                       iflag1, compress, nk1, icb1, &
                        cbmf1, plcl1, tnk1, qnk1, gznk1, &
                        t1, q1, qs1, u1, v1, gz1, &
@@ -1255 +1270 @@
         if (prt_level >= 9) &
              PRINT *, 'cva_driver -> cv3a_uncompress'
-      CALL cv3a_uncompress(nloc, len, ncum, nd, ntra, idcum, compress, &
+      CALL cv3a_uncompress(nloc, len, ncum, nd, ntra, idcum, is_convect, compress,  &
                            iflag, icb, inb, &
                            precip, cbmf, plcl, plfc, wbeff, sig, w0, ptop2, &
@@ -1297 +1312 @@
         if (prt_level >= 9) &
              PRINT *, 'cva_driver -> cv_uncompress'
-      CALL cv_uncompress(nloc, len, ncum, nd, idcum, &
+      CALL cv_uncompress(nloc, len, ncum, nd, idcum, is_convect, compress, &
                            iflag, &
                            precip, cbmf, &