Index: LMDZ6/trunk/libf/dyn3d/guide_mod.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d/guide_mod.F90	(revision 4252)
+++ LMDZ6/trunk/libf/dyn3d/guide_mod.F90	(revision 4253)
@@ -1710,5 +1710,5 @@
     USE comvert_mod, ONLY: presnivs
     use netcdf95, only: nf95_def_var, nf95_put_var
-    use netcdf, only: nf90_float
+    use netcdf, only: nf90_float, nf90_def_var
     
     IMPLICIT NONE
@@ -1752,13 +1752,13 @@
 
 ! Creation des variables dimensions
-        ierr=NF_DEF_VAR(nid,"LONU",NF_FLOAT,1,id_lonu,vid_lonu)
-        ierr=NF_DEF_VAR(nid,"LONV",NF_FLOAT,1,id_lonv,vid_lonv)
-        ierr=NF_DEF_VAR(nid,"LATU",NF_FLOAT,1,id_latu,vid_latu)
-        ierr=NF_DEF_VAR(nid,"LATV",NF_FLOAT,1,id_latv,vid_latv)
-        ierr=NF_DEF_VAR(nid,"LEVEL",NF_FLOAT,1,id_lev,vid_lev)
-        ierr=NF_DEF_VAR(nid,"cu",NF_FLOAT,2,(/id_lonu,id_latu/),vid_cu)
-        ierr=NF_DEF_VAR(nid,"cv",NF_FLOAT,2,(/id_lonv,id_latv/),vid_cv)
-        ierr=NF_DEF_VAR(nid,"au",NF_FLOAT,2,(/id_lonu,id_latu/),vid_au)
-        ierr=NF_DEF_VAR(nid,"av",NF_FLOAT,2,(/id_lonv,id_latv/),vid_av)
+        ierr=NF90_DEF_VAR(nid,"LONU",NF90_FLOAT,id_lonu,vid_lonu)
+        ierr=NF90_DEF_VAR(nid,"LONV",NF90_FLOAT,id_lonv,vid_lonv)
+        ierr=NF90_DEF_VAR(nid,"LATU",NF90_FLOAT,id_latu,vid_latu)
+        ierr=NF90_DEF_VAR(nid,"LATV",NF90_FLOAT,id_latv,vid_latv)
+        ierr=NF90_DEF_VAR(nid,"LEVEL",NF90_FLOAT,id_lev,vid_lev)
+        ierr=NF90_DEF_VAR(nid,"cu",NF90_FLOAT,(/id_lonu,id_latu/),vid_cu)
+        ierr=NF90_DEF_VAR(nid,"cv",NF90_FLOAT,(/id_lonv,id_latv/),vid_cv)
+        ierr=NF90_DEF_VAR(nid,"au",NF90_FLOAT,(/id_lonu,id_latu/),vid_au)
+        ierr=NF90_DEF_VAR(nid,"av",NF90_FLOAT,(/id_lonv,id_latv/),vid_av)
         call nf95_def_var(nid, "alpha_T", nf90_float, (/id_lonv, id_latu/), &
              varid_alpha_t)
@@ -1798,33 +1798,33 @@
 ! Pressure (GCM)
         dim4=(/id_lonv,id_latu,id_lev,id_tim/)
-        ierr = NF_DEF_VAR(nid,"SP",NF_FLOAT,4,dim4,varid)
+        ierr = NF90_DEF_VAR(nid,"SP",NF90_FLOAT,dim4,varid)
 ! Surface pressure (guidage)
         IF (guide_P) THEN
             dim3=(/id_lonv,id_latu,id_tim/)
-            ierr = NF_DEF_VAR(nid,"ps",NF_FLOAT,3,dim3,varid)
+            ierr = NF90_DEF_VAR(nid,"ps",NF90_FLOAT,dim3,varid)
         ENDIF
 ! Zonal wind
         IF (guide_u) THEN
             dim4=(/id_lonu,id_latu,id_lev,id_tim/)
