--- trunk/libf/dyn3d/dynetat0.f90	2011/01/25 15:11:05	39
+++ trunk/libf/dyn3d/dynetat0.f90	2011/04/13 12:29:18	44
@@ -20,22 +20,23 @@
     use iniadvtrac_m, only: tname
     use logic, only: fxyhypb, ysinus
     use serre, only: clon, clat, grossismy, grossismx
-    use netcdf95, only: NF95_GET_VAR, nf95_open, nf95_inq_varid, NF95_CLOSE
+    use netcdf95, only: NF95_GET_VAR, nf95_open, nf95_inq_varid, NF95_CLOSE, &
+         NF95_Gw_VAR
     use netcdf, only: NF90_NOWRITE, NF90_NOERR
     use nr_util, only: assert
     use temps, only: day_ref, itau_dyn, annee_ref
 
-    ! Arguments:
-    REAL, intent(out):: vcov(: , :), ucov(:, :), teta(:, :)
-    REAL, intent(out):: q(:, :, :), masse(:, :)
+    REAL, intent(out):: vcov(: , :), ucov(:, :)
+    REAL, intent(out):: teta(:, :, :) ! (iim + 1, jjm + 1, llm)
+    REAL, intent(out):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
+    REAL, intent(out):: masse(:, :)
     REAL, intent(out):: ps(:, :) ! (iim + 1, jjm + 1) in Pa
     REAL, intent(out):: phis(:, :) ! (iim + 1, jjm + 1)
     REAL, intent(out):: time_0
 
-    ! Variables 
+    ! Local variables: 
     INTEGER iq
-    INTEGER, PARAMETER:: length = 100
-    REAL tab_cntrl(length) ! tableau des paramètres du run
+    REAL, pointer:: tab_cntrl(:) ! tableau des paramètres du run
     INTEGER ierr, ncid, varid
 
     !-----------------------------------------------------------------------
@@ -43,19 +44,21 @@
     print *, "Call sequence information: dynetat0"
 
     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)/) &
-         == (iim + 1) * (jjm + 1), "dynetat0 (iim + 1) * (jjm + 1)")
-    call assert((/size(ps, 1), size(phis, 1)/) == iim + 1, "dynetat0 iim")
-    call assert((/size(ps, 2), size(phis, 2)/) == jjm + 1, "dynetat0 jjm")
-    call assert((/size(vcov, 2), size(ucov, 2), size(teta, 2), size(q, 2), &
+    call assert((/size(ucov, 1), size(masse, 1)/) == (iim + 1) * (jjm + 1), &
+         "dynetat0 (iim + 1) * (jjm + 1)")
+    call assert((/size(ps, 1), size(phis, 1), size(q, 1), size(teta, 1)/) &
+         == iim + 1, "dynetat0 iim")
+    call assert((/size(ps, 2), size(phis, 2), size(q, 2), size(teta, 2)/) &
+         == jjm + 1, "dynetat0 jjm")
+    call assert((/size(vcov, 2), size(ucov, 2), size(teta, 3), size(q, 3), &
          size(masse, 2)/) == llm, "dynetat0 llm")
-    call assert(size(q, 3) == nqmx, "dynetat0 q 3")
+    call assert(size(q, 4) == nqmx, "dynetat0 q nqmx")
 
     ! Fichier état initial :
     call nf95_open("start.nc", NF90_NOWRITE, ncid)
 
     call nf95_inq_varid(ncid, "controle", varid)
-    call NF95_GET_VAR(ncid, varid, tab_cntrl)
+    call NF95_Gw_VAR(ncid, varid, tab_cntrl)
 
     im = int(tab_cntrl(1))
     jm = int(tab_cntrl(2))
@@ -112,29 +115,30 @@
     time_0 = time_0 - INT(time_0)
     ! {0 <= time0 < 1}
 
+    deallocate(tab_cntrl) ! pointer
+
     call NF95_INQ_VARID (ncid, "ucov", varid)
-    call NF95_GET_VAR(ncid, varid, ucov, count_nc=(/iim + 1, jjm + 1, llm/))
+    call NF95_GET_VAR(ncid, varid, ucov, count_nc=(/iim + 1, jjm + 1, llm, 1/))
 
     call NF95_INQ_VARID (ncid, "vcov", varid)
-    call NF95_GET_VAR(ncid, varid, vcov, count_nc=(/iim + 1, jjm, llm/))
+    call NF95_GET_VAR(ncid, varid, vcov, count_nc=(/iim + 1, jjm, llm, 1/))
 
     call NF95_INQ_VARID (ncid, "teta", varid)
-    call NF95_GET_VAR(ncid, varid, teta, count_nc=(/iim + 1, jjm + 1, llm/))
+    call NF95_GET_VAR(ncid, varid, teta)
 
     DO iq = 1, nqmx
        call NF95_INQ_VARID(ncid, tname(iq), varid, ierr)
        IF (ierr /= NF90_NOERR) THEN
           PRINT *, 'dynetat0: "' // tname(iq) // '" not found, ' // &
                "setting it to zero..."
-          q(:, :, iq) = 0.
+          q(:, :, :, iq) = 0.
        ELSE
-          call NF95_GET_VAR(ncid, varid, q(:, :, iq), &
-               count_nc=(/iim + 1, jjm + 1, llm/))
+          call NF95_GET_VAR(ncid, varid, q(:, :, :, iq))
        ENDIF
     ENDDO
 
     call NF95_INQ_VARID (ncid, "masse", varid)
-    call NF95_GET_VAR(ncid, varid, masse, count_nc=(/iim + 1, jjm + 1, llm/))
+    call NF95_GET_VAR(ncid, varid, masse, count_nc=(/iim + 1, jjm + 1, llm, 1/))
 
     call NF95_INQ_VARID (ncid, "ps", varid)
     call NF95_GET_VAR(ncid, varid, ps)