--- trunk/libf/dyn3d/dynredem1.f90	2009/12/14 15:25:16	23
+++ trunk/dyn3d/dynredem1.f	2014/09/04 10:05:52	104
@@ -1,71 +1,80 @@
-SUBROUTINE dynredem1(fichnom, vcov, ucov, teta, q, masse, ps)
+module dynredem1_m
 
-  ! From dyn3d/dynredem.F, v 1.2 2004/06/22 11:45:30
-  ! Ecriture du fichier de redémarrage au format NetCDF
+  IMPLICIT NONE
 
-  USE dimens_m, ONLY : iim, jjm, llm, nqmx
-  USE temps, ONLY : itaufin, itau_dyn
-  USE iniadvtrac_m, ONLY : tname
-  use netcdf, only: nf90_write
-  use netcdf95, only: nf95_close, nf95_gw_var, nf95_inq_varid, nf95_open, &
-       nf95_put_var
+contains
 
-  IMPLICIT NONE
+  SUBROUTINE dynredem1(fichnom, vcov, ucov, teta, q, masse, ps, itau)
+
+    ! From dyn3d/dynredem.F, version 1.2 2004/06/22 11:45:30
+    ! Ecriture du fichier de redémarrage au format NetCDF
+
+    USE dimens_m, ONLY: iim, jjm, llm, nqmx
+    USE iniadvtrac_m, ONLY: tname
+    use netcdf, only: nf90_write
+    use netcdf95, only: nf95_close, nf95_inq_varid, nf95_open, nf95_put_var
+    use nr_util, only: assert
+
+    CHARACTER(len=*), INTENT (IN):: fichnom
+    REAL, INTENT(IN):: vcov(:, :, :) ! (iim + 1, jjm, llm)
+    REAL, INTENT(IN):: ucov(:, :, :) ! (iim + 1, jjm + 1, llm)
+    REAL, INTENT(IN):: teta(:, :, :) ! (iim + 1, jjm + 1, llm)
+    REAL, INTENT(IN):: q(:, :, :, :) ! (iim + 1, jjm + 1, llm, nqmx)
+    REAL, INTENT(IN):: masse(:, :, :) ! (iim + 1, jjm + 1, llm)
+    REAL, INTENT(IN):: ps(:, :) ! (iim + 1, jjm + 1)
+    INTEGER, INTENT(IN):: itau
+
+    ! Variables local to the procedure:
+    INTEGER ncid, varid
+    INTEGER iq
 
-  CHARACTER(len=*), INTENT (IN) :: fichnom
-  REAL, INTENT (IN) :: vcov(iim + 1, jjm, llm), ucov(iim+1, jjm+1, llm)
-  REAL, INTENT (IN) :: teta(iim+1, jjm+1, llm)
-  REAL, INTENT (IN) :: q(iim+1, jjm+1, llm, nqmx)
-  REAL, INTENT (IN) :: ps(iim+1, jjm+1), masse(iim+1, jjm+1, llm)
+    !---------------------------------------------------------
 
-  ! Variables local to the procedure:
-  INTEGER nid, nvarid
-  INTEGER iq
-  REAL, pointer:: tab_cntrl(:) ! tableau des paramètres du run
-  INTEGER :: nb = 0
+    PRINT *, 'Call sequence information: dynredem1'
 
-  !---------------------------------------------------------
+    call assert((/size(vcov, 1), size(ucov, 1), size(teta, 1), size(q, 1), &
+         size(masse, 1), size(ps, 1)/) == iim + 1, "dynredem1 iim")
+    call assert((/size(vcov, 2) + 1, size(ucov, 2), size(teta, 2), size(q, 2), &
+         size(masse, 2), size(ps, 2)/) == jjm + 1, "dynredem1 jjm")
+    call assert((/size(vcov, 3), size(ucov, 3), size(teta, 3), size(q, 3), &
+         size(masse, 3)/) == llm, "dynredem1 llm")
+    call assert(size(q, 4) == nqmx, "dynredem1 nqmx")
 
-  PRINT *, 'Call sequence information: dynredem1'
+    call nf95_open(fichnom, nf90_write, ncid)
 
-  call nf95_open(fichnom, nf90_write, nid)
+    ! Écriture/extension de la coordonnée temps
+    call nf95_inq_varid(ncid, 'temps', varid)
+    call nf95_put_var(ncid, varid, values = 0.)
 
-  ! Écriture/extension de la coordonnée temps
-  nb = nb + 1
-  call nf95_inq_varid(nid, 'temps', nvarid)
-  call nf95_put_var(nid, nvarid, values=0., start=(/nb/))
-  PRINT *, "Enregistrement pour nb = ", nb
+    ! Récriture du tableau de contrôle, "itaufin" n'est pas défini quand
+    ! on passe dans "dynredem0"
+    call nf95_inq_varid(ncid, 'controle', varid)
+    call nf95_put_var(ncid, varid, real(itau), start=(/31/))
 
-  ! Récriture du tableau de contrôle, "itaufin" n'est plus défini quand
-  ! on passe dans "dynredem0"
-  call nf95_inq_varid(nid, 'controle', nvarid)
-  call nf95_gw_var(nid, nvarid, tab_cntrl)
-  tab_cntrl(31) = real(itau_dyn + itaufin)
-  call nf95_put_var(nid, nvarid, tab_cntrl)
-  deallocate(tab_cntrl) ! pointer
+    ! Écriture des champs
 
-  ! Écriture des champs
+    call nf95_inq_varid(ncid, 'ucov', varid)
+    call nf95_put_var(ncid, varid, ucov)
 
-  call nf95_inq_varid(nid, 'ucov', nvarid)
-  call nf95_put_var(nid, nvarid, ucov)
+    call nf95_inq_varid(ncid, 'vcov', varid)
+    call nf95_put_var(ncid, varid, vcov)
 
-  call nf95_inq_varid(nid, 'vcov', nvarid)
-  call nf95_put_var(nid, nvarid, vcov)
+    call nf95_inq_varid(ncid, 'teta', varid)
+    call nf95_put_var(ncid, varid, teta)
 
-  call nf95_inq_varid(nid, 'teta', nvarid)
-  call nf95_put_var(nid, nvarid, teta)
+    DO iq = 1, nqmx
+       call nf95_inq_varid(ncid, tname(iq), varid)
+       call nf95_put_var(ncid, varid, q(:, :, :, iq))
+    END DO
 
-  DO iq = 1, nqmx
-     call nf95_inq_varid(nid, tname(iq), nvarid)
-     call nf95_put_var(nid, nvarid, q(:, :, :, iq))
-  END DO
+    call nf95_inq_varid(ncid, 'masse', varid)
+    call nf95_put_var(ncid, varid, masse)
 
-  call nf95_inq_varid(nid, 'masse', nvarid)
-  call nf95_put_var(nid, nvarid, masse)
+    call nf95_inq_varid(ncid, 'ps', varid)
+    call nf95_put_var(ncid, varid, ps)
 
-  call nf95_inq_varid(nid, 'ps', nvarid)
-  call nf95_put_var(nid, nvarid, ps)
+    call nf95_close(ncid)
 
-  call nf95_close(nid)
+  END SUBROUTINE dynredem1
 
-END SUBROUTINE dynredem1
+end module dynredem1_m