Changeset 5696 for LMDZ6/trunk/libf/phylmd/cv3_routines.f90

Timestamp:

Jun 13, 2025, 8:19:58 PM (3 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

File:

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

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>
 ! -------------------------------------------------------------------