--- trunk/Sources/dyn3d/caldyn0.f 2015/04/29 15:47:56 134 +++ trunk/Sources/dyn3d/caldyn0.f 2015/07/24 18:14:04 163 @@ -4,8 +4,7 @@ contains - SUBROUTINE caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, & - pbaru, pbarv) + SUBROUTINE caldyn0(ucov, vcov, teta, ps, pk, phis, phi) ! From dyn3d/caldyn0.F, version 1.1.1.1, 2004/05/19 12:53:07 ! Authors: P. Le Van, F. Forget @@ -14,6 +13,7 @@ use bernoui_m, only: bernoui USE comgeom, ONLY: airesurg use convmas_m, only: convmas + use covcont_m, only: covcont USE dimens_m, ONLY: iim, jjm, llm USE disvert_m, ONLY: ap, bp use flumass_m, only: flumass @@ -29,14 +29,14 @@ REAL, INTENT(IN):: vcov(:, :, :) ! (iim + 1, jjm, llm) ! vent covariant REAL, INTENT(IN):: teta(ip1jmp1, llm) REAL, INTENT (IN):: ps(ip1jmp1) - real, intent(out):: masse(ip1jmp1, llm) REAL, INTENT (IN):: pk(iip1, jjp1, llm) REAL, INTENT (IN):: phis(ip1jmp1) REAL, INTENT (IN):: phi(iim + 1, jjm + 1, llm) - REAL, INTENT(out):: w(:, :, :) ! (iim + 1, jjm + 1, llm) - REAL, intent(out):: pbaru(ip1jmp1, llm), pbarv((iim + 1) * jjm, llm) ! Local: + real masse(ip1jmp1, llm) + REAL w(iim + 1, jjm + 1, llm) + REAL pbaru(ip1jmp1, llm), pbarv((iim + 1) * jjm, llm) REAL vcont((iim + 1) * jjm, llm), ucont(ip1jmp1, llm) REAL p(ip1jmp1, llmp1) REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm)