Changeset 954 for codes/icosagcm/trunk/src/dynamics/caldyn_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_hevi.F90 (modified) (6 diffs)

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

@@ -16 +16 @@
     USE icosa
     USE observable_mod
-    USE disvert_mod, ONLY : caldyn_eta, eta_mass
+    USE disvert_mod, ONLY : caldyn_eta, eta_mass, bp, mass_dak, mass_dbk
     USE vorticity_mod
     USE kinetic_mod
@@ -110 +110 @@
        mass=f_mass(ind)
        theta = f_theta(ind)
-       CALL compute_theta(ps,theta_rhodz, mass,theta)
+       CALL compute_theta(ps,theta_rhodz, mass,theta, mass_dak, mass_dbk)
        pk = f_pk(ind)
        geopot = f_geopot(ind)
@@ -145 +145 @@
        qu=f_qu(ind)
        qv=f_qv(ind)
-       CALL compute_pvort_only(u,mass,qu,qv)
+       CALL compute_pvort_only(u,mass,qu,qv,Av,Riv2,fv)
     ENDDO
     
@@ -165 +165 @@
 
        IF(hydrostatic) THEN
-          CALL compute_caldyn_slow_hydro(u,mass,hflux,du, .TRUE.)
+          CALL compute_caldyn_slow_hydro(u,mass,hflux,du,Ai,le_de, .TRUE.)
        ELSE
           CALL abort_acc("HEVI_scheme/!hydrostatic")
@@ -177 +177 @@
           CALL compute_caldyn_slow_NH(u,mass,geopot,W, F_el,gradPhi2,w_il, hflux,du,dPhi,dW)
        END IF
-       CALL compute_caldyn_Coriolis(hflux,theta,qu,convm,dtheta_rhodz,du)
+       CALL compute_caldyn_Coriolis(hflux,theta,qu,convm,dtheta_rhodz,du,Ai,wee)
        
        IF(caldyn_eta==eta_mass) THEN
@@ -183 +183 @@
           wwuu=f_wwuu(ind)
           dps=f_dps(ind)
-          CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
+          CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du, bp)
           IF(.NOT.hydrostatic) THEN
              CALL abort_acc("HEVI_scheme/!hydrostatic")