-            ierr = NF_DEF_VAR(nid,"u",NF_FLOAT,4,dim4,varid)
-            ierr = NF_DEF_VAR(nid,"ua",NF_FLOAT,4,dim4,varid)
-            ierr = NF_DEF_VAR(nid,"ucov",NF_FLOAT,4,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"u",NF90_FLOAT,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"ua",NF90_FLOAT,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"ucov",NF90_FLOAT,dim4,varid)
         ENDIF
 ! Merid. wind
         IF (guide_v) THEN
             dim4=(/id_lonv,id_latv,id_lev,id_tim/)
-            ierr = NF_DEF_VAR(nid,"v",NF_FLOAT,4,dim4,varid)
-            ierr = NF_DEF_VAR(nid,"va",NF_FLOAT,4,dim4,varid)
-            ierr = NF_DEF_VAR(nid,"vcov",NF_FLOAT,4,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"v",NF90_FLOAT,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"va",NF90_FLOAT,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"vcov",NF90_FLOAT,dim4,varid)
         ENDIF
 ! Pot. Temperature
         IF (guide_T) THEN
             dim4=(/id_lonv,id_latu,id_lev,id_tim/)
-            ierr = NF_DEF_VAR(nid,"teta",NF_FLOAT,4,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"teta",NF90_FLOAT,dim4,varid)
         ENDIF
 ! Specific Humidity
         IF (guide_Q) THEN
             dim4=(/id_lonv,id_latu,id_lev,id_tim/)
-            ierr = NF_DEF_VAR(nid,"q",NF_FLOAT,4,dim4,varid)
+            ierr = NF90_DEF_VAR(nid,"q",NF90_FLOAT,dim4,varid)
         ENDIF
         
Index: LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90
===================================================================
--- LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 4252)
+++ LMDZ6/trunk/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90	(revision 4253)
@@ -11,4 +11,5 @@
   USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
   USE comvert_mod, ONLY: presnivs, preff, pa
+  use netcdf, only: nf90_def_var, nf90_int, nf90_float
   
   IMPLICIT NONE
@@ -91,5 +92,5 @@
 
   !   Longitudes en u
-  status=NF_DEF_VAR(ncid_out,'lonu',NF_FLOAT,1,out_lonudim, out_lonuid)
+  status=NF90_DEF_VAR(ncid_out,'lonu',NF90_FLOAT,out_lonudim, out_lonuid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_lonuid,'units', 12,'degrees_east')
@@ -97,5 +98,5 @@
 
   !   Longitudes en v
-  status=NF_DEF_VAR(ncid_out,'lonv',NF_FLOAT,1,out_lonvdim, out_lonvid)
+  status=NF90_DEF_VAR(ncid_out,'lonv',NF90_FLOAT,out_lonvdim, out_lonvid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_lonvid,'units', 12,'degrees_east')
@@ -103,5 +104,5 @@
 
   !   Latitude en u
-  status=NF_DEF_VAR(ncid_out,'latu',NF_FLOAT,1,out_latudim, out_latuid)
+  status=NF90_DEF_VAR(ncid_out,'latu',NF90_FLOAT,out_latudim, out_latuid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_latuid,'units', 13,'degrees_north')
@@ -109,5 +110,5 @@
 
   !  Latitude en v
-  status=NF_DEF_VAR(ncid_out,'latv',NF_FLOAT,1,out_latvdim, out_latvid)
+  status=NF90_DEF_VAR(ncid_out,'latv',NF90_FLOAT,out_latvdim, out_latvid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_latvid,'units', 13,'degrees_north')
@@ -117,5 +118,5 @@
   out_dim(1)=out_lonudim
   out_dim(2)=out_latudim
-  status=NF_DEF_VAR(ncid_out,'grille_u',NF_FLOAT,2,out_dim, out_varid)
+  status=NF90_DEF_VAR(ncid_out,'grille_u',NF90_FLOAT,out_dim, out_varid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_varid,'units', 6,'Kelvin')
@@ -125,5 +126,5 @@
   out_dim(1)=out_lonvdim
   out_dim(2)=out_latvdim
