--- trunk/Sources/dyn3d/calfis.f 2015/07/24 16:54:30 162 +++ trunk/dyn3d/calfis.f 2018/03/20 09:35:59 265 @@ -32,7 +32,7 @@ use comconst, only: kappa, cpp, g use comgeom, only: apoln, cu_2d, cv_2d, unsaire_2d, apols - use dimens_m, only: iim, jjm, llm, nqmx + use dimensions, only: iim, jjm, llm, nqmx use dimphy, only: klon use disvert_m, only: preff use dynetat0_m, only: rlonu, rlonv @@ -52,7 +52,7 @@ REAL, intent(in):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx) ! mass fractions of advected fields - REAL, intent(in):: p3d(:, :, :) ! (iim + 1, jjm + 1, llm+1) + REAL, intent(in):: p3d(:, :, :) ! (iim + 1, jjm + 1, llm + 1) ! pressure at layer interfaces, in Pa ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)", ! for interface "l") @@ -181,7 +181,6 @@ forall(l = 1: llm) v(:, l) = pack(zvfi(:, :, l), dyn_phy) - ! Appel de la physique : CALL physiq(lafin, dayvrai, time, paprs, play, pphi, pphis, u, v, t, qx, & omega, d_u, d_v, d_t, d_qx) @@ -219,7 +218,7 @@ DO j = 2, jjm ig0 = 1 + (j - 2) * iim DO i = 1, iim - 1 - dufi(i, j, l) = 0.5 * (d_u(ig0 + i, l) + d_u(ig0 + i+1, l)) & + dufi(i, j, l) = 0.5 * (d_u(ig0 + i, l) + d_u(ig0 + i + 1, l)) & * cu_2d(i, j) ENDDO dufi(iim, j, l) = 0.5 * (d_u(ig0 + 1, l) + d_u(ig0 + iim, l)) & @@ -234,7 +233,7 @@ DO j = 2, jjm - 1 ig0 = 1 + (j - 2) * iim DO i = 1, iim - dvfi(i, j, l) = 0.5 * (d_v(ig0 + i, l) + d_v(ig0 + i+iim, l)) & + dvfi(i, j, l) = 0.5 * (d_v(ig0 + i, l) + d_v(ig0 + i + iim, l)) & * cv_2d(i, j) ENDDO dvfi(iim + 1, j, l) = dvfi(1, j, l)