--- trunk/dyn3d/exner_hyb.f	2014/03/06 15:12:00	83
+++ trunk/dyn3d/exner_hyb.f	2014/03/26 17:18:58	91
@@ -6,7 +6,7 @@
 
   SUBROUTINE exner_hyb(ps, p, pks, pk, pkf)
 
-    ! From dyn3d/exner_hyb.F, version 1.1.1.1 2004/05/19 12:53:07
+    ! From dyn3d/exner_hyb.F, version 1.1.1.1, 2004/05/19 12:53:07
     ! Authors: P. Le Van, F. Hourdin
 
     ! Calcule la fonction d'Exner :
@@ -28,29 +28,26 @@
     ! haut des couches, "pk(:, :, l)" donné par la relation (2), pour
     ! l = 2 ŕ l = llm.
 
-    use dimens_m, only: iim, jjm, llm
+    use dimens_m, only: llm
     use comconst, only: kappa, cpp
     use disvert_m, only: preff
-    use comgeom, only: aire_2d, apoln, apols
     use filtreg_m, only: filtreg
 
-    REAL, intent(in):: ps(iim + 1, jjm + 1)
-    REAL, intent(in):: p(iim + 1, jjm + 1, llm + 1)
+    REAL, intent(in):: ps(:, :) ! (longitude, latitude)
+    REAL, intent(in):: p(:, :, :) ! (longitude, latitude, llm + 1)
 
-    real, intent(out):: pks(iim + 1, jjm + 1)
-    real, intent(out):: pk(iim + 1, jjm + 1, llm)
-    real, intent(out), optional:: pkf(iim + 1, jjm + 1, llm)
+    real, intent(out):: pks(:, :) ! (longitude, latitude)
+    real, intent(out):: pk(:, :, :) ! (longitude, latitude, llm)
+    real, intent(out), optional:: pkf(:, :, :) ! (longitude, latitude, llm)
 
     ! Variables locales :
-    real beta(iim + 1, jjm + 1, 2:llm)
+    real beta(size(ps, 1), size(ps, 2), 2:llm)
     INTEGER l
     REAL unpl2k
 
     !-------------------------------------
 
     pks = cpp * (ps / preff)**kappa
-    pks(:, 1) = SUM(aire_2d(:iim, 1) * pks(:iim, 1)) / apoln
-    pks(:, jjm + 1) = SUM(aire_2d(:iim, jjm + 1) * pks(:iim, jjm + 1)) / apols
     unpl2k = 1. + 2 * kappa
 
     beta(:, :, llm) = 1. / unpl2k
@@ -67,7 +64,7 @@
 
     if (present(pkf)) then
        pkf = pk
-       CALL filtreg(pkf, jjm + 1, llm, 2, 1, .TRUE.)
+       CALL filtreg(pkf, size(pkf, 2), llm, 2, 1, .TRUE.)
     end if
 
   END SUBROUTINE exner_hyb