--- trunk/dyn3d/calfis.f 2014/04/02 12:59:54 95 +++ trunk/Sources/dyn3d/calfis.f 2015/07/07 17:49:23 154 @@ -4,8 +4,8 @@ contains - SUBROUTINE calfis(rdayvrai, time, ucov, vcov, teta, q, pk, phis, phi, w, & - dufi, dvfi, dtetafi, dqfi, lafin) + SUBROUTINE calfis(ucov, vcov, teta, q, pk, phis, phi, w, dufi, dvfi, & + dtetafi, dqfi, dayvrai, time, lafin) ! From dyn3d/calfis.F, version 1.3, 2005/05/25 13:10:09 ! Authors: P. Le Van, F. Hourdin @@ -13,7 +13,7 @@ ! 1. R\'earrangement des tableaux et transformation des variables ! dynamiques en variables physiques - ! 2. Calcul des termes physiques + ! 2. Calcul des tendances physiques ! 3. Retransformation des tendances physiques en tendances dynamiques ! Remarques: @@ -30,19 +30,17 @@ ! rayonnement) et l'aire de la maille (quand on veut int\'egrer une ! grandeur horizontalement). - use comconst, only: kappa, cpp, dtphys, g - use comgeom, only: apoln, cu_2d, cv_2d, unsaire_2d, apols, rlonu, rlonv + 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 dimphy, only: klon use disvert_m, only: preff + use dynetat0_m, only: rlonu, rlonv use grid_change, only: dyn_phy, gr_fi_dyn use nr_util, only: pi use physiq_m, only: physiq use pressure_var, only: p3d, pls - REAL, intent(in):: rdayvrai - REAL, intent(in):: time ! heure de la journ\'ee en fraction de jour - REAL, intent(in):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm) ! covariant zonal velocity @@ -72,6 +70,11 @@ ! tendency for the potential temperature REAL, intent(out):: dqfi(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx) + + integer, intent(in):: dayvrai + ! current day number, based at value 1 on January 1st of annee_ref + + REAL, intent(in):: time ! time of day, as a fraction of day length LOGICAL, intent(in):: lafin ! Local: @@ -176,8 +179,8 @@ forall(l = 1: llm) v(:, l) = pack(zvfi(:, :, l), dyn_phy) ! Appel de la physique : - CALL physiq(lafin, rdayvrai, time, dtphys, paprs, play, pphi, pphis, u, & - v, t, qx, omega, d_u, d_v, d_t, d_qx) + CALL physiq(lafin, dayvrai, time, paprs, play, pphi, pphis, u, v, t, qx, & + omega, d_u, d_v, d_t, d_qx) ! transformation des tendances physiques en tendances dynamiques: