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

Timestamp:

08/27/18 13:51:26 (6 years ago)

Author:

dubos

Message:

devel : consistent discretization of kinetic energy

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(:,:)
+    REAL(rstd),POINTER :: u(:,:), w(:,:), qu(:,:), qv(:,:), Kv(:,:)
 
 ! temporary shared variable
@@ -74 +74 @@
       CALL init_message(f_u,req_e1_vect,req_u)
       CALL init_message(f_qu,req_e1_scal,req_qu)
+      IF(caldyn_kinetic==kinetic_consistent) CALL init_message(f_Kv,req_z1_scal,req_Kv)
       IF(.NOT.hydrostatic) THEN
          CALL init_message(f_geopot,req_i1,req_geopot)
@@ -140 +141 @@
        qv=f_qv(ind)
        CALL compute_pvort_only(u,mass,qu,qv)
+       IF(caldyn_kinetic==kinetic_consistent) THEN
+          Kv=f_Kv(ind)
+          CALL compute_caldyn_Kv(u,Kv)
+       END IF
     ENDDO
     
     CALL send_message(f_qu,req_qu) ! COM03
     CALL wait_message(req_qu) ! COM03
-       
+
+    IF(caldyn_kinetic==kinetic_consistent) THEN
+       CALL send_message(f_Kv,req_Kv)
+       CALL wait_message(req_Kv)
+    END IF
+
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
@@ -159 +169 @@
 
        IF(hydrostatic) THEN
-          CALL compute_caldyn_slow_hydro(u,mass,hflux,du, .TRUE.)
+          Kv=f_Kv(ind)
+          CALL compute_caldyn_slow_hydro(u,mass,hflux,Kv,du, .TRUE.)
        ELSE
           W = f_W(ind)