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

Timestamp:

04/08/16 09:34:17 (8 years ago)

Author:

dubos

Message:

Mass-based NH

File:

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

codes/icosagcm/trunk/src/caldyn_hevi.f90

@@ -118 +118 @@
           dW = f_dW_fast(ind)
           dPhi = f_dPhi_fast(ind)
-          CALL compute_caldyn_solver(tau,mass,theta,pk,geopot,W,dPhi,dW,du) ! 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,du)_fast and updates Phi,W
        END IF
        u=f_u(ind)
-       CALL compute_caldyn_fast(tau,u,mass,theta,pk,geopot,du) ! computes du_fast and updates du
+       CALL compute_caldyn_fast(tau,u,mass,theta,pk,geopot,du) ! computes du_fast and updates u
     ENDDO
     
@@ -167 +167 @@
           wwuu=f_wwuu(ind)
           dps=f_dps(ind)
-          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
+          CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
+          IF(.NOT.hydrostatic) THEN
+             CALL compute_caldyn_vert_NH(mass,geopot,W,wflux, du,dPhi,dW)
           END IF
        END IF