Changeset 5696

Timestamp:

Jun 13, 2025, 8:19:58 PM (4 weeks ago)

Author:

yann meurdesoif

Message:

Convection GPU porting : separate initialisation phase of computing phase for cva_driver and cv3_routines (remove saved first/debut variable type from computing routine)
YM

Location:

LMDZ6/trunk/libf/phylmd

Files:

• concvl.f90 (modified) (3 diffs)
• cv3_routines.f90 (modified) (4 diffs)
• cva_driver.f90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/concvl.f90

@@ -40 +40 @@
   USE conema3_mod_h
   USE yoethf_mod_h
-  USE cva_driver_mod, ONLY : cva_driver
+  USE cva_driver_mod, ONLY : cva_driver_pre, cva_driver, cva_driver_post
   IMPLICIT NONE
 ! ======================================================================
@@ -421 +421 @@
 !LF   necessary for gathered fields
     nloc = klon
+    CALL cva_driver_pre(klev, k_upper_cv, iflag_con, iflag_ice_thermo, ok_conserv_q, dtime )
     CALL cva_driver(klon, klev, klev+1, ntra, nloc, k_upper_cv, &
                     iflag_con, iflag_mix, iflag_ice_thermo, &
@@ -445 +446 @@
 !AC!+!RomP+jyg
                     epmax_diag) ! epmax_cape
+    CALL cva_driver_post
   END IF
 ! ------------------------------------------------------------------

LMDZ6/trunk/libf/phylmd/cv3_routines.f90

@@ -3 +3 @@
 MODULE cv3_routines_mod
   PRIVATE
-
+! for cv3_feed
+  LOGICAL, SAVE :: cv3_feed_first =.TRUE.
+  LOGICAL, SAVE :: ok_new_feed
+!$OMP THREADPRIVATE (first,ok_new_feed)
   PUBLIC cv3_param, cv3_incrcount, cv3_prelim, cv3_feed, cv3_undilute1, cv3_trigger, cv3_compress, &
          icefrac, cv3_undilute2, cv3_closure, cv3_mixing, cv3_unsat, cv3_yield, cv3_tracer, cv3_uncompress,&
-         cv3_epmax_fn_cape
+         cv3_epmax_fn_cape, cv3_routine_pre
 CONTAINS
 
-
-
+SUBROUTINE cv3_routine_pre(ok_conserv_q)
+  LOGICAL, INTENT (IN)                               :: ok_conserv_q
+  
+  CALL cv3_feed_pre(ok_conserv_q)
+
+END SUBROUTINE cv3_routine_pre
 
 SUBROUTINE cv3_param(nd, k_upper, delt)
@@ -314 +321 @@
 END SUBROUTINE cv3_prelim
 
+
+SUBROUTINE cv3_feed_pre(ok_conserv_q)
+USE mod_phys_lmdz_transfert_para, ONLY : bcast
+IMPLICIT NONE 
+  LOGICAL, INTENT (IN)                               :: ok_conserv_q
+  INTEGER :: iostat
+
+  IF (cv3_feed_first) THEN
+
+!$OMP MASTER
+    ok_new_feed = ok_conserv_q
+    OPEN (98, FILE='cv3feed_param.data', STATUS='old', FORM='formatted', IOSTAT=iostat)
+    IF (iostat==0) THEN
+      READ (98, *, END=998) ok_new_feed
+998   CONTINUE
+      CLOSE (98)
+    END IF
+    PRINT *, ' ok_new_feed: ', ok_new_feed
+!$OMP END MASTER
+    call bcast(ok_new_feed)
+    cv3_feed_first = .FALSE.   
+  END IF
+
+END SUBROUTINE cv3_feed_pre
+
+
 SUBROUTINE cv3_feed(len, nd, ok_conserv_q, &
                     t, q, u, v, p, ph, h, gz, &
@@ -320 +353 @@
                     cpnk, hnk, nk, icb, icbmax, iflag, gznk, plcl)
 
-  USE mod_phys_lmdz_transfert_para, ONLY : bcast
   USE add_phys_tend_mod, ONLY: fl_cor_ebil
   USE print_control_mod, ONLY: prt_level
@@ -374 +406 @@
 
 !jyg20140217<
-  INTEGER iostat
-  LOGICAL, SAVE :: first
-  LOGICAL, SAVE :: ok_new_feed
-  REAL, SAVE :: dp_lcl_feed
-!$OMP THREADPRIVATE (first,ok_new_feed,dp_lcl_feed)
-  DATA first/.TRUE./
-  DATA dp_lcl_feed/2./
-
-  IF (first) THEN
-!$OMP MASTER
-    ok_new_feed = ok_conserv_q
-    OPEN (98, FILE='cv3feed_param.data', STATUS='old', FORM='formatted', IOSTAT=iostat)
-    IF (iostat==0) THEN
-      READ (98, *, END=998) ok_new_feed
-998   CONTINUE
-      CLOSE (98)
-    END IF
-    PRINT *, ' ok_new_feed: ', ok_new_feed
-!$OMP END MASTER
-    call bcast(ok_new_feed)
-    first = .FALSE.   
-  END IF
+  REAL, PARAMETER :: dp_lcl_feed = 2.
+
 !jyg>
 ! -------------------------------------------------------------------

LMDZ6/trunk/libf/phylmd/cva_driver.f90

@@ -4 +4 @@
 MODULE cva_driver_mod
   PRIVATE
-
-  PUBLIC cva_driver
+  LOGICAL, SAVE :: debut = .TRUE.
+  !$OMP THREADPRIVATE(debut)
+
+  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)
+    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, &
@@ -435 +492 @@
 
   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
@@ -573 +628 @@
 ! 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
+
 
 ! ---------------------------------------------------------------------
@@ -1300 +1328 @@
   IF (debut) THEN
     PRINT *, ' cv_uncompress -> '
-    debut = .FALSE.
   END IF  !(debut) THEN