Changeset 4442

Timestamp:

Feb 17, 2023, 5:28:31 PM (2 years ago)

Author:

Laurent Fairhead

Message:

GPU modifications to calling routines

Location:

LMDZ6/branches/Portage_acc/libf/phylmd

Files:

• physiq_mod.F90 (modified) (3 diffs)
• thermcell_ini_mod.F90 (modified) (4 diffs)
• thermcell_main.F90 (modified) (3 diffs)

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

@@ -1271 +1271 @@
     !$acc & copyout(d_u,d_v,d_t,d_qx,d_ps) &
     !$acc &    create(t_w, q_w, limbas, d_t_adjwk, d_q_adjwk) &
-    !$acc &    create(t_x, q_x) 
+    !$acc &    create(d_deltaq_ajs_cv, d_deltat_ajs_cv) &
+    !$acc &    create(t_x, q_x) &
 !    !$acc &    present(wake_s, wake_deltat, wake_deltaq)  &
-!    !$acc &    present(t_seri,q_seri)
+    !$acc &    present(t_seri,q_seri, ql_seri, v_seri, u_seri, qs_seri, rneb_seri)
 
     
@@ -1803 +1804 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
        CALL wake_ini(rg,rd,rv,prt_level)
+   CALL iophys_ini(pdtphys) ! replay automatic include
+   open(81,file='dump_param.bin',form='unformatted')  ! replay automatic include
        CALL thermcell_ini(iflag_thermals,prt_level,tau_thermals,lunout, &
-   &    RG,RD,RCPD,RKAPPA,RLVTT,RETV)
+   &    RG,RD,RCPD,RKAPPA,RLVTT,RETV, RTT)
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3010 +3013 @@
              !$acc update self(d_t_adjwk, d_q_adjwk)
              !
-                 !$acc kernels default(none) async
+             !$acc kernels default(none) async
                 DO k=1,klev
                    DO i=1,klon

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

@@ -4 +4 @@
 save
    integer :: dvdq=1,dqimpl=-1,prt_level=0,lunout
-   real RG,RD,RCPD,RKAPPA,RLVTT,RLvCp,RETV
+   real RG,RD,RCPD,RKAPPA,RLVTT,RLvCp,RETV, RTT
    real           :: r_aspect_thermals,tau_thermals,fact_thermals_ed_dz
    integer        :: iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure
@@ -10 +10 @@
 
 !$OMP THREADPRIVATE(dvdq,dqimpl,prt_level,lunout)
-!$OMP THREADPRIVATE(RG,RD,RCPD,RKAPPA,RLVTT,RLvCp)
+!$OMP THREADPRIVATE(RG,RD,RCPD,RKAPPA,RLVTT,RLvCp, RTT)
 !$OMP THREADPRIVATE(r_aspect_thermals,tau_thermals,fact_thermals_ed_dz)
 !$OMP THREADPRIVATE(iflag_thermals_ed,iflag_thermals_optflux,iflag_thermals_closure)
@@ -33 +33 @@
 
 SUBROUTINE thermcell_ini(iflag_thermals,prt_level_in,tau_thermals_in,lunout_in, &
-   &    RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in)
+   &    RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in, RTT_in)
 
    USE ioipsl_getin_p_mod, ONLY : getin_p
 
 integer, intent(in) :: iflag_thermals,prt_level_in,lunout_in
-real, intent(in) :: RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in,tau_thermals_in
+real, intent(in) :: RG_in,RD_in,RCPD_in,RKAPPA_in,RLVTT_in,RETV_in,tau_thermals_in, RTT_in
 
    if (iflag_thermals==15.or.iflag_thermals==16) then
@@ -55 +55 @@
    RLvCp = RLVTT/RCPD
    RETV=RETV_in
+   RTT=RTT_in
    tau_thermals=tau_thermals_in
    lunout=lunout_in

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

@@ -130 +130 @@
 #endif
 
+      
 !
 
@@ -165 +166 @@
 !   --------------------------------------------------------------------
 !
+
+   !$acc data &
+   !$acc &   copyin (po, pt, pu, pv, pplay, pplev) &
+   !$acc &   copyout(zo, zl, zh, ztv, zthl)        &
+   !$acc &   copyout (zpspsk, zu, zv, zqsat)       &
+   !$acc &
+       
       CALL thermcell_env(ngrid,nlay,po,pt,pu,pv,pplay,  &
      &           pplev,zo,zh,zl,ztv,zthl,zu,zv,zpspsk,zqsat,lev_out)
        
+   !$acc end data      
       if (prt_level.ge.1) print*,'thermcell_main apres thermcell_env'
 
@@ -687 +696 @@
 
       if (prt_level.ge.1) print*,'thermcell_main FIN  OK'
+      
 
  RETURN