-  status=NF_DEF_VAR(ncid_out,'grille_v',NF_FLOAT,2,out_dim, out_varid)
+  status=NF90_DEF_VAR(ncid_out,'grille_v',NF90_FLOAT,out_dim, out_varid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_varid,'units', 6,'Kelvin')
@@ -133,5 +134,5 @@
   out_dim(1)=out_lonvdim
   out_dim(2)=out_latudim
-  status=NF_DEF_VAR(ncid_out,'grille_s',NF_FLOAT,2,out_dim, out_varid)
+  status=NF90_DEF_VAR(ncid_out,'grille_s',NF90_FLOAT,out_dim, out_varid)
   CALL handle_err(status)
   status=NF_PUT_ATT_TEXT(ncid_out,out_varid,'units', 6,'Kelvin')
@@ -201,5 +202,5 @@
   status=NF_DEF_DIM(ncid_out,'lev',llm,out_levdim)
   CALL handle_err(status)
-  status=NF_DEF_VAR(ncid_out,'presnivs',NF_FLOAT,1,out_levdim,&
+  status=NF90_DEF_VAR(ncid_out,'presnivs',NF90_FLOAT,out_levdim,&
                     presnivs_id)
   CALL handle_err(status)
@@ -209,9 +210,9 @@
   out_dim(2)=out_latudim
 
-  status = nf_def_var(ncid_out,'phis',NF_FLOAT,2,out_dim,phis_id)
-  CALL handle_err(status)
-  status = nf_def_var(ncid_out,'aire',NF_FLOAT,2,out_dim,area_id)
-  CALL handle_err(status)
-  status = nf_def_var(ncid_out,'mask',NF_INT  ,2,out_dim,mask_id)
+  status = nf90_def_var(ncid_out,'phis',NF90_FLOAT,out_dim,phis_id)
+  CALL handle_err(status)
+  status = nf90_def_var(ncid_out,'aire',NF90_FLOAT,out_dim,area_id)
+  CALL handle_err(status)
+  status = nf90_def_var(ncid_out,'mask',NF90_INT,out_dim,mask_id)
   CALL handle_err(status)
 
Index: LMDZ6/trunk/libf/phylmd/phyaqua_mod.F90
===================================================================
--- LMDZ6/trunk/libf/phylmd/phyaqua_mod.F90	(revision 4252)
+++ LMDZ6/trunk/libf/phylmd/phyaqua_mod.F90	(revision 4253)
@@ -573,4 +573,5 @@
     USE mod_phys_lmdz_transfert_para, ONLY: gather
     USE phys_cal_mod, ONLY: year_len
+    use netcdf, only: nf90_def_var, nf90_double, nf90_float
     IMPLICIT NONE
     include "netcdf.inc"
@@ -617,14 +618,14 @@
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'TEMPS', nf_double, 1, ntim, id_tim)
-#else
-      ierr = nf_def_var(nid, 'TEMPS', nf_float, 1, ntim, id_tim)
+      ierr = nf90_def_var(nid, 'TEMPS', nf90_double, [ntim], id_tim)
+#else
+      ierr = nf90_def_var(nid, 'TEMPS', nf90_float, [ntim], id_tim)
 #endif
       ierr = nf_put_att_text(nid, id_tim, 'title', 17, 'Jour dans l annee')
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'NAT', nf_double, 2, dims, id_nat)
-#else
-      ierr = nf_def_var(nid, 'NAT', nf_float, 2, dims, id_nat)
+      ierr = nf90_def_var(nid, 'NAT', nf90_double, dims, id_nat)
+#else
+      ierr = nf90_def_var(nid, 'NAT', nf90_float, dims, id_nat)
 #endif
       ierr = nf_put_att_text(nid, id_nat, 'title', 23, &
@@ -632,7 +633,7 @@
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'SST', nf_double, 2, dims, id_sst)
-#else
-      ierr = nf_def_var(nid, 'SST', nf_float, 2, dims, id_sst)
+      ierr = nf90_def_var(nid, 'SST', nf90_double, dims, id_sst)
+#else
+      ierr = nf90_def_var(nid, 'SST', nf90_float, dims, id_sst)
 #endif
       ierr = nf_put_att_text(nid, id_sst, 'title', 35, &
@@ -640,7 +641,7 @@
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'BILS', nf_double, 2, dims, id_bils)
-#else
-      ierr = nf_def_var(nid, 'BILS', nf_float, 2, dims, id_bils)
+      ierr = nf90_def_var(nid, 'BILS', nf90_double, dims, id_bils)
+#else
+      ierr = nf90_def_var(nid, 'BILS', nf90_float, dims, id_bils)
 #endif
       ierr = nf_put_att_text(nid, id_bils, 'title', 32, &
@@ -648,39 +649,39 @@
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'ALB', nf_double, 2, dims, id_alb)
-#else
-      ierr = nf_def_var(nid, 'ALB', nf_float, 2, dims, id_alb)
+      ierr = nf90_def_var(nid, 'ALB', nf90_double, dims, id_alb)
+#else
+      ierr = nf90_def_var(nid, 'ALB', nf90_float, dims, id_alb)
 #endif
       ierr = nf_put_att_text(nid, id_alb, 'title', 19, 'Albedo a la surface')
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'RUG', nf_double, 2, dims, id_rug)
-#else
-      ierr = nf_def_var(nid, 'RUG', nf_float, 2, dims, id_rug)
+      ierr = nf90_def_var(nid, 'RUG', nf90_double, dims, id_rug)
+#else
+      ierr = nf90_def_var(nid, 'RUG', nf90_float, dims, id_rug)
 #endif
       ierr = nf_put_att_text(nid, id_rug, 'title', 8, 'Rugosite')
 
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'FTER', nf_double, 2, dims, id_fter)
-#else
-      ierr = nf_def_var(nid, 'FTER', nf_float, 2, dims, id_fter)
+      ierr = nf90_def_var(nid, 'FTER', nf90_double, dims, id_fter)
+#else
+      ierr = nf90_def_var(nid, 'FTER', nf90_float, dims, id_fter)
 #endif
       ierr = nf_put_att_text(nid, id_fter, 'title',10,'Frac. Land')
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'FOCE', nf_double, 2, dims, id_foce)
-#else
-      ierr = nf_def_var(nid, 'FOCE', nf_float, 2, dims, id_foce)
+      ierr = nf90_def_var(nid, 'FOCE', nf90_double, dims, id_foce)
+#else
+      ierr = nf90_def_var(nid, 'FOCE', nf90_float, dims, id_foce)
 #endif
       ierr = nf_put_att_text(nid, id_foce, 'title',11,'Frac. Ocean')
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'FSIC', nf_double, 2, dims, id_fsic)
-#else
-      ierr = nf_def_var(nid, 'FSIC', nf_float, 2, dims, id_fsic)
+      ierr = nf90_def_var(nid, 'FSIC', nf90_double, dims, id_fsic)
+#else
+      ierr = nf90_def_var(nid, 'FSIC', nf90_float, dims, id_fsic)
 #endif
       ierr = nf_put_att_text(nid, id_fsic, 'title',13,'Frac. Sea Ice')
 #ifdef NC_DOUBLE
-      ierr = nf_def_var(nid, 'FLIC', nf_double, 2, dims, id_flic)
-#else
-      ierr = nf_def_var(nid, 'FLIC', nf_float, 2, dims, id_flic)
+      ierr = nf90_def_var(nid, 'FLIC', nf90_double, dims, id_flic)
+#else
+      ierr = nf90_def_var(nid, 'FLIC', nf90_float, dims, id_flic)
 #endif
       ierr = nf_put_att_text(nid, id_flic, 'title',14,'Frac. Land Ice')