Changeset 954 for codes/icosagcm/trunk/src/dynamics/caldyn_kernels_hevi.F90

Timestamp:

07/15/19 12:29:31 (5 years ago)

Author:

adurocher

Message:

trunk : Added metric terms to kernels parameters to avoid Host/GPU transferts

Metric terms are now subroutine parameters instead of module variables in kernel subroutines. Dummy arguments for metric terms are now defined as fixed-size arrays, and arrays dimensions are well known when entering an 'acc data' region. Array descriptors are no longer transferred form host to device each time the data region is executed.

File:

• codes/icosagcm/trunk/src/dynamics/caldyn_kernels_hevi.F90 (modified) (6 diffs)

codes/icosagcm/trunk/src/dynamics/caldyn_kernels_hevi.F90

@@ -20 +20 @@
 CONTAINS
 
-  SUBROUTINE compute_theta(ps,theta_rhodz, rhodz,theta)
-    USE disvert_mod, ONLY : mass_dbk, mass_dak
+  SUBROUTINE compute_theta(ps,theta_rhodz, rhodz,theta, mass_dak, mass_dbk)
     REAL(rstd),INTENT(IN)    :: ps(iim*jjm)
     REAL(rstd),INTENT(IN)    :: theta_rhodz(iim*jjm,llm,nqdyn)
     REAL(rstd),INTENT(INOUT) :: rhodz(iim*jjm,llm)
     REAL(rstd),INTENT(OUT)   :: theta(iim*jjm,llm,nqdyn)
+    REAL(rstd),INTENT(IN)    :: mass_dak(llm)
+    REAL(rstd),INTENT(IN)    :: mass_dbk(llm)
     INTEGER :: ij,l,iq
     REAL(rstd) :: m
@@ -59 +60 @@
   END SUBROUTINE compute_theta
 
-  SUBROUTINE compute_pvort_only(u,rhodz,qu,qv)
-    USE geometry, ONLY : Av, Riv2, fv
+  SUBROUTINE compute_pvort_only(u,rhodz,qu,qv,Av,Riv2,fv)
     REAL(rstd),INTENT(IN)  :: u(iim*3*jjm,llm)
     REAL(rstd),INTENT(INOUT) :: rhodz(iim*jjm,llm)
     REAL(rstd),INTENT(OUT) :: qu(iim*3*jjm,llm)
     REAL(rstd),INTENT(OUT) :: qv(iim*2*jjm,llm)
+    REAL(rstd),INTENT(IN)  :: Av(2*iim*jjm)
+    REAL(rstd),INTENT(IN)  :: Riv2(iim*jjm,6)
+    REAL(rstd),INTENT(IN)  :: fv(2*iim*jjm)
 
     INTEGER :: ij,l
@@ -551 +554 @@
   END SUBROUTINE compute_caldyn_fast
     
-  SUBROUTINE compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du)
-    USE geometry, ONLY : Ai, wee
+  SUBROUTINE compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du,Ai,wee)
     REAL(rstd),INTENT(IN)  :: hflux(3*iim*jjm,llm)  ! hflux in kg/s
     REAL(rstd),INTENT(IN)  :: theta(iim*jjm,llm,nqdyn) ! active scalars
@@ -559 +561 @@
     REAL(rstd),INTENT(OUT) :: dtheta_rhodz(iim*jjm,llm,nqdyn)
     REAL(rstd),INTENT(INOUT) :: du(3*iim*jjm,llm)
+    REAL(rstd),INTENT(IN)  :: Ai(iim*jjm)
+    REAL(rstd),INTENT(IN)  :: wee(3*iim*jjm,5,2)
     
     REAL(rstd) :: Ftheta(3*iim*jjm,llm)  ! potential temperature flux
@@ -730 +734 @@
   END SUBROUTINE compute_caldyn_Coriolis
 
-  SUBROUTINE compute_caldyn_slow_hydro(u,rhodz,hflux,du,zero)
-    USE geometry, ONLY : Ai, le_de
+  SUBROUTINE compute_caldyn_slow_hydro(u,rhodz,hflux,du,Ai,le_de,zero)
     LOGICAL, INTENT(IN) :: zero
     REAL(rstd),INTENT(IN)  :: u(3*iim*jjm,llm)    ! prognostic "velocity"
@@ -737 +740 @@
     REAL(rstd),INTENT(OUT) :: hflux(3*iim*jjm,llm) ! hflux in kg/s
     REAL(rstd),INTENT(INOUT) :: du(3*iim*jjm,llm)
+    REAL(rstd),INTENT(IN)  :: Ai(iim*jjm)
+    REAL(rstd),INTENT(IN)  :: le_de(3*iim*jjm)
     
     REAL(rstd) :: berni(iim*jjm,llm)  ! Bernoulli function