Changeset 5791 for LMDZ6/branches/contrails/libf/phylmd/cva_driver.f90

Timestamp:

Jul 28, 2025, 7:23:15 PM (6 days ago)

Author:

aborella

Message:

Merge with trunk r5789

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/cva_driver.f90 (modified) (15 diffs)

LMDZ6/branches/contrails/libf/phylmd/cva_driver.f90

@@ -1 +1 @@
 
 ! $Id$
+!$gpum horizontal len nloc ncum klon
+MODULE cva_driver_mod
+  PRIVATE
+  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
+
+CONTAINS
+
+! called before cva_driver 
+SUBROUTINE cva_driver_pre(nd, k_upper, iflag_con, iflag_ice_thermo, ok_conserv_q, delt)
+USE cv3_routines_mod, ONLY : cv3_routine_pre, cv3_param  
+USE cv_routines_mod, ONLY : cv_param
+USE ioipsl_getin_p_mod, ONLY : getin_p
+USE s2s
+IMPLICIT NONE
+  INTEGER, INTENT (IN)                               :: nd
+  INTEGER, INTENT (IN)                               :: k_upper
+  INTEGER, INTENT (IN)                               :: iflag_con
+  INTEGER, INTENT (IN)                               :: iflag_ice_thermo
+  REAL, INTENT (IN)                                  :: delt
+  LOGICAL, INTENT (IN)                               :: ok_conserv_q
+
+  IF (debut) THEN
+    ! -------------------------------------------------------------------
+    ! --- SET CONSTANTS AND PARAMETERS
+    ! -------------------------------------------------------------------
+
+    ! -- set simulation flags:
+    ! (common cvflag)
+    never_compress = .FALSE.
+    CALL getin_p("convection_no_compression",never_compress)
+    IF (s2s_gpu_activated()) never_compress = .TRUE.  ! for GPU, compression must be disabled
+    CALL cv_flag(iflag_ice_thermo)
+
+    ! -- set thermodynamical constants:
+    ! (common cvthermo)
+
+    CALL cv_thermo(iflag_con)
+
+    ! -- set convect parameters
+
+    ! includes microphysical parameters and parameters that
+    ! control the rate of approach to quasi-equilibrium)
+    ! (common cvparam)
+
+    IF (iflag_con==3) THEN
+      CALL cv3_param(nd, k_upper, delt)
+    END IF
+
+    IF (iflag_con==4) THEN
+      CALL cv_param(nd)
+    END IF
+    
+    CALL cv3_routine_pre(ok_conserv_q)
+  ENDIF
+
+END SUBROUTINE cva_driver_pre
+
+!called after cva_driver
+SUBROUTINE cva_driver_post
+IMPLICIT NONE
+  IF (debut) THEN
+    debut=.FALSE.
+  ENDIF
+END SUBROUTINE cva_driver_post
 
 SUBROUTINE cva_driver(len, nd, ndp1, ntra, nloc, k_upper, &
@@ -42 +111 @@
   USE print_control_mod, ONLY: prt_level, lunout
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
+  USE cv3_routines_mod
+  USE cv_routines_mod
+  USE cv3a_compress_mod, ONLY : cv3a_compress
+  USE cv3p_mixing_mod, ONLY   : cv3p_mixing
+  USE cv3p1_closure_mod, ONLY : cv3p1_closure
+  USE cv3p2_closure_mod, ONLY : cv3p2_closure
+  USE cv3_mixscale_mod, ONLY : cv3_mixscale
+  USE cv3a_uncompress_mod, ONLY : cv3a_uncompress
+  USE cv3_enthalpmix_mod, ONLY : cv3_enthalpmix
+  USE cv3_estatmix_mod, ONLY : cv3_estatmix
   IMPLICIT NONE
 
@@ -418 +497 @@
 
   LOGICAL ok_inhib ! True => possible inhibition of convection by dryness
-  LOGICAL, SAVE :: debut = .TRUE.
-!$OMP THREADPRIVATE(debut)
 
   REAL coef_convective(len)   ! = 1 for convective points, = 0 otherwise
@@ -545 +622 @@
   REAL epmax_diag(nloc) ! epmax_cape
 
-  CHARACTER (LEN=20) :: modname = 'cva_driver'
+  CHARACTER (LEN=20), PARAMETER :: modname = 'cva_driver'
   CHARACTER (LEN=80) :: abort_message
 
@@ -551 +628 @@
   REAL, PARAMETER    :: Cape_noconv = -1.
 
-  INTEGER,SAVE                                       :: igout=1
-!$OMP THREADPRIVATE(igout)
-
+  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)
 ! print *, 'q1, q1_wake ',(k,q1(1,k),q1_wake(1,k),k=1,nd)
 
-! -------------------------------------------------------------------
-! --- SET CONSTANTS AND PARAMETERS
-! -------------------------------------------------------------------
-
-! -- set simulation flags:
-! (common cvflag)
-
-  CALL cv_flag(iflag_ice_thermo)
-
-! -- set thermodynamical constants:
-! (common cvthermo)
-
-  CALL cv_thermo(iflag_con)
-
-! -- set convect parameters
-
-! includes microphysical parameters and parameters that
-! control the rate of approach to quasi-equilibrium)
-! (common cvparam)
-
-  IF (iflag_con==3) THEN
-    CALL cv3_param(nd, k_upper, delt)
-
-  END IF
-
-  IF (iflag_con==4) THEN
-    CALL cv_param(nd)
-  END IF
+
 
 ! ---------------------------------------------------------------------
@@ -835 +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
@@ -855 +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, &
@@ -894 +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, &
@@ -961 +1019 @@
 !      END IF
       IF (iflag_mix>=1) THEN
-        CALL zilch(supmax, nloc*nd)
+        supmax(:,:)=0.
         if (prt_level >= 9) &
              PRINT *, 'cva_driver -> cv3p_mixing'
@@ -973 +1031 @@
 
       ELSE
-        CALL zilch(supmax, nloc*nd)
+        supmax(:,:)=0.
       END IF
     END IF
@@ -1050 +1108 @@
                         unk, vnk, hp, tv, tvp, ep, clw, m, sig, &
                         ment, qent, uent, vent, nent, sigij, elij, ments, qents, traent)
-        CALL zilch(hent, nloc*nd*nd)
+        hent(1:nloc,1:nd,1:nd) = 0.
       ELSE
 !!jyg:  Essais absurde pour voir
@@ -1212 +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, &
@@ -1254 +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, &
@@ -1285 +1343 @@
   IF (debut) THEN
     PRINT *, ' cv_uncompress -> '
-    debut = .FALSE.
   END IF  !(debut) THEN
 
@@ -1291 +1348 @@
   RETURN
 END SUBROUTINE cva_driver
+
+END MODULE cva_driver_mod