--- trunk/Sources/phylmd/CV30_routines/cv3_undilute2.f 2016/03/16 14:50:46 184 +++ trunk/Sources/phylmd/CV30_routines/cv30_undilute2.f 2016/03/21 15:36:26 186 @@ -1,10 +1,10 @@ -module cv3_undilute2_m +module cv30_undilute2_m implicit none contains - SUBROUTINE cv3_undilute2(nloc, ncum, nd, icb, icbs, nk, tnk, qnk, gznk, t, & + SUBROUTINE cv30_undilute2(nloc, ncum, nd, icb, icbs, nk, tnk, qnk, gznk, t, & qs, gz, p, h, tv, lv, pbase, buoybase, plcl, inb, tp, tvp, clw, hp, & ep, sigp, buoy) @@ -16,7 +16,7 @@ ! Vertical profile of buoyancy computed here (use of buoybase). use conema3_m, only: epmax - use cv3_param_m, only: dtovsh, minorig, nl, nlp, pbcrit, ptcrit, spfac + use cv30_param_m, only: dtovsh, minorig, nl, pbcrit, ptcrit, spfac use cvthermo, only: cl, clmcpv, cpd, cpv, eps, lv0, rrv ! inputs: @@ -137,7 +137,7 @@ ! tvp est calcule en une seule fois, et sans retirer ! l'eau condensee (~> reversible CAPE) do i = 1, ncum - tp(i, nlp) = tp(i, nl) + tp(i, nl + 1) = tp(i, nl) end do ! EFFECTIVE VERTICAL PROFILE OF BUOYANCY: @@ -177,7 +177,7 @@ ! CALCULATE LIQUID WATER STATIC ENERGY OF LIFTED PARCEL - do k = 1, nlp + do k = 1, nl + 1 do i = 1, ncum hp(i, k) = h(i, k) enddo @@ -190,6 +190,6 @@ end do end do - end SUBROUTINE cv3_undilute2 + end SUBROUTINE cv30_undilute2 -end module cv3_undilute2_m +end module cv30_undilute2_m