Changeset 561 for codes/icosagcm/trunk/src/dynamics/caldyn_hevi.f90

Timestamp:

09/25/17 14:20:00 (7 years ago)

Author:

dubos

Message:

trunk : backported commits 555-557 from devel

File:

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

codes/icosagcm/trunk/src/dynamics/caldyn_hevi.f90

@@ -59 +59 @@
     REAL(rstd),POINTER  :: convm(:,:) 
     REAL(rstd),POINTER  :: wwuu(:,:)
-        
+    REAL(rstd),POINTER  :: F_el(:,:), gradPhi2(:,:), w_il(:,:) , W_etadot(:,:), pres(:,:), m_il(:,:)
     INTEGER :: ind
     LOGICAL,SAVE :: first=.TRUE.
@@ -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,du)_fast and updates Phi,W
+          ! reuse buffers
+          m_il = f_wil(ind)
+          pres = f_gradPhi2(ind)
+          CALL compute_caldyn_solver(tau,mass,theta,pk,geopot,W, m_il,pres, dPhi,dW,du) ! computes d(Phi,W,du)_fast and updates Phi,W
        END IF
        u=f_u(ind)
@@ -161 +164 @@
           geopot = f_geopot(ind)
           dPhi = f_dPhi_slow(ind)
-          CALL compute_caldyn_slow_NH(u,mass,geopot,W, hflux,du,dPhi,dW)
+          F_el = f_Fel(ind)
+          gradPhi2 = f_gradPhi2(ind)
+          w_il = f_wil(ind)
+          CALL compute_caldyn_slow_NH(u,mass,geopot,W, F_el,gradPhi2,w_il, hflux,du,dPhi,dW)
        END IF
        CALL compute_caldyn_Coriolis(hflux,theta,qu, convm,dtheta_rhodz,du)
@@ -170 +176 @@
           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)
+             W_etadot=f_Wetadot(ind)
+             CALL compute_caldyn_vert_NH(mass,geopot,W,wflux, W_etadot, du,dPhi,dW)
           END IF
        END IF