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

Timestamp:

01/22/16 17:09:54 (8 years ago)

Author:

dubos

Message:

More NH terms - tested with DCMIP3

File:

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

codes/icosagcm/trunk/src/caldyn_hevi.f90

@@ -110 +110 @@
        pk = f_pk(ind)
        geopot = f_geopot(ind)
+       du=f_du_fast(ind)
        IF(hydrostatic) THEN
+          du(:,:)=0.
           CALL compute_geopot(ps,mass,theta, pk,geopot)
        ELSE
@@ -116 +118 @@
           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
+          CALL compute_caldyn_solver(tau,mass,theta,pk,geopot,W,dPhi,dW,du) ! 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
@@ -138 +139 @@
     
     CALL send_message(f_qu,req_qu) ! COM03
-    
+    CALL wait_message(req_qu) ! COM03
+       
     DO ind=1,ndomain
        IF (.NOT. assigned_domain(ind)) CYCLE
@@ -151 +153 @@
        dtheta_rhodz=f_dtheta_rhodz(ind)
        du=f_du_slow(ind)
-       CALL compute_caldyn_slow(u,mass,qu,theta, hflux,convm,dtheta_rhodz,du) ! COM03
+       IF(hydrostatic) THEN
+          CALL compute_caldyn_slow_hydro(u,mass,hflux,du)
+       ELSE
+          W = f_W(ind)
+          dW = f_dW_slow(ind)
+          geopot = f_geopot(ind)
+          dPhi = f_dPhi_slow(ind)
+          CALL compute_caldyn_slow_NH(u,mass,geopot,W, hflux,du,dPhi,dW)
+       END IF
+       CALL compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du)
        IF(caldyn_eta==eta_mass) THEN
           wflux=f_wflux(ind)
           wwuu=f_wwuu(ind)
           dps=f_dps(ind)
-          CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
+          IF(hydrostatic) THEN
+             CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
+          ELSE
+             PRINT *, 'NH dynamics limited to Lagrangian vertical coordinate so far !' 
+             STOP
+          END IF
        END IF
     ENDDO