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

Timestamp:

10/30/15 15:41:06 (9 years ago)

Author:

dubos

Message:

Progress towards NH

File:

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

codes/icosagcm/trunk/src/caldyn_hevi.f90

@@ -12 +12 @@
   
   SUBROUTINE caldyn_hevi(write_out,tau, f_phis, f_ps, f_mass, f_theta_rhodz, f_u, f_q, &
-       f_geopot, f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du_slow, f_du_fast)
+       f_W, f_geopot, f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, &
+       f_du_slow, f_du_fast, f_dPhi_slow, f_dPhi_fast, f_dW_slow, f_dW_fast) 
     USE icosa
     USE observable_mod
@@ -34 +35 @@
     TYPE(t_field),POINTER :: f_u(:)
     TYPE(t_field),POINTER :: f_q(:)
+    TYPE(t_field),POINTER :: f_W(:)
     TYPE(t_field),POINTER :: f_geopot(:)
     TYPE(t_field),POINTER :: f_hflux(:), f_wflux(:)
@@ -41 +43 @@
     TYPE(t_field) :: f_du_slow(:)
     TYPE(t_field) :: f_du_fast(:)
+    TYPE(t_field) :: f_dW_slow(:)
+    TYPE(t_field) :: f_dW_fast(:)
+    TYPE(t_field) :: f_dPhi_slow(:)
+    TYPE(t_field) :: f_dPhi_fast(:)
     
     REAL(rstd),POINTER :: ps(:), dps(:)
     REAL(rstd),POINTER :: mass(:,:), theta_rhodz(:,:), dtheta_rhodz(:,:)
-    REAL(rstd),POINTER :: du(:,:), hflux(:,:), wflux(:,:)
-    REAL(rstd),POINTER :: u(:,:), qu(:,:), qv(:,:)
+    REAL(rstd),POINTER :: du(:,:), dW(:,:), dPhi(:,:), hflux(:,:), wflux(:,:)
+    REAL(rstd),POINTER :: u(:,:), w(:,:), qu(:,:), qv(:,:)
 
 ! temporary shared variable
@@ -68 +74 @@
       CALL init_message(f_u,req_e1_vect,req_u)
       CALL init_message(f_qu,req_e1_scal,req_qu)
+      IF(.NOT.hydrostatic) THEN
+         CALL init_message(f_geopot,req_i1,req_geopot)
+         CALL init_message(f_w,req_i1,req_w)
+      END IF
     ENDIF
     
@@ -81 +91 @@
     CALL send_message(f_theta_rhodz,req_theta_rhodz) ! COM01
     CALL wait_message(req_theta_rhodz) ! COM01 Moved from caldyn_pvort
+
+    IF(.NOT.hydrostatic) THEN
+       CALL send_message(f_geopot,req_geopot) ! COM03
+       CALL wait_message(req_geopot) ! COM03
+       CALL send_message(f_w,req_w) ! COM04
+       CALL wait_message(req_w) ! COM04
+    END IF
     
     DO ind=1,ndomain
@@ -87 +104 @@
        CALL swap_geometry(ind)
        ps=f_ps(ind)
-       u=f_u(ind)
-       du=f_du_fast(ind)
        theta_rhodz=f_theta_rhodz(ind)
        mass=f_mass(ind)
        theta = f_theta(ind)
+       CALL compute_theta(ps,theta_rhodz, mass,theta)
        pk = f_pk(ind)
        geopot = f_geopot(ind)
-       CALL compute_theta(ps,theta_rhodz, mass,theta)
-       CALL compute_geopot(ps,mass,theta, pk,geopot)
-       CALL compute_caldyn_fast(tau,u,mass,theta,pk,geopot, du) ! computes du_fast and updates u
+       IF(hydrostatic) THEN
+          CALL compute_geopot(ps,mass,theta, pk,geopot)
+       ELSE
+          W = f_W(ind)
+          dW = f_dW_fast(ind)
+          dPhi = f_dPhi_fast(ind)
+          CALL compute_caldyn_solver(tau,mass,theta,pk,geopot,W,dPhi,dW) ! computes d(Phi,W)_fast and updates Phi,W
+       END IF
+       u=f_u(ind)
+       du=f_du_fast(ind)
+       CALL compute_caldyn_fast(tau,u,mass,theta,pk,geopot,du) ! computes du_fast and updates du
     ENDDO