Changeset 519 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

12/24/16 02:33:07 (7 years ago)

Author:

dubos

Message:

Fixed RK2.5 - cleanup to follow

File:

• codes/icosagcm/trunk/src/caldyn_gcm.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -2 +2 @@
   USE icosa
   USE transfert_mod
+  USE caldyn_kernels_hevi_mod
   USE caldyn_kernels_base_mod
   USE caldyn_kernels_mod
@@ -190 +191 @@
 
 ! temporary shared variable
-    REAL(rstd),POINTER  :: theta(:,:)  
+    REAL(rstd),POINTER  :: theta(:,:,:)  
     REAL(rstd),POINTER  :: pk(:,:)
     REAL(rstd),POINTER  :: geopot(:,:)
@@ -225 +226 @@
     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
+       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
     CALL send_message(f_u,req_u) ! COM02
+    CALL wait_message(req_u) ! COM02
+
+    IF(.NOT.hydrostatic) THEN
+       STOP 'caldyn_gcm may not be used yet when non-hydrostatic'
+    END IF
 
     SELECT CASE(caldyn_conserv)
@@ -245 +254 @@
           qu=f_qu(ind)
           qv=f_qv(ind)
+          pk = f_pk(ind)
+          geopot = f_geopot(ind)  
+          hflux=f_hflux(ind)
+          convm = f_dmass(ind)
+          dtheta_rhodz=f_dtheta_rhodz(ind)
+          du=f_du(ind)
           CALL compute_pvort(ps,u,theta_rhodz(:,:,1), mass,theta,qu,qv) ! COM00 COM01 COM02
-       ENDDO
-!       CALL checksum(f_mass)
-!       CALL checksum(f_theta)
-
-       CALL send_message(f_qu,req_qu) ! COM03 wait_message in caldyn_horiz
-!       CALL wait_message(req_qu)
+!          CALL compute_theta(ps,theta_rhodz, mass,theta)
+!          CALL compute_pvort_only(u,mass,qu,qv)
+
+          CALL compute_geopot(mass,theta, ps,pk,geopot)
+!          du(:,:)=0.
+!          CALL compute_caldyn_fast(0.,u,mass,theta,pk,geopot,du)
+       ENDDO       
+
+       CALL send_message(f_u,req_u) ! COM02
+       CALL wait_message(req_u) ! COM02
+       CALL send_message(f_qu,req_qu) ! COM03
+       CALL wait_message(req_qu) ! COM03
 
        DO ind=1,ndomain
@@ -259 +280 @@
           ps=f_ps(ind)
           u=f_u(ind)
+          theta_rhodz = f_theta_rhodz(ind)
           mass=f_mass(ind)
           theta = f_theta(ind)
           qu=f_qu(ind)
+          qv=f_qv(ind)
           pk = f_pk(ind)
           geopot = f_geopot(ind)  
-          CALL compute_geopot(ps,mass,theta, pk,geopot)
           hflux=f_hflux(ind)
           convm = f_dmass(ind)
           dtheta_rhodz=f_dtheta_rhodz(ind)
           du=f_du(ind)
+
           CALL compute_caldyn_horiz(u,mass,qu,theta,pk,geopot, hflux,convm,dtheta_rhodz(:,:,1),du)
+!          CALL compute_caldyn_slow_hydro(u,mass,hflux,du, .FALSE.) ! FIXME
+!          CALL compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du) 
           IF(caldyn_eta==eta_mass) THEN
              wflux=f_wflux(ind)
@@ -278 +303 @@
        ENDDO       
    
-!       CALL checksum(f_geopot)
-!       CALL checksum(f_dmass)
-!       CALL checksum(f_pk)
-!       CALL checksum(f_pk)
-       
     CASE(enstrophy) ! enstrophy-conserving
        DO ind=1,ndomain