--- trunk/Sources/dyn3d/leapfrog.f 2016/03/11 18:47:26 178 +++ trunk/Sources/dyn3d/leapfrog.f 2017/01/12 12:31:31 212 @@ -27,6 +27,7 @@ use dissip_m, only: dissip USE dynetat0_m, ONLY: day_ini use dynredem1_m, only: dynredem1 + use enercin_m, only: enercin USE exner_hyb_m, ONLY: exner_hyb use filtreg_scal_m, only: filtreg_scal use fluxstokenc_m, only: fluxstokenc @@ -97,7 +98,7 @@ logical leapf real dt ! time step, in s - REAL p3d(iim + 1, jjm + 1, llm+1) ! pressure at layer interfaces, in Pa + REAL 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") @@ -169,7 +170,7 @@ CALL filtreg_scal(pkf, direct = .true., intensive = .true.) end if - IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys /= 0) THEN + IF (MOD(itau + 1, iphysiq) == 0 .AND. iflag_phys) THEN CALL calfis(ucov, vcov, teta, q, p3d, pk, phis, phi, w, dufi, dvfi, & dtetafi, dqfi, dayvrai = itau / day_step + day_ini, & time = REAL(mod(itau, day_step)) / day_step, & @@ -201,7 +202,7 @@ forall (l = 1: llm) teta(:, 1, l) = SUM(aire_2d(:iim, 1) * teta(:iim, 1, l)) & / apoln - teta(:, jjm + 1, l) = SUM(aire_2d(:iim, jjm+1) & + teta(:, jjm + 1, l) = SUM(aire_2d(:iim, jjm + 1) & * teta(:iim, jjm + 1, l)) / apols END forall END IF