Changeset 953 for codes/icosagcm/trunk/src/dynamics/caldyn_hevi.F90

Timestamp:

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

Author:

adurocher

Message:

trunk : GPU implementation with OpenACC ( merge from glcp.idris.fr )

File:

• codes/icosagcm/trunk/src/dynamics/caldyn_hevi.F90 (moved) (moved from codes/icosagcm/trunk/src/dynamics/caldyn_hevi.f90) (7 diffs)

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

@@ -26 +26 @@
     USE output_field_mod
     USE checksum_mod
+    USE abort_mod
     IMPLICIT NONE
     LOGICAL,INTENT(IN)    :: write_out
@@ -86 +87 @@
        CALL wait_message(req_ps) ! COM00
     ELSE
+       CALL abort_acc("HEVI_scheme/!eta_mass")
        CALL send_message(f_mass,req_mass) ! COM00
        CALL wait_message(req_mass) ! COM00
@@ -93 +95 @@
 
     IF(.NOT.hydrostatic) THEN
+       CALL abort_acc("HEVI_scheme/!hydrostatic")
        CALL send_message(f_geopot,req_geopot) ! COM03
        CALL wait_message(req_geopot) ! COM03
@@ -112 +115 @@
        du=f_du_fast(ind)
        IF(hydrostatic) THEN
-          du(:,:)=0.
+          !$acc kernels present(du) async
+          du(:,:)=0.0d0
+          !$acc end kernels
           CALL compute_geopot(mass,theta, ps,pk,geopot)
        ELSE
+          CALL abort_acc("HEVI_scheme/!hydrostatic")
           phis = f_phis(ind)
           W = f_W(ind)
@@ -161 +167 @@
           CALL compute_caldyn_slow_hydro(u,mass,hflux,du, .TRUE.)
        ELSE
+          CALL abort_acc("HEVI_scheme/!hydrostatic")
           W = f_W(ind)
           dW = f_dW_slow(ind)
@@ -170 +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)
+       
        IF(caldyn_eta==eta_mass) THEN
           wflux=f_wflux(ind)
@@ -177 +185 @@
           CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
           IF(.NOT.hydrostatic) THEN
+             CALL abort_acc("HEVI_scheme/!hydrostatic")
              W_etadot=f_Wetadot(ind)
              CALL compute_caldyn_vert_NH(mass,geopot,W,wflux, W_etadot, du,dPhi,dW)