--- trunk/libf/dyn3d/dynetat0.f90	2011/04/08 12:43:31	43
+++ trunk/dyn3d/dynetat0.f90	2014/02/28 17:52:47	79
@@ -12,65 +12,68 @@
     ! Authors: P. Le Van, L. Fairhead
     ! This procedure reads the initial state of the atmosphere.
 
-    use comconst, only: im, dtvr, jm, lllm
-    use comvert, only: pa
+    use comconst, only: dtvr
     use comgeom, only: rlonu, rlatu, rlonv, rlatv, cu_2d, cv_2d, aire_2d
+    use conf_gcm_m, only: fxyhypb, ysinus
     use dimens_m, only: iim, jjm, llm, nqmx
+    use disvert_m, only: pa
     use ener, only: etot0, ang0, ptot0, stot0, ztot0
     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 netcdf, only: NF90_NOWRITE, NF90_NOERR
+    use netcdf95, only: NF95_GET_VAR, nf95_open, nf95_inq_varid, NF95_CLOSE, &
+         NF95_Gw_VAR
     use nr_util, only: assert
+    use serre, only: clon, clat, grossismy, grossismx
     use temps, only: day_ref, itau_dyn, annee_ref
 
-    ! Arguments:
-    REAL, intent(out):: vcov(: , :), ucov(:, :)
+    REAL, intent(out):: vcov(: , :, :) ! (iim + 1, jjm, llm)
+    REAL, intent(out):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm)
     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):: masse(:, :, :) ! (iim + 1, jjm + 1, llm)
     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
 
     !-----------------------------------------------------------------------
 
     print *, "Call sequence information: dynetat0"
 
-    call assert(size(vcov, 1) == (iim + 1) * jjm, "dynetat0 vcov 1")
-    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(ucov, 1), size(vcov, 1), size(masse, 1), size(ps, 1), &
+         size(phis, 1), size(q, 1), size(teta, 1)/) == iim + 1, "dynetat0 iim")
+    call assert((/size(ucov, 2), size(vcov, 2) + 1, size(masse, 2), &
+         size(ps, 2), size(phis, 2), size(q, 2), size(teta, 2)/) == jjm + 1, &
+         "dynetat0 jjm")
+    call assert((/size(vcov, 3), size(ucov, 3), size(teta, 3), size(q, 3), &
+         size(masse, 3)/) == llm, "dynetat0 llm")
     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))
-    lllm = int(tab_cntrl(3))
-    call assert(im == iim, "dynetat0 im iim") 
-    call assert(jm == jjm, "dynetat0 jm jjm") 
-    call assert(lllm == llm, "dynetat0 lllm llm") 
+    call assert(int(tab_cntrl(1)) == iim, "dynetat0 tab_cntrl iim") 
+    call assert(int(tab_cntrl(2)) == jjm, "dynetat0 tab_cntrl jjm") 
+    call assert(int(tab_cntrl(3)) == llm, "dynetat0 tab_cntrl llm") 
 
     day_ref = int(tab_cntrl(4))
     annee_ref = int(tab_cntrl(5))
-    dtvr = tab_cntrl(12)
+
+    IF (dtvr /= tab_cntrl(12)) THEN
+       print *, 'Warning: the time steps from day_step and "start.nc" ' // &
+          'are different.'
+       print *, 'dtvr from day_step: ', dtvr
+       print *, 'dtvr from "start.nc": ', tab_cntrl(12)
+       print *, 'Using the value from day_step.'
+    ENDIF
+
     etot0 = tab_cntrl(13)
     ptot0 = tab_cntrl(14)
     ztot0 = tab_cntrl(15)
@@ -116,11 +119,13 @@
     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, 1/))
+    call NF95_GET_VAR(ncid, varid, ucov)
 
     call NF95_INQ_VARID (ncid, "vcov", varid)
-    call NF95_GET_VAR(ncid, varid, vcov, count_nc=(/iim + 1, jjm, llm, 1/))
+    call NF95_GET_VAR(ncid, varid, vcov)
 
     call NF95_INQ_VARID (ncid, "teta", varid)
     call NF95_GET_VAR(ncid, varid, teta)
@@ -137,7 +142,7 @@
     ENDDO
 
     call NF95_INQ_VARID (ncid, "masse", varid)
-    call NF95_GET_VAR(ncid, varid, masse, count_nc=(/iim + 1, jjm + 1, llm, 1/))
+    call NF95_GET_VAR(ncid, varid, masse)
 
     call NF95_INQ_VARID (ncid, "ps", varid)
     call NF95_GET_VAR(ncid, varid, ps)