Changeset 5836 for LMDZ6

Timestamp:

Sep 24, 2025, 5:18:08 PM (3 months ago)

Author:

rkazeroni

Message:

For GPU porting of add_phys_tend and add_wake_tend routines:

• Put routine into module (speeds up source-to-source transformation)
• Add "horizontal" comment to specify possible names of horizontal variables
• Move declaration of variables with SAVE attributes from the compute routine to the module
• Modernize declarations of character arguments to fortran90 standards

Location:

LMDZ6/trunk/libf/phylmd

Files:

• add_phys_tend_mod.f90 (modified) (9 diffs)
• add_wake_tend.f90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/phylmd/add_phys_tend_mod.f90

@@ -3 +3 @@
 !
 !
+!$gpum horizontal klon nlon
 MODULE add_phys_tend_mod
 
@@ -13 +14 @@
   INTEGER, SAVE ::   fl_cor_ebil
 !$OMP THREADPRIVATE(fl_cor_ebil)
+! First call to add_phys_tend
+  LOGICAL, SAVE :: add_phys_tend_first=.true.
+!$OMP THREADPRIVATE(add_phys_tend_first)
 
 CONTAINS
@@ -50 +54 @@
   REAL zdu(klon, klev), zdv(klon, klev)
   REAL zdt(klon, klev), zdq(klon, klev), zdql(klon, klev), zdqi(klon, klev), zdqbs(klon,klev)
-  CHARACTER *(*) text
+  CHARACTER(LEN=*) :: text
   REAL paprs(klon,klev+1)
   INTEGER flag_inhib_tend ! if flag_inhib_tend != 0, tendencies are not added
@@ -118 +122 @@
 REAL, DIMENSION(klon,klev),     INTENT(IN)    :: zdt, zdql, zdqi, zdqbs
 REAL, DIMENSION(klon,klev+1),   INTENT(IN)    :: paprs
-CHARACTER*(*),                  INTENT(IN)    :: text
+CHARACTER(LEN=*),               INTENT(IN)    :: text
 INTEGER,                        INTENT(IN)    :: abortphy
 INTEGER,                        INTENT(IN)    :: flag_inhib_tend ! if not 0, tendencies are not added
@@ -149 +153 @@
 
 INTEGER debug_level
-LOGICAL, SAVE :: first=.true.
-!$OMP THREADPRIVATE(first)
 !
 !======================================================================
@@ -202 +204 @@
 
   debug_level=10
-  IF (first) THEN
+  IF (add_phys_tend_first) THEN
      print *,"TestJLD rcpv, rcw, rcs",rcpv, rcw, rcs
-     first=.false.
+     add_phys_tend_first=.false.
   ENDIF
 !
@@ -523 +525 @@
 REAL, DIMENSION(nlon,nlev),     INTENT(IN)    :: zdt, zdq, zdql, zdqs, zdqbs
 REAL, DIMENSION(nlon,nlev+1),   INTENT(IN)    :: paprs
-CHARACTER*(*),                  INTENT(IN)    :: text
+CHARACTER(LEN=*),               INTENT(IN)    :: text
 
 ! Local :
@@ -749 +751 @@
 ! Arguments :
 !------------
-CHARACTER*(*) text ! text specifing the involved parametrization 
+CHARACTER(LEN=*) :: text ! text specifing the involved parametrization 
 INTEGER itap        ! time step number
 ! local variables
@@ -757 +759 @@
 REAL bilq_bnd,  bilh_bnd     ! Q and H budget due to exchange with boundaries
 INTEGER bilq_ok,  bilh_ok
-CHARACTER*(12) status
+CHARACTER(LEN=12) :: status
 
 bilq_seuil = 1.E-10

LMDZ6/trunk/libf/phylmd/add_wake_tend.f90

@@ +1 @@
+!$gpum horizontal klon
+MODULE add_wake_tend_mod
+  PRIVATE
+
+  PUBLIC add_wake_tend
+
+  CONTAINS
+
 SUBROUTINE add_wake_tend(zddeltat, zddeltaq, zds, zdas, zddensw, zddensaw, zoccur, text, abortphy)
 !===================================================================
@@ -20 +28 @@
   REAL, DIMENSION(klon),         INTENT (IN)         :: zds, zdas, zddensw, zddensaw
   INTEGER, DIMENSION(klon),      INTENT (IN)         :: zoccur
-  CHARACTER*(*),                 INTENT (IN)         :: text
+  CHARACTER(LEN=*),              INTENT (IN)         :: text
   INTEGER,                       INTENT (IN)         :: abortphy
 
@@ -68 +76 @@
 RETURN
 END SUBROUTINE add_wake_tend
+
+END MODULE add_wake_tend_mod

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -21 +21 @@
 
     USE ACAMA_GWD_rando_m, only: ACAMA_GWD_rando, ACAMA_GWD_rando_first
+    USE add_wake_tend_mod, ONLY: add_wake_tend
     USE aero_mod
     USE add_phys_tend_mod, only : add_pbl_tend, add_phys_tend, diag_phys_tend, prt_enerbil, &