Changeset 954 for codes/icosagcm/trunk/src/transport

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.

Location:

codes/icosagcm/trunk/src/transport

Files:

• advect.F90 (modified) (5 diffs)
• advect_tracer.F90 (modified) (2 diffs)

codes/icosagcm/trunk/src/transport/advect.F90

@@ -49 +49 @@
   !=======================================================================================
 
-  SUBROUTINE compute_gradq3d(qi,sqrt_leng,gradq3d,xyz_i, xyz_v)
+  SUBROUTINE compute_gradq3d(qi,sqrt_leng,gradq3d,xyz_i,xyz_v)
     USE trace
     USE omp_para
@@ -348 +348 @@
 
   ! Backward trajectories, for use with Miura approach
-  SUBROUTINE compute_backward_traj(normal,tangent,ue,tau,cc)
-    USE geometry, ONLY : xyz_e, de, wee, le
+  SUBROUTINE compute_backward_traj(normal,tangent,ue,tau, cc, &
+                                   xyz_e, de, wee, le         ) ! metrics terms
     USE trace
     USE omp_para
@@ -358 +358 @@
     REAL(rstd),INTENT(OUT)   :: cc(3*iim*jjm,llm,3) ! start of backward trajectory
     REAL(rstd),INTENT(IN)    :: tau
+! metrics terms
+    REAL(rstd),INTENT(IN)    :: xyz_e(iim*3*jjm,3)
+    REAL(rstd),INTENT(IN)    :: de(iim*3*jjm)
+    REAL(rstd),INTENT(IN)    :: wee(iim*3*jjm,5,2)
+    REAL(rstd),INTENT(IN)    :: le(iim*3*jjm)
 
     REAL(rstd) :: v_e(3), up_e   
@@ -427 +432 @@
   ! Horizontal transport (S. Dubey, T. Dubos)
   ! Slope-limited van Leer approach with hexagons
-  SUBROUTINE compute_advect_horiz(update_mass,diagflux_on, hfluxt,cc,gradq3d, mass, qi, qfluxt)
+  SUBROUTINE compute_advect_horiz(update_mass,diagflux_on, hfluxt,cc,gradq3d, mass, qi, qfluxt,  &
+                                  Ai, xyz_i)   ! metrics terms 
     USE trace
     USE omp_para
     USE abort_mod
-    USE geometry, only : Ai, xyz_i
     IMPLICIT NONE
     LOGICAL, INTENT(IN)       :: update_mass, diagflux_on
@@ -441 +446 @@
     REAL(rstd), INTENT(INOUT) :: qfluxt(3*iim*jjm,MERGE(llm,1,diagflux_on)) ! time-integrated tracer flux
 ! metrics terms
+    REAL(rstd), INTENT(IN)    :: Ai(iim*jjm)
+    REAL(rstd), INTENT(IN)    :: xyz_i(iim*jjm,3)
     
     REAL(rstd) :: dq,dmass,qe,newmass

codes/icosagcm/trunk/src/transport/advect_tracer.F90

@@ -143 +143 @@
        END DO
 
-       CALL compute_backward_traj(tangent,normal,u,0.5*dt*itau_adv, cc)
+       CALL compute_backward_traj(tangent,normal,u,0.5*dt*itau_adv, cc,   &
+                                  xyz_e, de, wee, le                   ) ! metrics terms
     END DO
 
@@ -193 +194 @@
              END IF
           END IF
-          CALL compute_advect_horiz(k==nq_last,frac>0., hfluxt,cc,gradq3d, rhodz, q(:,:,k), qfluxt(:,:,k))
+          CALL compute_advect_horiz(k==nq_last,frac>0., hfluxt,cc,gradq3d, rhodz, q(:,:,k), qfluxt(:,:,k),  &
+                                    Ai, xyz_i)   ! metrics terms
         END DO