--- trunk/libf/dyn3d/dynetat0.f90	2008/02/27 13:16:39	3
+++ trunk/libf/dyn3d/dynetat0.f90	2008/04/18 14:45:53	10
@@ -22,14 +22,15 @@
     use temps, only: day_ref, day_ini, itau_dyn, annee_ref
     use ener, only: etot0, ang0, ptot0, stot0, ztot0
     use advtrac_m, only: tname
-    use netcdf95, only: nf95_open, NF90_NOWRITE, nf95_inq_varid, &
-         NF90_GET_VAR, handle_err, NF90_NOERR, NF95_CLOSE
+    use netcdf95, only: nf95_open, nf95_inq_varid, handle_err, NF95_CLOSE
+    use netcdf, only: NF90_NOWRITE, NF90_GET_VAR, NF90_NOERR
     use nrutil, only: assert
 
     !   Arguments:
     REAL, intent(out):: vcov(: , :), ucov(:, :), teta(:, :)
     REAL, intent(out):: q(:, :, :), masse(:, :)
-    REAL, intent(out):: ps(:), phis(:)
+    REAL, intent(out):: ps(:) ! in Pa
+    REAL, intent(out):: phis(:, :)
     REAL, intent(out):: time
 
     !   Variables 
@@ -44,8 +45,8 @@
 
     call assert(size(vcov, 1) == (iim + 1) * jjm, "dynetat0 vcov 1")
     call assert((/size(ucov, 1), size(teta, 1), size(q, 1), size(masse, 1), &
-         size(ps), size(phis)/) == (iim + 1) * (jjm + 1), &
-         "dynetat0 (iim + 1) * (jjm + 1)")
+         size(ps)/) == (iim + 1) * (jjm + 1), "dynetat0 (iim + 1) * (jjm + 1)")
+    call assert(shape(phis) == (/iim + 1, jjm + 1/), "dynetat0 phis")
     call assert((/size(vcov, 2), size(ucov, 2), size(teta, 2), size(q, 2), &
          size(masse, 2)/) == llm, "dynetat0 llm")
     call assert(size(q, 3) == nqmx, "dynetat0 q 3")
@@ -132,7 +133,7 @@
     call handle_err("dynetat0, aire", ierr, nid)
 
     call NF95_INQ_VARID (nid, "phisinit", nvarid)
-    ierr = NF90_GET_VAR(nid, nvarid, phis, count=(/iim + 1, jjm + 1/))
+    ierr = NF90_GET_VAR(nid, nvarid, phis)
     call handle_err("dynetat0, phisinit", ierr, nid)
 
     call NF95_INQ_VARID (nid, "temps", nvarid)