Changeset 735 for codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

Timestamp:

08/27/18 18:35:24 (6 years ago)

Author:

dubos

Message:

devel : Gassmann (2018) modification of TRiSK Coriolis discretization

File:

• codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90 (modified) (4 diffs)

codes/icosagcm/devel/src/dynamics/caldyn_hevi.f90

@@ -51 +51 @@
     REAL(rstd),POINTER :: mass(:,:), theta_rhodz(:,:,:), dtheta_rhodz(:,:,:)
     REAL(rstd),POINTER :: du(:,:), dW(:,:), dPhi(:,:), hflux(:,:), wflux(:,:)
-    REAL(rstd),POINTER :: u(:,:), w(:,:), qu(:,:), qv(:,:), Kv(:,:)
+    REAL(rstd),POINTER :: u(:,:), w(:,:), qu(:,:), qv(:,:), Kv(:,:), hv(:,:)
 
 ! temporary shared variable
@@ -140 +140 @@
        qu=f_qu(ind)
        qv=f_qv(ind)
-       CALL compute_pvort_only(u,mass,qu,qv)
+       hv=f_hv(ind)
+       CALL compute_pvort_only(u,mass,qu,qv,hv)
        IF(caldyn_kinetic==kinetic_consistent) THEN
           Kv=f_Kv(ind)
@@ -151 +152 @@
 
     IF(caldyn_kinetic==kinetic_consistent) THEN
+       CALL transfert_request(f_hv,req_z1_scal)
        CALL send_message(f_Kv,req_Kv)
        CALL wait_message(req_Kv)
@@ -169 +171 @@
 
        IF(hydrostatic) THEN
+          hv=f_hv(ind)
           Kv=f_Kv(ind)
-          CALL compute_caldyn_slow_hydro(u,mass,hflux,Kv,du, .TRUE.)
+          CALL compute_caldyn_slow_hydro(u,mass,hv, hflux,Kv,du, .TRUE.)
        ELSE
           W = f_W(ind)