Changeset 4141

Timestamp:

May 2, 2022, 11:26:48 AM (3 years ago)

Author:

Laurent Fairhead

Message:

Outillage de physiq_mod.F90 en directives openacc pour prendre en compte le portage de ajsec.F90

Location:

LMDZ6/branches/Portage_acc/libf/phylmd

Files:

• phys_local_var_mod.F90 (modified) (previous)
• phys_state_var_mod.F90 (modified) (2 diffs)
• physiq_mod.F90 (modified) (11 diffs)

LMDZ6/branches/Portage_acc/libf/phylmd/phys_state_var_mod.F90

@@ -274 +274 @@
       REAL,ALLOCATABLE,SAVE :: wake_deltaq(:,:)
 !$OMP THREADPRIVATE(wake_deltaq)
+!$acc declare create( wake_deltat, wake_deltaq)     
 #ifdef ISO
       REAL, ALLOCATABLE, SAVE :: wake_deltaxt(:,:,:)
@@ -280 +281 @@
       REAL,ALLOCATABLE,SAVE :: wake_s(:)
 !$OMP THREADPRIVATE(wake_s)
+!$acc declare create(wake_s)      
       REAL,ALLOCATABLE,SAVE :: awake_dens(:), wake_dens(:)
 !$OMP THREADPRIVATE(awake_dens, wake_dens)

LMDZ6/branches/Portage_acc/libf/phylmd/physiq_mod.F90

@@ -37 +37 @@
          boundslon,boundslat, dx, dy, ind_cell_glo
     USE indice_sol_mod, ONLY: nbsrf,is_ave, is_ter, is_oce, is_lic, is_sic 
-    USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
-         histwrite, ju2ymds, ymds2ju
+!    USE ioipsl, ONLY : histbeg, histvert, histdef, histend, histsync
+!    USE ioipsl, ONLY : histwrite, ju2ymds, ymds2ju
+    USE ioipsl, ONLY :  ymds2ju
     USE ioipsl_getin_p_mod, ONLY : getin_p
 !    USE indice_sol_mod
@@ -525 +526 @@
 !JLD    REAL znivsig(klev)
 !JLD    real pir
-
+    
     REAL u(klon,klev)
     REAL v(klon,klev)
@@ -1263 +1264 @@
     REAL pi
 
+    !$acc data copyin (paprs, pplay)  &
+    !$acc &    create(t_w, q_w, limbas, d_t_adjwk, d_q_adjwk) &
+    !$acc &    create(t_x, q_x) &
+    !$acc &    present(wake_s, wake_deltat, wake_deltaq, t_seri,q_seri) &
+    !$acc &
+
+    
     pi = 4. * ATAN(1.)
 
@@ -1939 +1947 @@
              d_deltat_the(:,:) = 0.
              d_deltaq_the(:,:) = 0.
+             !$acc kernels default(none)
              d_deltat_ajs_cv(:,:) = 0.
              d_deltaq_ajs_cv(:,:) = 0.
+             !$acc end kernels
              d_s_wk(:) = 0.
              d_dens_wk(:) = 0.
@@ -2954 +2964 @@
        !t_w et t_x: si pas de poches froides, t_w=t_x=t_seri
        IF (iflag_wake>=1) THEN
-         DO k=1,klev
+          !$acc kernels default(none) async
+          DO k=1,klev
             DO i=1,klon
                 t_w(i,k) = t_seri(i,k) + (1-wake_s(i))*wake_deltat(i,k)
@@ -2962 +2973 @@
             ENDDO
          ENDDO
-       ELSE
-                t_w(:,:) = t_seri(:,:)
-                q_w(:,:) = q_seri(:,:)
-                t_x(:,:) = t_seri(:,:)
-                q_x(:,:) = q_seri(:,:)
+         !$acc end kernels
+      ELSE
+          !$acc kernels default(none) async
+          DO k=1,klev
+            DO i=1,klon
+                t_w(i,k) = t_seri(i,k)
+                q_w(i,k) = q_seri(i,k)
+                t_x(i,k) = t_seri(i,k)
+                q_x(i,k) = q_seri(i,k)
+            ENDDO
+         ENDDO
+         !$acc end kernels
        ENDIF
        !
@@ -2976 +2994 @@
           IF (iflag_adjwk >= 1) THEN
              limbas(:) = 1
+             !$acc update device(limbas)
              CALL ajsec(paprs, pplay, t_w, q_w, limbas, &
                   d_t_adjwk, d_q_adjwk)
+             !$acc update self(d_t_adjwk, d_q_adjwk)
              !
-             DO k=1,klev
-                DO i=1,klon
-                   IF (wake_s(i) .GT. 1.e-3) THEN
+             IF (wake_s(i) .GT. 1.e-3) THEN
+                !$acc kernels default(none) async
+                DO k=1,klev
+                   DO i=1,klon
                       t_w(i,k) = t_w(i,k) + d_t_adjwk(i,k)
                       q_w(i,k) = q_w(i,k) + d_q_adjwk(i,k)
                       d_deltat_ajs_cv(i,k) = d_t_adjwk(i,k)
                       d_deltaq_ajs_cv(i,k) = d_q_adjwk(i,k)
-                   ELSE
-                      d_deltat_ajs_cv(i,k) = 0.
-                      d_deltaq_ajs_cv(i,k) = 0.
-                   ENDIF
+                   ENDDO
                 ENDDO
-             ENDDO
+                !$acc end kernels
+             ELSE
+                !$acc kernels default(none)
+                d_deltat_ajs_cv(i,k) = 0.
+                d_deltaq_ajs_cv(i,k) = 0.
+                !$acc end kernels
+             ENDIF
+             !$acc update self(d_deltat_ajs_cv,d_deltaq_ajs_cv)               
              IF (iflag_adjwk == 2) THEN
                CALL add_wake_tend &
@@ -3046 +3071 @@
           !jyg   iflag_con est dans clesphys
           !c          CALL concvl (iflag_con,iflag_clos,
+!$acc update host(t_w, q_w)
           CALL concvl (iflag_clos, &
                phys_tstep, paprs, pplay, k_upper_cv, t_x,q_x, &
@@ -3591 +3617 @@
           ELSE IF (iflag_thermals>0) THEN
              ! Calling adjustment above the top of thermal plumes
+             !$acc update device(limbas)
              CALL ajsec(paprs, pplay, t_seri,q_seri,limbas &
                   , d_t_ajsb, d_q_ajsb)
@@ -3597 +3624 @@
           !--------------------------------------------------------------------
           ! ajout des tendances de l'ajustement sec ou des thermiques
+          !$acc update host (d_t_ajsb, d_q_ajsb)
           CALL add_phys_tend(du0,dv0,d_t_ajsb,d_q_ajsb,dql0,dqi0,paprs, &
                'ajsb',abortphy,flag_inhib_tend,itap,0)
@@ -5424 +5452 @@
 
     !      first=.false.
-
+    
+  !$acc end data
   END SUBROUTINE physiq