Changeset 1046 for codes/icosagcm/trunk/src/diagnostics

Timestamp:

08/20/20 16:22:41 (4 years ago)

Author:

ymipsl

Message:

Introduce modification from A. Durocher github to make held&suarez testcase working on GPU

YM & AD

Location:

codes/icosagcm/trunk/src/diagnostics

Files:

• geopotential_mod.f90 (modified) (1 diff)
• theta_rhodz.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/diagnostics/geopotential_mod.f90

@@ -28 +28 @@
        theta_rhodz = f_theta_rhodz(ind)
        theta = f_theta(ind)
-       CALL compute_theta_rhodz2theta(ps, theta_rhodz,theta,0)
+       CALL compute_theta_rhodz2theta(ps, theta_rhodz,theta,0, ondevice=.FALSE.)
        phis = f_phis(ind)
        phi = f_phi(ind)

codes/icosagcm/trunk/src/diagnostics/theta_rhodz.f90

@@ -39 +39 @@
       theta_rhodz=f_theta_rhodz(ind)
       theta=f_theta(ind)
-      CALL compute_theta_rhodz2theta(ps, theta_rhodz,theta,0)
+      CALL compute_theta_rhodz2theta(ps, theta_rhodz,theta,0, ondevice=.false.)
     ENDDO
 !$OMP BARRIER
@@ -132 +132 @@
       theta=f_theta(ind)
       theta_rhodz=f_theta_rhodz(ind)
-      CALL compute_theta2theta_rhodz(ps, theta, theta_rhodz,0)
+      CALL compute_theta2theta_rhodz(ps, theta, theta_rhodz,0,ondevice=.false.)
     ENDDO
 !$OMP BARRIER
@@ -138 +138 @@
   END SUBROUTINE theta2theta_rhodz
   
-  SUBROUTINE compute_theta2theta_rhodz(ps,theta, theta_rhodz,offset)
+  SUBROUTINE compute_theta2theta_rhodz(ps,theta, theta_rhodz,offset, ondevice)
   USE icosa
   USE disvert_mod
@@ -147 +147 @@
     REAL(rstd),INTENT(OUT) :: theta_rhodz(iim*jjm,llm)
     INTEGER,INTENT(IN) :: offset
+    LOGICAL, INTENT(IN) :: ondevice
     REAL(rstd) :: rhodz
     INTEGER :: i,j,ij,l
     
 !$OMP BARRIER
+    !$acc parallel loop collapse(3) default(present) async if(ondevice)
     DO    l    = ll_begin, ll_end
       DO j=jj_begin-offset,jj_end+offset
@@ -165 +167 @@
   END SUBROUTINE compute_theta2theta_rhodz
 
-  SUBROUTINE compute_theta_rhodz2theta(ps,theta_rhodz,theta,offset)
+  SUBROUTINE compute_theta_rhodz2theta(ps,theta_rhodz,theta,offset,ondevice)
   USE icosa
   USE disvert_mod
@@ -174 +176 @@
     REAL(rstd),INTENT(OUT) :: theta(iim*jjm,llm)
     INTEGER,INTENT(IN) :: offset
+    LOGICAL, INTENT(IN) :: ondevice
     REAL(rstd) :: rhodz
     INTEGER :: i,j,ij,l
 
 !$OMP BARRIER
+    !$acc parallel loop collapse(3) default(present) async if(ondevice)
     DO    l    = ll_begin, ll_end
       DO j=jj_begin-offset,jj_end+offset