--- trunk/Sources/dyn3d/dynredem0.f	2015/06/05 18:58:06	140
+++ trunk/dyn3d/dynredem0.f	2018/03/06 16:19:52	259
@@ -2,9 +2,11 @@
 
   IMPLICIT NONE
 
+  INTEGER ncid
+
 CONTAINS
 
-  SUBROUTINE dynredem0(fichnom, iday_end, phis)
+  SUBROUTINE dynredem0(iday_end, phis)
 
     ! From dyn3d/dynredem.F, version 1.2, 2004/06/22 11:45:30
     ! \'Ecriture du fichier de red\'emarrage au format NetCDF (initialisation)
@@ -14,19 +16,20 @@
     USE disvert_m, ONLY: ap, bp, pa, preff, presnivs
     use dynetat0_m, only: day_ref, annee_ref, clat, clon, dzoomx, dzoomy, &
          grossismx, grossismy, taux, tauy, rlatu, rlatv, rlonu, rlonv, rlatu1, &
-         rlatu2, yprimu1, yprimu2, xprimp025, xprimm025, xprimu, xprimv
-    USE ener, ONLY: ang0, etot0, ptot0, stot0, ztot0
+         rlatu2, yprimu1, yprimu2, xprimp025, xprimm025, xprimu, xprimv, ang0, &
+         etot0, ptot0, stot0, ztot0
     USE iniadvtrac_m, ONLY: tname, ttext
     USE ju2ymds_m, ONLY: ju2ymds
     USE netcdf, ONLY: nf90_clobber, nf90_float, nf90_global, nf90_unlimited
-    USE netcdf95, ONLY: nf95_close, nf95_create, nf95_def_dim, nf95_def_var, &
-         nf95_enddef, nf95_inq_varid, nf95_put_att, nf95_put_var
+    USE netcdf95, ONLY: nf95_create, nf95_def_dim, nf95_def_var, nf95_enddef, &
+         nf95_put_att, nf95_put_var
     USE paramet_m, ONLY: iip1, jjp1, llmp1
     use ymds2ju_m, only: ymds2ju
 
-    CHARACTER(len=*), INTENT(IN):: fichnom
     INTEGER, INTENT(IN):: iday_end
-    REAL, INTENT(IN):: phis(:, :)
+
+    REAL, INTENT(IN):: phis(:, :) ! (iim + 1, jjm + 1)
+    ! surface geopotential, in m2 s-2
 
     ! Local:
 
@@ -39,11 +42,11 @@
     INTEGER idim_rlonu, idim_rlonv, idim_rlatu, idim_rlatv
     INTEGER idim_s, idim_sig
     INTEGER dimid_temps
-    INTEGER ncid, varid
+    INTEGER varid
     integer varid_controle, varid_rlonu, varid_rlatu, varid_rlonv, varid_rlatv
     integer varid_xprimu, varid_xprimv, varid_xprimm025, varid_xprimp025
     integer varid_rlatu1, varid_rlatu2, varid_yprimu1, varid_yprimu2, varid_ap
-    integer varid_bp, varid_presnivs, varid_phisinit
+    integer varid_bp, varid_presnivs, varid_phis
 
     REAL zjulian, hours
     INTEGER yyears0, jjour0, mmois0
@@ -91,7 +94,7 @@
     tab_cntrl(30) = iday_end
     tab_cntrl(31:) = 0.
 
-    CALL nf95_create(fichnom, nf90_clobber, ncid)
+    CALL nf95_create("restart.nc", nf90_clobber, ncid)
     CALL nf95_put_att(ncid, nf90_global, 'title', &
          'start file for the dynamics code')
 
@@ -149,9 +152,10 @@
 
     ! Geopentiel au sol:
 
-    CALL nf95_def_var(ncid, 'phisinit', nf90_float, &
-         (/idim_rlonv, idim_rlatu/), varid_phisinit)
-    CALL nf95_put_att(ncid, varid_phisinit, 'title', 'Geopotentiel au sol')
+    CALL nf95_def_var(ncid, 'phis', nf90_float, (/idim_rlonv, idim_rlatu/), &
+         varid_phis)
+    CALL nf95_put_att(ncid, varid_phis, 'standard_name', 'surface_geopotential')
+    CALL nf95_put_att(ncid, varid_phis, 'units', 'm2 s-2')
 
     ! Definir les variables pour pouvoir les enregistrer plus tard:
 
@@ -205,9 +209,7 @@
     CALL nf95_put_var(ncid, varid_ap, ap)
     CALL nf95_put_var(ncid, varid_bp, bp)
     CALL nf95_put_var(ncid, varid_presnivs, presnivs)
-    CALL nf95_put_var(ncid, varid_phisinit, phis)
-
-    CALL nf95_close(ncid)
+    CALL nf95_put_var(ncid, varid_phis, phis)
 
     PRINT *, 'iim, jjm, llm, iday_end', iim, jjm, llm, iday_end
     PRINT *, 'rad, omeg, g, cpp, kappa', rad, omeg, g, cpp, kappa