--- trunk/dyn3d/caldyn0.f 2014/09/04 10:05:52 104 +++ trunk/Sources/dyn3d/caldyn0.f 2015/07/24 14:27:59 161 @@ -14,6 +14,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 @@ -42,7 +43,6 @@ REAL massebx(ip1jmp1, llm), masseby((iim + 1) * jjm, llm) REAL vorpot(iim + 1, jjm, llm) real ecin(iim + 1, jjm + 1, llm), convm(ip1jmp1, llm) - REAL bern(iim + 1, jjm + 1, llm) REAL massebxy(iim + 1, jjm, llm), dp(ip1jmp1) INTEGER l @@ -61,9 +61,8 @@ CALL vitvert(convm, w) CALL tourpot(vcov, ucov, massebxy, vorpot) CALL enercin(vcov, ucov, vcont, ucont, ecin) - CALL bernoui(phi, ecin, bern) - CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, bern, dp, & - resetvarc = .true.) + CALL sortvarc(ucov, teta, ps, masse, pk, phis, vorpot, phi, & + bernoui(phi, ecin), dp, resetvarc = .true.) END SUBROUTINE caldyn0