Changeset 362 for codes/icosagcm/trunk/src/caldyn_hevi.f90

Timestamp:

09/25/15 14:36:36 (9 years ago)

Author:

dubos

Message:

Introduced DEC convention for velocity - HEVI only - cleanup to follow

File:

• codes/icosagcm/trunk/src/caldyn_hevi.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/caldyn_hevi.f90

@@ -2 +2 @@
   USE icosa
   USE transfert_mod
-  USE caldyn_kernels_mod
+  USE caldyn_kernels_base_mod
+  USE caldyn_kernels_hevi_mod
   USE caldyn_gcm_mod
-
   IMPLICIT NONE
   PRIVATE
-
   PUBLIC caldyn_hevi
 
@@ -75 +74 @@
     IF(caldyn_eta==eta_mass) THEN
        CALL send_message(f_ps,req_ps) ! COM00
+       CALL wait_message(req_ps) ! COM00
     ELSE
        CALL send_message(f_mass,req_mass) ! COM00
-    END IF
-
-    ! Block below moved from caldyn_pvort when splitting it into caldyn_theta and caldyn_pvort_only
-    IF(caldyn_eta==eta_mass) THEN
-       CALL wait_message(req_ps) ! COM00
-    ELSE
        CALL wait_message(req_mass) ! COM00
     END IF
-
     CALL send_message(f_theta_rhodz,req_theta_rhodz) ! COM01
     CALL wait_message(req_theta_rhodz) ! COM01 Moved from caldyn_pvort
@@ -100 +93 @@
        theta = f_theta(ind)
        pk = f_pk(ind)
-       geopot = f_geopot(ind)  
+       geopot = f_geopot(ind)
        CALL compute_theta(ps,theta_rhodz, mass,theta)
        CALL compute_geopot(ps,mass,theta, pk,geopot)