--- trunk/dyn3d/calfis.f	2014/03/26 17:18:58	91
+++ trunk/Sources/dyn3d/calfis.f	2015/05/26 17:46:03	139
@@ -4,8 +4,8 @@
 
 contains
 
-  SUBROUTINE calfis(rdayvrai, time, ucov, vcov, teta, q, ps, pk, phis, phi, &
-       w, dufi, dvfi, dtetafi, dqfi, lafin)
+  SUBROUTINE calfis(dayvrai, time, ucov, vcov, teta, q, pk, phis, phi, w, &
+       dufi, dvfi, dtetafi, dqfi, 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:
@@ -31,17 +31,20 @@
     ! grandeur horizontalement).
 
     use comconst, only: kappa, cpp, dtphys, g
-    use comgeom, only: apoln, cu_2d, cv_2d, unsaire_2d, apols, rlonu, rlonv
+    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
+    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
 
     REAL, intent(in):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm) 
     ! covariant zonal velocity
@@ -55,8 +58,6 @@
     REAL, intent(in):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
     ! mass fractions of advected fields
 
-    REAL, intent(in):: ps(:, :) ! (iim + 1, jjm + 1) surface pressure
-
     REAL, intent(in):: pk(:, :, :) ! (iim + 1, jjm + 1, llm)
     ! Exner = cp * (p / preff)**kappa 
 
@@ -77,8 +78,7 @@
     LOGICAL, intent(in):: lafin
 
     ! Local:
-    INTEGER i, j, l, ig0, iq, iiq
-    REAL zpsrf(klon)
+    INTEGER i, j, l, ig0, iq
     REAL paprs(klon, llm + 1) ! aux interfaces des couches 
     REAL play(klon, llm) ! aux milieux des couches 
     REAL pphi(klon, llm), pphis(klon)
@@ -179,7 +179,7 @@
     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, &
+    CALL physiq(lafin, dayvrai, time, dtphys, paprs, play, pphi, pphis, u, &
          v, t, qx, omega, d_u, d_v, d_t, d_qx)
 
     ! transformation des tendances physiques en tendances dynamiques: