Changeset 5088

Timestamp:

Jul 20, 2024, 4:30:31 PM (3 months ago)

Author:

abarral

Message:

Remove all managed netcdf77 usage (excluding external: rrtm, ecrad)
Remove call to netcdf.inc
Replace USE lmdz_netcdf by USE netcdf
Replace lmdz_netcdf.F90 by lmdz_netcdf_format.F90

Location:

LMDZ6/branches/Amaury_dev

Files:

• libf/dyn3d/dynetat0.F90 (modified) (1 diff)
• libf/dyn3d/dynredem.F90 (modified) (2 diffs)
• libf/dyn3d/dynredem_mod.F90 (modified) (2 diffs)
• libf/dyn3d/guide_mod.F90 (modified) (17 diffs)
• libf/dyn3d/iniacademic.F90 (modified) (1 diff)
• libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 (modified) (9 diffs)
• libf/dyn3dmem/dynetat0_loc.F90 (modified) (1 diff)
• libf/dyn3dmem/dynredem_loc.F90 (modified) (2 diffs)
• libf/dyn3dmem/dynredem_mod.F90 (modified) (2 diffs)
• libf/dyn3dmem/guide_loc_mod.F90 (modified) (35 diffs)
• libf/dyn3dmem/iniacademic_loc.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phylmd/ce0l.F90 (modified) (2 diffs)
• libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (modified) (4 diffs)
• libf/misc/lmdz_netcdf_format.F90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/lmdz_netcdf.F90) (1 diff)
• libf/misc/write_field.F90 (modified) (3 diffs)
• libf/misc/wxios.F90 (modified) (1 diff)
• libf/phylmd/Dust/condsurfc.F (modified) (9 diffs)
• libf/phylmd/Dust/condsurfc_new.F (modified) (14 diffs)
• libf/phylmd/Dust/condsurfs.F (modified) (17 diffs)
• libf/phylmd/Dust/condsurfs_new.F (modified) (18 diffs)
• libf/phylmd/Dust/phys_output_write_spl_mod.F90 (modified) (1 diff)
• libf/phylmd/Dust/phytracr_spl_mod.F90 (modified) (4 diffs)
• libf/phylmd/Dust/read_dust.F (modified) (1 diff)
• libf/phylmd/Dust/read_surface.F90 (modified) (3 diffs)
• libf/phylmd/Dust/read_vent.F (modified) (1 diff)
• libf/phylmd/StratAer/interp_sulf_input.F90 (modified) (1 diff)
• libf/phylmd/StratAer/stratH2O_methox.F90 (modified) (1 diff)
• libf/phylmd/condsurf.F90 (modified) (4 diffs)
• libf/phylmd/create_etat0_unstruct_mod.F90 (modified) (1 diff)
• libf/phylmd/dyn1d/1DUTILS.h (modified) (3 diffs)
• libf/phylmd/dyn1d/mod_1D_amma_read.F90 (modified) (14 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read.F90 (modified) (41 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read2.F90 (modified) (19 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read_std.F90 (modified) (10 diffs)
• libf/phylmd/dyn1d/old_1DUTILS_read_interp.h (modified) (61 diffs)
• libf/phylmd/grid_noro_m.F90 (modified) (2 diffs)
• libf/phylmd/ice_sursat_mod.F90 (modified) (3 diffs)
• libf/phylmd/interfoce_lim.F90 (modified) (9 diffs)
• libf/phylmd/iostart.F90 (modified) (12 diffs)
• libf/phylmd/iotd_ecrit.F90 (modified) (5 diffs)
• libf/phylmd/iotd_fin.F90 (modified) (2 diffs)
• libf/phylmd/iotd_ini.F90 (modified) (2 diffs)
• libf/phylmd/limit_read_mod.F90 (modified) (3 diffs)
• libf/phylmd/limit_slab.F90 (modified) (1 diff)
• libf/phylmd/mo_simple_plumes.F90 (modified) (1 diff)
• libf/phylmd/moy_undefSTD.F90 (modified) (1 diff)
• libf/phylmd/open_climoz_m.F90 (modified) (1 diff)
• libf/phylmd/pbl_surface_mod.F90 (modified) (1 diff)
• libf/phylmd/phyaqua_mod.F90 (modified) (13 diffs)
• libf/phylmd/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmd/phys_output_write_mod.F90 (modified) (1 diff)
• libf/phylmd/phys_state_var_mod.F90 (modified) (1 diff)
• libf/phylmd/physiq_mod.F90 (modified) (1 diff)
• libf/phylmd/plevel.F90 (modified) (1 diff)
• libf/phylmd/press_coefoz_m.F90 (modified) (1 diff)
• libf/phylmd/read_map2D.F90 (modified) (1 diff)
• libf/phylmd/read_pstoke.F90 (modified) (2 diffs)
• libf/phylmd/read_pstoke0.F90 (modified) (2 diffs)
• libf/phylmd/readaerosol_mod.F90 (modified) (4 diffs)
• libf/phylmd/readaerosolstrato.F90 (modified) (1 diff)
• libf/phylmd/readaerosolstrato_m.F90 (modified) (2 diffs)
• libf/phylmd/readchlorophyll.F90 (modified) (1 diff)
• libf/phylmd/regr_horiz_time_climoz_m.F90 (modified) (2 diffs)
• libf/phylmd/regr_lat_time_coefoz_m.F90 (modified) (3 diffs)
• libf/phylmd/regr_pr_comb_coefoz_m.F90 (modified) (1 diff)
• libf/phylmd/regr_pr_o3_m.F90 (modified) (1 diff)
• libf/phylmd/regr_pr_time_av_m.F90 (modified) (1 diff)
• libf/phylmd/tracco2i_mod.F90 (modified) (1 diff)
• libf/phylmd/undefSTD.F90 (modified) (1 diff)
• libf/phylmdiso/limit_read_mod.F90 (modified) (3 diffs)
• libf/phylmdiso/phyaqua_mod.F90 (modified) (13 diffs)
• libf/phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (1 diff)
• libf/phylmdiso/reevap.F90 (modified) (6 diffs)
• tools/make_sso/make_sso_SpherePack.f90 (modified) (1 diff)
• tools/netcdf95/Attributes/nf95_copy_att.f90 (modified) (1 diff)
• tools/netcdf95/Attributes/nf95_get_att.f90 (modified) (1 diff)
• tools/netcdf95/Attributes/nf95_get_missing.F90 (modified) (6 diffs)
• tools/netcdf95/Attributes/nf95_inquire_attribute.f90 (modified) (1 diff)
• tools/netcdf95/Attributes/nf95_put_att.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_close.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_create.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_create_single.f90 (modified) (2 diffs)
• tools/netcdf95/Datasets/nf95_enddef.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_find_coord.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_inquire.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_open.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_redef.f90 (modified) (1 diff)
• tools/netcdf95/Datasets/nf95_sync.f90 (modified) (1 diff)
• tools/netcdf95/Groups/nf95_inq_file_ncid.f90 (modified) (1 diff)
• tools/netcdf95/Groups/nf95_inq_grp_parent.f90 (modified) (1 diff)
• tools/netcdf95/Groups/nf95_inq_grps.f90 (modified) (1 diff)
• tools/netcdf95/Variables/check_start_count.f90 (modified) (1 diff)
• tools/netcdf95/Variables/nf95_def_var.f90 (modified) (1 diff)
• tools/netcdf95/Variables/nf95_get_var.f90 (modified) (1 diff)
• tools/netcdf95/Variables/nf95_inq_varid.f90 (modified) (1 diff)
• tools/netcdf95/Variables/nf95_inquire_variable.f90 (modified) (1 diff)
• tools/netcdf95/Variables/nf95_put_var.f90 (modified) (1 diff)
• tools/netcdf95/nf95_abort.f90 (modified) (1 diff)
• tools/netcdf95/nf95_def_dim.f90 (modified) (1 diff)
• tools/netcdf95/nf95_inq_dimid.f90 (modified) (1 diff)
• tools/netcdf95/nf95_inquire_dimension.f90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/dyn3d/dynetat0.F90

@@ -8 +8 @@
   USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str
-  USE lmdz_netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
+  USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
                          NF90_CLOSE, NF90_GET_VAR, NF90_NoErr
   USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey

LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem.F90

@@ -9 +9 @@
   USE strings_mod, ONLY: maxlen
   USE infotrac, ONLY: nqtot, tracers
-  USE lmdz_netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
+  USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER,   &
                     NF90_64BIT_OFFSET
@@ -169 +169 @@
   USE infotrac, ONLY: nqtot, tracers, type_trac
   USE control_mod
-  USE lmdz_netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
+  USE netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
                       NF90_CLOSE, NF90_WRITE,   NF90_PUT_VAR, NF90_NoErr
   USE dynredem_mod, ONLY: dynredem_write_u, dynredem_write_v, dynredem_read_u, &

LMDZ6/branches/Amaury_dev/libf/dyn3d/dynredem_mod.F90

@@ -1 +1 @@
 MODULE dynredem_mod
 
-  USE lmdz_netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_redef,nf90_put_var,nf90_enddef,nf90_put_att,&
-          nf90_inq_varid,nf90_get_var,nf90_format,nf90_def_var
+  USE netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_redef,nf90_put_var,nf90_enddef,nf90_put_att,&
+          nf90_inq_varid,nf90_get_var,nf90_def_var
+  USE lmdz_netcdf_format, ONLY: nf90_format
   IMPLICIT NONE; PRIVATE
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err
@@ -95 +96 @@
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: units
 !===============================================================================
-  CALL err(NF90_DEF_VAR(ncid,var,NF90_FORMAT,did,nvarid),"inq",var)
+  CALL err(NF90_DEF_VAR(ncid,var,nf90_format,did,nvarid),"inq",var)
   IF(title/="")      CALL err(NF90_PUT_ATT(ncid,nvarid,"title",title),var)
   IF(PRESENT(units)) CALL err(NF90_PUT_ATT(ncid,nvarid,"units",units),var)

LMDZ6/branches/Amaury_dev/libf/dyn3d/guide_mod.F90

@@ -11 +11 @@
   USE getparam, ONLY: ini_getparam, fin_getparam, getpar
   USE Write_Field
-  USE lmdz_netcdf, ONLY: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
+  USE netcdf, ONLY: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
           nf90_inq_dimid, nf90_inquire_dimension, nf90_float, nf90_def_var, &
-          nf_create, nf_def_dim, nf_open, nf_unlimited, nf_write, nf_enddef, nf_redef, &
-          nf_close, nf_inq_varid, nf90_get_var, nf90_noerr, nf_clobber, &
-          nf_64bit_offset, nf_inq_dimid, nf_inq_dimlen, nf90_put_var
+          nf90_create, nf90_def_dim, nf90_open, nf90_unlimited, nf90_write, nf90_enddef, nf90_redef, &
+          nf90_close, nf90_inq_varid, nf90_get_var, nf90_noerr, nf90_clobber, &
+          nf90_64bit_offset, nf90_inq_dimid, nf90_inquire_dimension, nf90_put_var
   USE pres2lev_mod, ONLY: pres2lev
 
@@ -72 +72 @@
   SUBROUTINE guide_init
 
-    use lmdz_netcdf, only: nf90_noerr
+    use netcdf, only: nf90_noerr
     USE control_mod, ONLY: day_step
     USE serre_mod, ONLY: grossismx
@@ -226 +226 @@
 
     endif 
-    error=NF_INQ_DIMID(ncidpl,'LEVEL',rid)
-    IF (error/=NF90_NOERR) error=NF_INQ_DIMID(ncidpl,'PRESSURE',rid)
+    error=nf90_inq_dimid(ncidpl,'LEVEL',rid)
+    IF (error/=NF90_NOERR) error=nf90_inq_dimid(ncidpl,'PRESSURE',rid)
     IF (error/=NF90_NOERR) THEN
         CALL abort_gcm(modname,'Nudging: error reading pressure levels',1)
     ENDIF
-    error=NF_INQ_DIMLEN(ncidpl,rid,nlevnc)
+    error=nf90_inquire_dimension(ncidpl,rid,len=nlevnc)
     write(*,*)trim(modname)//' : number of vertical levels nlevnc', nlevnc 
     rcod = nf90_close(ncidpl)
@@ -1168 +1168 @@
              if (ncidpl==-99) ncidpl=ncidu
 
-             status=NF90_INQ_DIMID(ncidu, "LONU", dimid)
+             status=nf90_inq_dimid(ncidu, "LONU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidu,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1175 +1175 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidu, "LATU", dimid)
+             status=nf90_inq_dimid(ncidu, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidu,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1199 +1199 @@
              if (ncidpl==-99) ncidpl=ncidv
              
-             status=NF90_INQ_DIMID(ncidv, "LONV", dimid)
+             status=nf90_inq_dimid(ncidv, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidv,dimid,namedim,lendim)
              
@@ -1208 +1208 @@
 
 
-             status=NF90_INQ_DIMID(ncidv, "LATV", dimid)
+             status=nf90_inq_dimid(ncidv, "LATV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidv,dimid,namedim,lendim)
              IF (lendim /= jjm) THEN
@@ -1232 +1232 @@
              if (ncidpl==-99) ncidpl=ncidt
 
-             status=NF90_INQ_DIMID(ncidt, "LONV", dimid)
+             status=nf90_inq_dimid(ncidt, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidt,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1239 +1239 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidt, "LATU", dimid)
+             status=nf90_inq_dimid(ncidt, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidt,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1263 +1263 @@
              if (ncidpl==-99) ncidpl=ncidQ
 
-             status=NF90_INQ_DIMID(ncidQ, "LONV", dimid)
+             status=nf90_inq_dimid(ncidQ, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidQ,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1270 +1270 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidQ, "LATU", dimid)
+             status=nf90_inq_dimid(ncidQ, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidQ,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1680 +1680 @@
 ! ----------------------------------------------
 ! Ouverture du fichier
-        ierr=NF_CREATE("guide_ins.nc",IOR(NF_CLOBBER,NF_64BIT_OFFSET),nid)
+        ierr=nf90_create("guide_ins.nc",IOR(nf90_clobber,nf90_64bit_offset),nid)
 ! Definition des dimensions
-        ierr=NF_DEF_DIM(nid,"LONU",iip1,id_lonu) 
-        ierr=NF_DEF_DIM(nid,"LONV",iip1,id_lonv) 
-        ierr=NF_DEF_DIM(nid,"LATU",jjp1,id_latu) 
-        ierr=NF_DEF_DIM(nid,"LATV",jjm,id_latv) 
-        ierr=NF_DEF_DIM(nid,"LEVEL",llm,id_lev)
-        ierr=NF_DEF_DIM(nid,"TIME",NF_UNLIMITED,id_tim)
+        ierr=nf90_def_dim(nid,"LONU",iip1,id_lonu)
+        ierr=nf90_def_dim(nid,"LONV",iip1,id_lonv)
+        ierr=nf90_def_dim(nid,"LATU",jjp1,id_latu)
+        ierr=nf90_def_dim(nid,"LATV",jjm,id_latv)
+        ierr=nf90_def_dim(nid,"LEVEL",llm,id_lev)
+        ierr=nf90_def_dim(nid,"TIME",nf90_unlimited,id_tim)
 
 ! Creation des variables dimensions
@@ -1704 +1704 @@
              varid_alpha_q)
         
-        ierr=NF_ENDDEF(nid)
+        ierr=nf90_enddef(nid)
 
 ! Enregistrement des variables dimensions
@@ -1721 +1721 @@
 ! Cr�ation des variables sauvegard�es
 ! --------------------------------------------------------------------
-        ierr = NF_REDEF(nid)
+        ierr = nf90_redef(nid)
 ! Pressure (GCM)
         dim4=(/id_lonv,id_latu,id_lev,id_tim/)
@@ -1755 +1755 @@
         ENDIF
         
-        ierr = NF_ENDDEF(nid)
-        ierr = NF_CLOSE(nid)
+        ierr = nf90_enddef(nid)
+        ierr = nf90_close(nid)
     ENDIF ! timestep=0
 
@@ -1762 +1762 @@
 ! Enregistrement du champ
 ! --------------------------------------------------------------------
-    ierr=NF_OPEN("guide_ins.nc",NF_WRITE,nid)
+    ierr=nf90_open("guide_ins.nc",nf90_write,nid)
 
     IF (varname=="SP") timestep=timestep+1
 
-    ierr = NF_INQ_VARID(nid,varname,varid)
+    ierr = nf90_inq_varid(nid,varname,varid)
     SELECT CASE (varname)
     CASE ("SP","ps")
@@ -1790 +1790 @@
 
     ierr = nf90_put_var(nid,varid,field2,start,count)
-    ierr = NF_CLOSE(nid)
+    ierr = nf90_close(nid)
 
   END SUBROUTINE guide_out

LMDZ6/branches/Amaury_dev/libf/dyn3d/iniacademic.F90

@@ -22 +22 @@
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
   USE readTracFiles_mod, ONLY: addPhase
-  use lmdz_netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE,NF90_GET_VAR
+  use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE,NF90_GET_VAR
 
   !   Author:    Frederic Hourdin      original: 15/01/93

LMDZ6/branches/Amaury_dev/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90

@@ -14 +14 @@
   USE comconst_mod, ONLY: cpp, kappa, g, omeg, daysec, rad, pi
   USE comvert_mod, ONLY: presnivs, preff, pa
-  USE lmdz_netcdf, ONLY: nf90_def_var, nf90_int, nf90_float, nf90_put_var, nf_enddef, &
-      nf_put_att_text,nf_def_dim,nf_64bit_offset,nf_clobber,nf_create
+  USE netcdf, ONLY: nf90_def_var, nf90_int, nf90_float, nf90_put_var, nf90_enddef, &
+      nf90_put_att,nf90_def_dim,nf90_64bit_offset,nf90_clobber,nf90_create
   
   IMPLICIT NONE
@@ -102 +102 @@
   ! OPEN output netcdf file
   !-------------------------
-  status=NF_CREATE('grilles_gcm.nc',IOR(NF_CLOBBER,NF_64BIT_OFFSET),ncid_out)
+  status=nf90_create('grilles_gcm.nc',IOR(nf90_clobber,nf90_64bit_offset),ncid_out)
   CALL handle_err(status)
   
   ! DEFINE output dimensions
   !-------------------------
-  status=NF_DEF_DIM(ncid_out,'lonu',iim+1,out_lonudim)
-  CALL handle_err(status)
-  status=NF_DEF_DIM(ncid_out,'lonv',iim+1,out_lonvdim)
-  CALL handle_err(status)
-  status=NF_DEF_DIM(ncid_out,'latu',jjm+1,out_latudim)
-  CALL handle_err(status)
-  status=NF_DEF_DIM(ncid_out,'latv',jjm,out_latvdim)
-  CALL handle_err(status)
-  !
-  status=NF_DEF_DIM(ncid_out,'lev',llm,out_levdim)
+  status=nf90_def_dim(ncid_out,'lonu',iim+1,out_lonudim)
+  CALL handle_err(status)
+  status=nf90_def_dim(ncid_out,'lonv',iim+1,out_lonvdim)
+  CALL handle_err(status)
+  status=nf90_def_dim(ncid_out,'latu',jjm+1,out_latudim)
+  CALL handle_err(status)
+  status=nf90_def_dim(ncid_out,'latv',jjm,out_latvdim)
+  CALL handle_err(status)
+  !
+  status=nf90_def_dim(ncid_out,'lev',llm,out_levdim)
   CALL handle_err(status)
   
@@ -124 +124 @@
   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')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_lonuid,'long_name',19,'Longitude on u grid')
+  status=nf90_put_att(ncid_out,out_lonuid,'units','degrees_east')
+  status=nf90_put_att(ncid_out,out_lonuid,'long_name','Longitude on u grid')
   !   Longitudes on "v" dynamical grid
   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')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_lonvid,'long_name', 19,'Longitude on v grid')
+  status=nf90_put_att(ncid_out,out_lonvid,'units','degrees_east')
+  status=nf90_put_att(ncid_out,out_lonvid,'long_name','Longitude on v grid')
   !   Latitudes on "u" dynamical grid
   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')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_latuid,'long_name', 18,'Latitude on u grid')
+  status=nf90_put_att(ncid_out,out_latuid,'units','degrees_north')
+  status=nf90_put_att(ncid_out,out_latuid,'long_name','Latitude on u grid')
   !  Latitudes on "v" dynamical grid
   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')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_latvid,'long_name', 18,'Latitude on v grid')
+  status=nf90_put_att(ncid_out,out_latvid,'units','degrees_north')
+  status=nf90_put_att(ncid_out,out_latvid,'long_name','Latitude on v grid')
   !  "u" lat/lon dynamical grid
   out_dim(1)=out_lonudim
@@ -146 +146 @@
   status=NF90_DEF_VAR(ncid_out,'grille_u',NF90_FLOAT,out_dim, out_uid)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,out_uid,'units', 3,'m/s')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_uid,'long_name', 21,'u-wind dynamical grid')
+  status=nf90_put_att(ncid_out,out_uid,'units','m/s')
+  status=nf90_put_att(ncid_out,out_uid,'long_name','u-wind dynamical grid')
   !  "v" lat/lon dynamical grid
   out_dim(1)=out_lonvdim
@@ -153 +153 @@
   status=NF90_DEF_VAR(ncid_out,'grille_v',NF90_FLOAT,out_dim, out_vid)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,out_vid,'units', 3,'m/s')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_vid,'long_name', 21,'v-wind dynamical grid')
+  status=nf90_put_att(ncid_out,out_vid,'units','m/s')
+  status=nf90_put_att(ncid_out,out_vid,'long_name','v-wind dynamical grid')
   !  "s" (scalar) lat/lon dynamical grid
   out_dim(1)=out_lonvdim
@@ -160 +160 @@
   status=NF90_DEF_VAR(ncid_out,'grille_s',NF90_FLOAT,out_dim, out_tempid)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,out_tempid,'units', 6,'Kelvin')
-  status=NF_PUT_ATT_TEXT(ncid_out,out_tempid,'long_name',21,'scalar dynamical grid')
+  status=nf90_put_att(ncid_out,out_tempid,'units','Kelvin')
+  status=nf90_put_att(ncid_out,out_tempid,'long_name','scalar dynamical grid')
   !
   ! for INCA :
@@ -167 +167 @@
   status=NF90_DEF_VAR(ncid_out,'presnivs',NF90_FLOAT,out_levdim, presnivs_id)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,presnivs_id,'units', 2,'Pa')
-  status=NF_PUT_ATT_TEXT(ncid_out,presnivs_id,'long_name',15,'Vertical levels')
+  status=nf90_put_att(ncid_out,presnivs_id,'units','Pa')
+  status=nf90_put_att(ncid_out,presnivs_id,'long_name','Vertical levels')
   ! surface geopotential height: named "phis" as the sfc geopotential, is actually phis/g
   out_dim(1)=out_lonvdim
@@ -174 +174 @@
   status = nf90_def_var(ncid_out,'phis',NF90_FLOAT,out_dim,phis_id)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,phis_id,'units', 1,'m')
-  status=NF_PUT_ATT_TEXT(ncid_out,phis_id,'long_name',27,'surface geopotential height')
+  status=nf90_put_att(ncid_out,phis_id,'units','m')
+  status=nf90_put_att(ncid_out,phis_id,'long_name','surface geopotential height')
   ! gridcell area
   status = nf90_def_var(ncid_out,'aire',NF90_FLOAT,out_dim,area_id)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,area_id,'units', 2,'m2')
-  status=NF_PUT_ATT_TEXT(ncid_out,area_id,'long_name',13,'gridcell area')
+  status=nf90_put_att(ncid_out,area_id,'units','m2')
+  status=nf90_put_att(ncid_out,area_id,'long_name','gridcell area')
   ! land-sea mask (nearest integer approx)
   status = nf90_def_var(ncid_out,'mask',NF90_INT,out_dim,mask_id)
   CALL handle_err(status)
-  status=NF_PUT_ATT_TEXT(ncid_out,mask_id,'long_name',27,'land-sea mask (nINT approx)')
+  status=nf90_put_att(ncid_out,mask_id,'long_name','land-sea mask (nINT approx)')
   
   ! END the 'define' mode in netCDF file
-  status=NF_ENDDEF(ncid_out)  
+  status=nf90_enddef(ncid_out)
   CALL handle_err(status)
   
@@ -232 +232 @@
 
 SUBROUTINE handle_err(status)
-  USE lmdz_netcdf, ONLY: nf_strerror
+  USE netcdf, ONLY: nf90_strerror
 
   INTEGER status
-  IF (status/=nf_noerr) THEN
-     PRINT *,NF_STRERROR(status)
+  IF (status/=nf90_noerr) THEN
+     PRINT *,nf90_strerror(status)
      CALL abort_gcm('grilles_gcm_netcdf','netcdf error',1)
   ENDIF

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynetat0_loc.F90

@@ -9 +9 @@
   USE infotrac,    ONLY: nqtot, tracers, niso, iqIsoPha, iH2O, isoName
   USE strings_mod, ONLY: maxlen, msg, strStack, real2str, int2str, strIdx
-  USE lmdz_netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &
+  USE netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &
                          NF90_CLOSE, NF90_GET_VAR, NF90_INQUIRE_VARIABLE,  NF90_NoErr
   USE readTracFiles_mod, ONLY: new2oldH2O, newHNO3, oldHNO3, getKey

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_loc.F90

@@ -11 +11 @@
   USE strings_mod, ONLY: maxlen
   USE infotrac, ONLY: nqtot, tracers
-  USE lmdz_netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
+  USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
                     NF90_CLOSE,  NF90_PUT_ATT, NF90_UNLIMITED, NF90_CLOBBER,   &
                     NF90_64BIT_OFFSET
@@ -178 +178 @@
   USE infotrac, ONLY: nqtot, tracers, type_trac
   USE control_mod
-  USE lmdz_netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
+  USE netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
                       NF90_CLOSE, NF90_WRITE,   NF90_PUT_VAR, NF90_NoErr
   USE dynredem_mod, ONLY: dynredem_write_u, dynredem_write_v, dynredem_read_u, &

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/dynredem_mod.F90

@@ -4 +4 @@
   USE parallel_lmdz
   USE mod_hallo
-  USE lmdz_netcdf, ONLY:nf90_strerror,nf90_noerr,nf90_redef,nf90_put_var,nf90_inquire_dimension,&
-          nf90_format,nf90_inq_varid,nf90_get_var,nf90_def_var,nf90_enddef,nf90_put_att
+  USE netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_redef,nf90_put_var,nf90_inquire_dimension,&
+          nf90_inq_varid,nf90_get_var,nf90_def_var,nf90_enddef,nf90_put_att
+  USE lmdz_netcdf_format, ONLY: nf90_format
   PRIVATE
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err
@@ -181 +182 @@
   CHARACTER(LEN=*), OPTIONAL, INTENT(IN) :: units
 !===============================================================================
-  CALL err(NF90_DEF_VAR(ncid,var,NF90_FORMAT,did,nvarid),"inq",var)
+  CALL err(NF90_DEF_VAR(ncid,var,nf90_format,did,nvarid),"inq",var)
   IF(title/="")      CALL err(NF90_PUT_ATT(ncid,nvarid,"title",title),var)
   IF(PRESENT(units)) CALL err(NF90_PUT_ATT(ncid,nvarid,"units",units),var)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/guide_loc_mod.F90

@@ -8 +8 @@
   USE getparam, only: ini_getparam, fin_getparam, getpar
   USE Write_Field_loc
-  use lmdz_netcdf, only: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
-          nf90_inq_dimid, nf90_inquire_dimension, nf_inq_dimid, &
-          nf_inq_dimlen, nf_enddef, nf_def_dim, nf90_put_var, nf_noerr, nf_close, nf_inq_varid, &
-          nf_redef, nf_write, nf_unlimited, nf_float, nf_clobber, nf_64bit_offset, nf90_float, &
-          nf_create, nf_def_var, nf_open
+  use netcdf, only: nf90_nowrite, nf90_open, nf90_inq_varid, nf90_close, &
+          nf90_inq_dimid, nf90_inquire_dimension, nf90_inq_dimid, &
+          nf90_inquire_dimension, nf90_enddef, nf90_def_dim, nf90_put_var, nf90_noerr, nf90_close, nf90_inq_varid, &
+          nf90_redef, nf90_write, nf90_unlimited, nf90_float, nf90_clobber, nf90_64bit_offset, nf90_float, &
+          nf90_create, nf90_def_var, nf90_open
   USE parallel_lmdz
   USE pres2lev_mod, only: pres2lev
@@ -176 +176 @@
        if (ncidpl==-99) then
           rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file apbp.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -184 +184 @@
        if (ncidpl==-99) then
           rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file P.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -193 +193 @@
        if (ncidpl==-99) then
           rcod=nf90_open('u.nc',Nf90_NOWRITe,ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file u.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -204 +204 @@
        if (ncidpl==-99) then
           rcod=nf90_open('v.nc',nf90_nowrite,ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file v.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -214 +214 @@
        if (ncidpl==-99) then
           rcod=nf90_open('T.nc',nf90_nowrite,ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file T.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -225 +225 @@
        if (ncidpl==-99) then
           rcod=nf90_open('hur.nc',nf90_nowrite, ncidpl)
-          if (rcod/=NF_NOERR) THEN
+          if (rcod/=nf90_noerr) THEN
              abort_message=' Nudging error -> no file hur.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -233 +233 @@
 
     endif 
-    error=NF_INQ_DIMID(ncidpl,'LEVEL',rid)
-    IF (error/=NF_NOERR) error=NF_INQ_DIMID(ncidpl,'PRESSURE',rid)
-    IF (error/=NF_NOERR) THEN
+    error=nf90_inq_dimid(ncidpl,'LEVEL',rid)
+    IF (error/=nf90_noerr) error=nf90_inq_dimid(ncidpl,'PRESSURE',rid)
+    IF (error/=nf90_noerr) THEN
         abort_message='Nudging: error reading pressure levels'
         CALL abort_gcm(modname,abort_message,1)
     ENDIF
-    error=NF_INQ_DIMLEN(ncidpl,rid,nlevnc)
+    error=nf90_inquire_dimension(ncidpl,rid,len=nlevnc)
     write(*,*)trim(modname)//' : number of vertical levels nlevnc', nlevnc
     rcod = nf90_close(ncidpl)
@@ -1603 +1603 @@
              write(*,*) trim(modname)//' Reading nudging on model levels'
              rcode = nf90_open('apbp.nc', nf90_nowrite, ncidpl)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file apbp.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidpl, 'AP', varidap)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no AP variable in file apbp.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidpl, 'BP', varidbp)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no BP variable in file apbp.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1623 +1623 @@
          if (guide_plevs==2) then
              rcode = nf90_open('P.nc', nf90_nowrite, ncidp)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file P.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidp, 'PRES', varidp)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no PRES variable in file P.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1639 +1639 @@
          if (guide_u) then
              rcode = nf90_open('u.nc', nf90_nowrite, ncidu)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file u.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidu, 'UWND', varidu)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no UWND variable in file u.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1652 +1652 @@
 
     
-             status=NF90_INQ_DIMID(ncidu, "LONU", dimid)
+             status=nf90_inq_dimid(ncidu, "LONU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidu,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1659 +1659 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidu, "LATU", dimid)
+             status=nf90_inq_dimid(ncidu, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidu,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1671 +1671 @@
          if (guide_v) then
              rcode = nf90_open('v.nc', nf90_nowrite, ncidv)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file v.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidv, 'VWND', varidv)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no VWND variable in file v.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1683 +1683 @@
              if (ncidpl==-99) ncidpl=ncidv
              
-             status=NF90_INQ_DIMID(ncidv, "LONV", dimid)
+             status=nf90_inq_dimid(ncidv, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidv,dimid,namedim,lendim)
              
@@ -1692 +1692 @@
 
 
-             status=NF90_INQ_DIMID(ncidv, "LATV", dimid)
+             status=nf90_inq_dimid(ncidv, "LATV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidv,dimid,namedim,lendim)
              IF (lendim /= jjm) THEN
@@ -1704 +1704 @@
          if (guide_T) then
              rcode = nf90_open('T.nc', nf90_nowrite, ncidt)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file T.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidt, 'AIR', varidt)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no AIR variable in file T.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1716 +1716 @@
              if (ncidpl==-99) ncidpl=ncidt
 
-             status=NF90_INQ_DIMID(ncidt, "LONV", dimid)
+             status=nf90_inq_dimid(ncidt, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidt,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1723 +1723 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidt, "LATU", dimid)
+             status=nf90_inq_dimid(ncidt, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidt,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1735 +1735 @@
          if (guide_Q) then
              rcode = nf90_open('hur.nc', nf90_nowrite, ncidQ)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file hur.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidQ, 'RH', varidQ)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no RH variable in file hur.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1748 +1748 @@
 
 
-             status=NF90_INQ_DIMID(ncidQ, "LONV", dimid)
+             status=nf90_inq_dimid(ncidQ, "LONV", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidQ,dimid,namedim,lendim)
              IF (lendim /= iip1) THEN
@@ -1755 +1755 @@
              ENDIF
 
-             status=NF90_INQ_DIMID(ncidQ, "LATU", dimid)
+             status=nf90_inq_dimid(ncidQ, "LATU", dimid)
              status=NF90_INQUIRE_DIMENSION(ncidQ,dimid,namedim,lendim)
              IF (lendim /= jjp1) THEN
@@ -1767 +1767 @@
          if ((guide_P).OR.(guide_plevs==1)) then
              rcode = nf90_open('ps.nc', nf90_nowrite, ncidps)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no file ps.nc'
               CALL abort_gcm(modname,abort_message,1)
              ENDIF
              rcode = nf90_inq_varid(ncidps, 'SP', varidps)
-             IF (rcode/=NF_NOERR) THEN
+             IF (rcode/=nf90_noerr) THEN
               abort_message='Nudging: error -> no SP variable in file ps.nc'
               CALL abort_gcm(modname,abort_message,1)
@@ -1925 +1925 @@
            write(*,*)trim(modname)//' Reading nudging on model levels'
            rcode = nf90_open('apbp.nc', nf90_nowrite, ncidpl)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file apbp.nc'
            CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidpl, 'AP', varidap)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no AP variable in file apbp.nc'
            CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidpl, 'BP', varidbp)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no BP variable in file apbp.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -1944 +1944 @@
          if (guide_plevs==2) then
            rcode = nf90_open('P.nc', nf90_nowrite, ncidp)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file P.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidp, 'PRES', varidp)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no PRES variable in file P.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -1959 +1959 @@
          if (guide_u) then
            rcode = nf90_open('u.nc', nf90_nowrite, ncidu)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file u.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidu, 'UWND', varidu)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no UWND variable in file u.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -1975 +1975 @@
          if (guide_v) then
            rcode = nf90_open('v.nc', nf90_nowrite, ncidv)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file v.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidv, 'VWND', varidv)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no VWND variable in file v.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -1990 +1990 @@
          if (guide_T) then
            rcode = nf90_open('T.nc', nf90_nowrite, ncidt)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file T.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidt, 'AIR', varidt)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no AIR variable in file T.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -2005 +2005 @@
          if (guide_Q) then
            rcode = nf90_open('hur.nc', nf90_nowrite, ncidQ)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file hur.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidQ, 'RH', varidQ)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no RH,variable in file hur.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -2020 +2020 @@
          if ((guide_P).OR.(guide_plevs==1)) then
            rcode = nf90_open('ps.nc', nf90_nowrite, ncidps)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no file ps.nc'
              CALL abort_gcm(modname,abort_message,1)
            ENDIF
            rcode = nf90_inq_varid(ncidps, 'SP', varidps)
-           IF (rcode/=NF_NOERR) THEN
+           IF (rcode/=nf90_noerr) THEN
              abort_message='Nudging: error -> no SP variable in file ps.nc'
              CALL abort_gcm(modname,abort_message,1)
@@ -2230 +2230 @@
 ! ----------------------------------------------
 ! Ouverture du fichier
-        ierr=NF_CREATE("guide_ins.nc",IOR(NF_CLOBBER,NF_64BIT_OFFSET),nid)
+        ierr=nf90_create("guide_ins.nc",IOR(nf90_clobber,nf90_64bit_offset),nid)
 ! Definition des dimensions
-        ierr=NF_DEF_DIM(nid,"LONU",iip1,id_lonu) 
-        ierr=NF_DEF_DIM(nid,"LONV",iip1,id_lonv) 
-        ierr=NF_DEF_DIM(nid,"LATU",jjp1,id_latu) 
-        ierr=NF_DEF_DIM(nid,"LATV",jjm,id_latv) 
-        ierr=NF_DEF_DIM(nid,"LEVEL",llm,id_lev)
-        ierr=NF_DEF_DIM(nid,"TIME",NF_UNLIMITED,id_tim)
+        ierr=nf90_def_dim(nid,"LONU",iip1,id_lonu)
+        ierr=nf90_def_dim(nid,"LONV",iip1,id_lonv)
+        ierr=nf90_def_dim(nid,"LATU",jjp1,id_latu)
+        ierr=nf90_def_dim(nid,"LATV",jjm,id_latv)
+        ierr=nf90_def_dim(nid,"LEVEL",llm,id_lev)
+        ierr=nf90_def_dim(nid,"TIME",nf90_unlimited,id_tim)
 
 ! 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)
@@ -2254 +2254 @@
              varid_alpha_q)
         
-        ierr=NF_ENDDEF(nid)
+        ierr=nf90_enddef(nid)
 
 ! Enregistrement des variables dimensions
@@ -2271 +2271 @@
 ! Cr�ation des variables sauvegard�es
 ! --------------------------------------------------------------------
-        ierr = NF_REDEF(nid)
+        ierr = nf90_redef(nid)
 ! 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
         
-        ierr = NF_ENDDEF(nid)
-        ierr = NF_CLOSE(nid)
+        ierr = nf90_enddef(nid)
+        ierr = nf90_close(nid)
     ENDIF ! timestep=0
 
@@ -2313 +2313 @@
 ! --------------------------------------------------------------------
  
-    ierr=NF_OPEN("guide_ins.nc",NF_WRITE,nid)
+    ierr=nf90_open("guide_ins.nc",nf90_write,nid)
 
     IF (varname=="SP") timestep=timestep+1
 
-    ierr = NF_INQ_VARID(nid,varname,varid)
+    ierr = nf90_inq_varid(nid,varname,varid)
     SELECT CASE (varname)
     CASE ("SP","ps")
@@ -2356 +2356 @@
 
     ierr = nf90_put_var(nid,varid,field_glo,start,count)
-    ierr = NF_CLOSE(nid)
+    ierr = nf90_close(nid)
 
        DEALLOCATE(field_glo)

LMDZ6/branches/Amaury_dev/libf/dyn3dmem/iniacademic_loc.F90

@@ -23 +23 @@
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
   USE readTracFiles_mod, ONLY: addPhase
-  use lmdz_netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE, NF90_GET_VAR
+  use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE, NF90_GET_VAR
 
   !   Author:    Frederic Hourdin      original: 15/01/93

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -21 +21 @@
   USE etat0phys,      ONLY: etat0phys_netcdf
   USE limit,          ONLY: limit_netcdf
-  USE lmdz_netcdf,         ONLY: NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR,    &
-         NF90_INQUIRE_DIMENSION, NF90_INQ_DIMID, NF90_INQ_VARID, NF90_GET_VAR
+  USE netcdf,         ONLY: NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR,    &
+         NF90_INQUIRE_DIMENSION, nf90_inq_dimid, NF90_INQ_VARID, NF90_GET_VAR
   USE infotrac,       ONLY: init_infotrac
   USE dimphy,         ONLY: klon
@@ -191 +191 @@
     WRITE(lunout,*)'BEWARE !! File "startphy0.nc" found.'
     WRITE(lunout,*)'Getting the land mask from a previous run.'
-    iret=NF90_INQ_DIMID(nid_sta,'points_physiques',nid_nph)
+    iret=nf90_inq_dimid(nid_sta,'points_physiques',nid_nph)
     iret=NF90_INQUIRE_DIMENSION(nid_sta,nid_nph,len=nphys)
     IF(nphys/=klon) THEN

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

@@ -71 +71 @@
 #ifndef CPP_1D
   USE indice_sol_mod
-  USE lmdz_netcdf,             ONLY: NF90_OPEN,    NF90_CREATE,  NF90_CLOSE,        &
+  USE netcdf,             ONLY: NF90_OPEN,    NF90_CREATE,  NF90_CLOSE,        &
                   NF90_DEF_DIM, NF90_DEF_VAR, NF90_PUT_VAR, NF90_PUT_ATT,      &
                   NF90_NOERR,   NF90_NOWRITE,  NF90_GLOBAL,       &
                   NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT,      &
-                  NF90_64BIT_OFFSET, NF90_FORMAT
+                  NF90_64BIT_OFFSET
+  USE lmdz_netcdf_format, ONLY: nf90_format
   USE inter_barxy_m,      ONLY: inter_barxy
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
@@ -251 +252 @@
 
   !--- Variables creation
-  CALL ncerr(NF90_DEF_VAR(nid,"TEMPS",NF90_FORMAT,[ntim],id_tim),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"FOCE", NF90_FORMAT,dims,id_FOCE),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"FSIC", NF90_FORMAT,dims,id_FSIC),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"FTER", NF90_FORMAT,dims,id_FTER),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"FLIC", NF90_FORMAT,dims,id_FLIC),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"SST",  NF90_FORMAT,dims,id_SST),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"BILS", NF90_FORMAT,dims,id_BILS),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"ALB",  NF90_FORMAT,dims,id_ALB),fnam)
-  CALL ncerr(NF90_DEF_VAR(nid,"RUG",  NF90_FORMAT,dims,id_RUG),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"TEMPS",nf90_format,[ntim],id_tim),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"FOCE", nf90_format,dims,id_FOCE),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"FSIC", nf90_format,dims,id_FSIC),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"FTER", nf90_format,dims,id_FTER),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"FLIC", nf90_format,dims,id_FLIC),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"SST",  nf90_format,dims,id_SST),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"BILS", nf90_format,dims,id_BILS),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"ALB",  nf90_format,dims,id_ALB),fnam)
+  CALL ncerr(NF90_DEF_VAR(nid,"RUG",  nf90_format,dims,id_RUG),fnam)
   call nf95_def_var(nid, "longitude", NF90_FLOAT, ndim, varid_longitude)
   call nf95_def_var(nid, "latitude",  NF90_FLOAT, ndim, varid_latitude)
@@ -321 +322 @@
 !     2) Dimensional variables have the same names as corresponding dimensions.
 !-----------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY: NF90_OPEN, NF90_INQ_VARID, NF90_INQUIRE_VARIABLE, &
-       NF90_CLOSE, NF90_INQ_DIMID, NF90_INQUIRE_DIMENSION, NF90_GET_VAR, &
+  USE netcdf, ONLY: NF90_OPEN, NF90_INQ_VARID, NF90_INQUIRE_VARIABLE, &
+       NF90_CLOSE, nf90_inq_dimid, NF90_INQUIRE_DIMENSION, NF90_GET_VAR, &
        NF90_GET_ATT
   USE pchsp_95_m, only: pchsp_95
@@ -740 +741 @@
 ! Purpose: NetCDF errors handling.
 !-------------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY : NF90_NOERR, NF90_STRERROR
+  USE netcdf, ONLY : NF90_NOERR, NF90_STRERROR
   IMPLICIT NONE
 !-------------------------------------------------------------------------------

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_netcdf_format.F90

@@ -7 +7 @@
 ! ---------------------------------------------
 
-MODULE lmdz_netcdf
+MODULE lmdz_netcdf_format
   USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : REAL64, REAL32
-  USE netcdf
-  IMPLICIT NONE
-  ! Note: as we want to expose netcdf through this module, we don't make all PRIVATE by default as usual
-  ! Instead, explicitely make PRIVATE the relevant items.
-
-  INCLUDE 'netcdf.inc'
+  USE netcdf, ONLY: nf90_float, nf90_double
+  IMPLICIT NONE; PRIVATE
+  PUBLIC nf90_format
 
 #ifdef NC_DOUBLE
-  INTEGER, PARAMETER :: NF90_FORMAT = NF90_DOUBLE
+  INTEGER, PARAMETER :: nf90_format = nf90_double
 #else
-  INTEGER, PARAMETER :: NF90_FORMAT = NF90_FLOAT
+  INTEGER, PARAMETER :: nf90_format = nf90_float
 #endif
-END MODULE lmdz_netcdf
+END MODULE lmdz_netcdf_format

LMDZ6/branches/Amaury_dev/libf/misc/write_field.F90

@@ -1 +1 @@
 module write_field
-  USE lmdz_netcdf, ONLY: nf_sync, nf90_put_var, nf_enddef, nf_def_dim, nf_unlimited, &
-      nf_clobber, nf90_format, nf_create, nf_def_var
+  USE netcdf, ONLY: nf90_sync, nf90_put_var, nf90_enddef, nf90_def_dim, nf90_unlimited, &
+      nf90_clobber, nf90_create, nf90_def_var
+  USE lmdz_netcdf_format, ONLY: nf90_format
 
   implicit none
@@ -102 +103 @@
 
       status = nf90_put_var(FieldId(Index),FieldVarId(Index),Field,start,count)
-      status = NF_SYNC(FieldId(Index))
+      status = nf90_sync(FieldId(Index))
       
     end subroutine WriteField_gen
@@ -119 +120 @@
       
       
-      status = NF_CREATE(TRIM(ADJUSTL(name))//'.nc', NF_CLOBBER, FieldId(NbField))
-      status = NF_DEF_DIM(FieldId(NbField),'X',dimx,TabDim(1))
-      status = NF_DEF_DIM(FieldId(NbField),'Y',dimy,TabDim(2))
-      status = NF_DEF_DIM(FieldId(NbField),'Z',dimz,TabDim(3))
-      status = NF_DEF_DIM(FieldId(NbField),'iter',NF_UNLIMITED,TabDim(4))
-      status = NF_DEF_VAR(FieldId(NbField),FieldName(NbField),NF90_FORMAT,4,TabDim,FieldVarId(NbField))
-      status = NF_ENDDEF(FieldId(NbField))
+      status = nf90_create(TRIM(ADJUSTL(name))//'.nc', nf90_clobber, FieldId(NbField))
+      status = nf90_def_dim(FieldId(NbField),'X',dimx,TabDim(1))
+      status = nf90_def_dim(FieldId(NbField),'Y',dimy,TabDim(2))
+      status = nf90_def_dim(FieldId(NbField),'Z',dimz,TabDim(3))
+      status = nf90_def_dim(FieldId(NbField),'iter',nf90_unlimited,TabDim(4))
+      status = nf90_def_var(FieldId(NbField),FieldName(NbField),nf90_format,TabDim,FieldVarId(NbField))
+      status = nf90_enddef(FieldId(NbField))
 
     end subroutine CreateNewField

LMDZ6/branches/Amaury_dev/libf/misc/wxios.F90

@@ -604 +604 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_field(fieldname, fieldgroup, fieldlongname, fieldunit)
-        USE lmdz_netcdf, only: nf90_fill_real
+        USE netcdf, only: nf90_fill_real
 
         IMPLICIT NONE

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc.F

@@ -4 +4 @@
      .                     lmt_omnat)
       USE dimphy
-      USE lmdz_netcdf, ONLY: nf_close,nf_noerr,nf_inq_varid,nf_open,nf_nowrite,nf90_get_var
+      USE netcdf, ONLY: nf90_close,nf90_noerr,nf90_inq_varid,nf90_open,nf90_nowrite,nf90_get_var
       IMPLICIT none
 !
@@ -34 +34 @@
       ENDIF
 !
-      ierr = NF_OPEN ("limitcarbon.nc", NF_NOWRITE, nid1)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("limitcarbon.nc", nf90_nowrite, nid1)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier limitbc.nc'
         write(6,*)' ierr = ', ierr
@@ -48 +48 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "BCFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCFF", nvarid)
       ierr = nf90_get_var(nid1, nvarid, lmt_bcff, debut, epais)
 !      print *,'IERR = ',ierr
-!      print *,'NF_NOERR = ',NF_NOERR
+!      print *,'nf90_noerr = ',nf90_noerr
 !      print *,'debut = ',debut
 !      print *,'epais = ',epais
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -60 +60 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "BCBB", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBB", nvarid)
       ierr = nf90_get_var(nid1, nvarid, lmt_bcbb, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC-biomass'
          CALL exit(1)
@@ -68 +68 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "BCBL", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBL", nvarid)
       ierr = nf90_get_var(nid1, nvarid, lmt_bcbbl, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC low'
          CALL exit(1)
@@ -76 +76 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "BCBH", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBH", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcbbh, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC high'
          CALL exit(1)
       ENDIF
 !
-      ierr = NF_INQ_VARID (nid1, "TERP", nvarid)
+      ierr = nf90_inq_varid (nid1, "TERP", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_terp, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources Terpene'
          CALL exit(1)
@@ -91 +91 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "BC_penner", nvarid)
+      ierr = nf90_inq_varid (nid1, "BC_penner", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bc_penner, debut,  epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC Penner'
          CALL exit(1)
@@ -99 +99 @@
 !
 !
-      ierr = NF_INQ_VARID (nid1, "OMFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMFF", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_omff, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources om-ifossil'
          CALL exit(1)
@@ -114 +114 @@
       ENDDO
 !
-      ierr = NF_CLOSE(nid1)
+      ierr = nf90_close(nid1)
       PRINT*, 'Carbon sources lues pour jour: ', jour
 !

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfc_new.F

@@ -6 +6 @@
       USE mod_phys_lmdz_para
       USE dimphy
-      USE lmdz_netcdf, ONLY:nf90_get_var,nf_close,nf_noerr,nf_inq_varid,nf_open,nf_nowrite
+      USE netcdf, ONLY:nf90_get_var,nf90_close,nf90_noerr,nf90_inq_varid,nf90_open,nf90_nowrite
       IMPLICIT none
 c
@@ -57 +57 @@
 !=======================================================================
 !
-      ierr = NF_OPEN ("carbon_emissions.nc", NF_NOWRITE, nid1)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("carbon_emissions.nc", nf90_nowrite, nid1)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier limitbc.nc'
         write(6,*)' ierr = ', ierr
@@ -66 +66 @@
 ! BC emissions from fossil fuel combustion
 !
-      ierr = NF_INQ_VARID (nid1, "BCFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCFF", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcff_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -77 +77 @@
 ! BC emissions from non fossil fuel combustion
 !
-      ierr = NF_INQ_VARID (nid1, "BCNFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCNFF", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcnff_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -86 +86 @@
 ! Low BC emissions from biomass burning
 !
-      ierr = NF_INQ_VARID (nid1, "BCBBL", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBBL", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcbbl_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC low'
          CALL exit(1)
@@ -95 +95 @@
 ! High BC emissions from biomass burning
 !
-      ierr = NF_INQ_VARID (nid1, "BCBBH", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBBH", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcbbh_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC high'
          CALL exit(1)
@@ -104 +104 @@
 ! BC emissions from ship transport
 !
-      ierr = NF_INQ_VARID (nid1, "BCBA", nvarid)
+      ierr = nf90_inq_varid (nid1, "BCBA", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_bcba_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -119 +119 @@
 ! OM emissions from fossil fuel combustion
 !
-      ierr = NF_INQ_VARID (nid1, "OMFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMFF", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_omff_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources OM'
          CALL exit(1)
@@ -128 +128 @@
 ! OM emissions from non fossil fuel combustion
 !
-      ierr = NF_INQ_VARID (nid1, "OMNFF", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMNFF", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_omnff_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources OM'
          CALL exit(1)
@@ -137 +137 @@
 ! Low OM emissions from biomass burning - low
 !
-      ierr = NF_INQ_VARID (nid1, "OMBBL", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMBBL", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_ombbl_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources OM low'
          CALL exit(1)
@@ -146 +146 @@
 ! High OM emissions from biomass burning - high
 !
-      ierr = NF_INQ_VARID (nid1, "OMBBH", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMBBH", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_ombbh_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources OM high'
          CALL exit(1)
@@ -155 +155 @@
 ! High OM emissions from ship
 !
-      ierr = NF_INQ_VARID (nid1, "OMBA", nvarid)
+      ierr = nf90_inq_varid (nid1, "OMBA", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_omba_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources OM ship'
          CALL exit(1)
@@ -164 +164 @@
 ! Natural Terpene emissions => Natural OM emissions
 !
-      ierr = NF_INQ_VARID (nid1, "TERP", nvarid)
+      ierr = nf90_inq_varid (nid1, "TERP", nvarid)
       ierr = nf90_get_var (nid1, nvarid, lmt_terp_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources Terpene'
          CALL exit(1)
@@ -175 +175 @@
       ENDDO
 
-      ierr = NF_CLOSE(nid1)
+      ierr = nf90_close(nid1)
 !
       PRINT*, 'Carbon sources lues pour jour: ', jour

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs.F

@@ -4 +4 @@
      .                     lmt_dmsbio, lmt_h2sbio, lmt_dms, lmt_dmsconc)
        USE dimphy
-       USE lmdz_netcdf, ONLY:nf_close,nf_noerr,nf_inq_varid,nf_open,nf_nowrite,nf90_get_var
+       USE netcdf, ONLY:nf90_close,nf90_noerr,nf90_inq_varid,nf90_open,nf90_nowrite,nf90_get_var
       IMPLICIT none
 c
@@ -34 +34 @@
       ENDIF
 c
-      ierr = NF_OPEN ("limitsoufre.nc", NF_NOWRITE, nid)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("limitsoufre.nc", nf90_nowrite, nid)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier limitsoufre.nc'
         write(6,*)' ierr = ', ierr
@@ -47 +47 @@
       epais(2) = 1
 c
-      ierr = NF_INQ_VARID (nid, "VOLC", nvarid)
+      ierr = nf90_inq_varid (nid, "VOLC", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2volc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 volcan'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "ALTI", nvarid)
+      ierr = nf90_inq_varid (nid, "ALTI", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_altvolc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les altitudes volcan'
          CALL exit(1)
@@ -63 +63 @@
       IF (edgar) THEN   !--EDGAR w/o ship and biomass burning
 c
-      ierr = NF_INQ_VARID (nid, "SO2ED95L", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2ED95L", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2b, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 edgar low'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "SO2ED95H", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2ED95H", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2h, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 edgar high'
          CALL exit(1)
@@ -79 +79 @@
       ELSE  !--GEIA 
 c
-      ierr = NF_INQ_VARID (nid, "SO2H", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2H", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2h, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 haut'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "SO2B", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2B", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2b, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 bas'
          CALL exit(1)
@@ -95 +95 @@
       ENDIF  !--edgar
 c
-      ierr = NF_INQ_VARID (nid, "SO2BB", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2BB", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2bb, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 bb'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "SO2BA", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2BA", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2ba, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 bateau'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "DMSB", nvarid)
+      ierr = nf90_inq_varid (nid, "DMSB", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_dmsbio, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms bio'
          CALL exit(1)
       ENDIF
 c
-      ierr = NF_INQ_VARID (nid, "H2SB", nvarid)
+      ierr = nf90_inq_varid (nid, "H2SB", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_h2sbio, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources h2s bio'
          CALL exit(1)
@@ -125 +125 @@
       IF (flag_dms==1) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSL", nvarid)
+      ierr = nf90_inq_varid (nid, "DMSL", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_dms, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms liss'
          CALL exit(1)
@@ -134 +134 @@
       ELSEIF (flag_dms==2) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSW", nvarid)
+      ierr = nf90_inq_varid (nid, "DMSW", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_dms, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms wann'
          CALL exit(1)
@@ -143 +143 @@
       ELSEIF (flag_dms==3) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC1", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC1", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dmsconc old'
          CALL exit(1)
@@ -152 +152 @@
       ELSEIF (flag_dms==4) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC2", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC2", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 2'
          CALL exit(1)
@@ -161 +161 @@
       ELSEIF (flag_dms==5) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC3", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC3", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 3'
          CALL exit(1)
@@ -170 +170 @@
       ELSEIF (flag_dms==6) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC4", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC4", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 4'
          CALL exit(1)
@@ -179 +179 @@
       ELSEIF (flag_dms==7) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC5", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC5", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 5'
          CALL exit(1)
@@ -188 +188 @@
       ELSEIF (flag_dms==8) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC6", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC6", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 6'
          CALL exit(1)
@@ -197 +197 @@
       ELSEIF (flag_dms==9) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC7", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC7", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 7'
          CALL exit(1)
@@ -206 +206 @@
       ELSEIF (flag_dms==10) THEN 
 c
-      ierr = NF_INQ_VARID (nid, "DMSC8", nvarid)
-      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      ierr = nf90_inq_varid (nid, "DMSC8", nvarid)
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc, debut, epais)
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 8'
          CALL exit(1)
@@ -220 +220 @@
       ENDIF
 c
-      ierr = NF_CLOSE(nid)
+      ierr = nf90_close(nid)
 c
       IF (flag_dms<=2) THEN 

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/condsurfs_new.F

@@ -9 +9 @@
       USE mod_phys_lmdz_para
       USE dimphy
-      USE lmdz_netcdf, ONLY: nf90_get_var,nf_inq_varid,nf_close,nf_noerr,nf_open,nf_nowrite
+      USE netcdf, ONLY: nf90_get_var,nf90_inq_varid,nf90_close,nf90_noerr,nf90_open,nf90_nowrite
       IMPLICIT none
 c
@@ -61 +61 @@
 !=======================================================================
 !
-      ierr = NF_OPEN ("sulphur_emissions_antro.nc", NF_NOWRITE, nid)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("sulphur_emissions_antro.nc", nf90_nowrite, nid)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_antro'
         write(6,*)' ierr = ', ierr
@@ -71 +71 @@
 ! SO2 Low level emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2FF_LOW", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2FF_LOW", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2b_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 low'
         print *,'JE klon, jour, debut ,epais ',klon_glo,jour,debut,epais
@@ -83 +83 @@
 ! SO2 High level emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2FF_HIGH", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2FF_HIGH", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2h_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 high'
         CALL exit(1)
@@ -92 +92 @@
 ! SO2 Biomass burning High level emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2BBH", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2BBH", nvarid)
       ierr = nf90_get_var(nid, nvarid,  lmt_so2bb_h_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 BB high'
         CALL exit(1)
@@ -101 +101 @@
 ! SO2 biomass burning low level emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2BBL", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2BBL", nvarid)
       ierr = nf90_get_var(nid, nvarid,  lmt_so2bb_l_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 BB low'
         CALL exit(1)
@@ -110 +110 @@
 ! SO2 ship emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2BA", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2BA", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2ba_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 ship'
         CALL exit(1)
@@ -119 +119 @@
 ! SO2 Non Fossil Fuel Emissions
 !
-      ierr = NF_INQ_VARID (nid, "SO2NFF", nvarid)
+      ierr = nf90_inq_varid (nid, "SO2NFF", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2nff_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
         PRINT*, 'Pb de lecture pour les sources so2 non FF'
         CALL exit(1)
       ENDIF
 !
-      ierr = NF_CLOSE(nid)
+      ierr = nf90_close(nid)
 !
 !=======================================================================
 !                      READING NATURAL EMISSIONS
 !=======================================================================
-      ierr = NF_OPEN ("sulphur_emissions_nat.nc", NF_NOWRITE, nid)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("sulphur_emissions_nat.nc", nf90_nowrite, nid)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_nat'
         write(6,*)' ierr = ', ierr
@@ -140 +140 @@
 c Biologenic source of DMS
 c
-      ierr = NF_INQ_VARID (nid, "DMSB", nvarid)
+      ierr = nf90_inq_varid (nid, "DMSB", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_dmsbio_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms bio'
          CALL exit(1)
@@ -149 +149 @@
 c Biologenic source of H2S
 c
-      ierr = NF_INQ_VARID (nid, "H2SB", nvarid)
+      ierr = nf90_inq_varid (nid, "H2SB", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_h2sbio_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources h2s bio'
          CALL exit(1)
@@ -160 +160 @@
       IF (flag_dms==4) THEN
 c
-      ierr = NF_INQ_VARID (nid, "DMSC2", nvarid)
+      ierr = nf90_inq_varid (nid, "DMSC2", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_dmsconc_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 2'
          CALL exit(1)
@@ -179 +179 @@
       ENDIF
 c
-      ierr = NF_CLOSE(nid)
+      ierr = nf90_close(nid)
 c
 !=======================================================================
@@ -186 +186 @@
       print *,'   ***      READING VOLCANIC EMISSIONS   ***   '
       print *,' Jour = ',jour
-      ierr = NF_OPEN ("sulphur_emissions_volc.nc", NF_NOWRITE, nid)
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open ("sulphur_emissions_volc.nc", nf90_nowrite, nid)
+      if (ierr/=nf90_noerr) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_volc'
         write(6,*)' ierr = ', ierr
@@ -195 +195 @@
 c Continuous Volcanic emissions
 c
-!      ierr = NF_INQ_VARID (nid, "VOLC", nvarid)
-      ierr = NF_INQ_VARID (nid, "flx_volc_cont", nvarid)
+!      ierr = nf90_inq_varid (nid, "VOLC", nvarid)
+      ierr = nf90_inq_varid (nid, "flx_volc_cont", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2volc_cont_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 volcan (cont)'
          CALL exit(1)
@@ -208 +208 @@
 c Altitud of continuous volcanic emissions
 c
-!      ierr = NF_INQ_VARID (nid, "ALTI", nvarid)
-      ierr = NF_INQ_VARID (nid, "flx_volc_altcont", nvarid)
+!      ierr = nf90_inq_varid (nid, "ALTI", nvarid)
+      ierr = nf90_inq_varid (nid, "flx_volc_altcont", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_altvolc_cont_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les altitudes volcan (cont)'
          CALL exit(1)
@@ -218 +218 @@
 c Explosive Volcanic emissions
 c
-      ierr = NF_INQ_VARID (nid, "flx_volc_expl", nvarid)
+      ierr = nf90_inq_varid (nid, "flx_volc_expl", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_so2volc_expl_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les sources so2 volcan (expl)'
          CALL exit(1)
@@ -230 +230 @@
 c Altitud of explosive volcanic emissions
 c
-      ierr = NF_INQ_VARID (nid, "flx_volc_altexpl", nvarid)
+      ierr = nf90_inq_varid (nid, "flx_volc_altexpl", nvarid)
       ierr = nf90_get_var(nid, nvarid, lmt_altvolc_expl_glo, debut, epais)
-      IF (ierr /= NF_NOERR) THEN
+      IF (ierr /= nf90_noerr) THEN
          PRINT*, 'Pb de lecture pour les altitudes volcan'
          CALL exit(1)
@@ -238 +238 @@
 !      lmt_altvolc_expl(:)=0.0
 
-      ierr = NF_CLOSE(nid)
+      ierr = nf90_close(nid)
 c
       PRINT*, 'Sources SOUFRE lues pour jour: ', jour

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phys_output_write_spl_mod.F90

@@ -390 +390 @@
     USE ioipsl, ONLY: histend, histsync
     USE iophy, ONLY: set_itau_iophy, histwrite_phy
-    USE lmdz_netcdf, ONLY: nf90_fill_real
+    USE netcdf, ONLY: nf90_fill_real
     ! ug Pour les sorties XIOS
     USE lmdz_xios, ONLY: xios_update_calendar, using_xios

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -4568 +4568 @@
       USE mod_grid_phy_lmdz
       USE mod_phys_lmdz_para
-      USE lmdz_netcdf, ONLY:nf_open,nf_close,nf_inq_varid,nf_nowrite,nf_noerr,nf90_get_var
+      USE netcdf, ONLY:nf90_open,nf90_close,nf90_inq_varid,nf90_nowrite,nf90_noerr,nf90_get_var
       IMPLICIT NONE
 
@@ -4587 +4587 @@
       IF (is_mpi_root .AND. is_omp_root) THEN
           !nci=NCOPN(trim(adjustl(filescaleparams)),NCNOWRIT,rcode)
-         ierr = NF_OPEN (trim(adjustl(filescaleparams)),NF_NOWRITE, nid)
-          if (ierr == NF_NOERR) THEN
+         ierr = nf90_open (trim(adjustl(filescaleparams)),nf90_nowrite, nid)
+          if (ierr == nf90_noerr) THEN
           debutread=step_sca
           countread=1
@@ -4596 +4596 @@
             varname= trim(adjustl(paramname))//aux_2s
             print *,varname
-            ierr = NF_INQ_VARID (nid,trim(adjustl(varname)), nvarid)
+            ierr = nf90_inq_varid (nid,trim(adjustl(varname)), nvarid)
             ierr = nf90_get_var (nid, nvarid, auxreal, debutread, countread)
-            IF (ierr /= NF_NOERR) THEN
+            IF (ierr /= nf90_noerr) THEN
              PRINT*, 'Pb de lecture pour modvalues'
        print *,'JE  scale_var, step_sca',trim(adjustl(varname)),step_sca
@@ -4611 +4611 @@
            enddo
 
-            ierr = NF_CLOSE(nid)
+            ierr = nf90_close(nid)
           else
            print *,'File '//trim(adjustl(filescaleparams))//' not found'

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_dust.F

@@ -3 +3 @@
       USE mod_grid_phy_lmdz
       USE mod_phys_lmdz_para
-      USE lmdz_netcdf, ONLY:nf90_get_var
+      USE netcdf, ONLY:nf90_get_var
       IMPLICIT NONE 
 c

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_surface.F90

@@ -10 +10 @@
        USE mod_phys_lmdz_para
        USE iophy
-       USE lmdz_netcdf, ONLY:nf_inq_varid,nf_noerr,nf90_get_var
+       USE netcdf, ONLY:nf90_inq_varid,nf90_noerr,nf90_get_var
        IMPLICIT NONE
 
@@ -61 +61 @@
        if (i==4) aux4s='Latu'
        if (i==5) aux4s='latU'
-       status = NF_INQ_VARID (ncid, aux4s, rcode)
+       status = nf90_inq_varid (ncid, aux4s, rcode)
 !       print *,'stat,i',status,i,outcycle,aux4s
-!       print *,'ifclause',status.NE. NF_NOERR ,outcycle == .false.
-       IF ((.not.(status/= NF_NOERR) ).and.( .not. outcycle )) THEN
+!       print *,'ifclause',status.NE. nf90_noerr ,outcycle == .false.
+       IF ((.not.(status/= nf90_noerr) ).and.( .not. outcycle )) THEN
          outcycle=.true.
          latstr=aux4s
@@ -76 +76 @@
           status=nf90_get_var(ncid,varid,lats_glo,startj,endj)
 !      print *,latstr,varid,status,jjp1,rcode
-!      IF (status .NE. NF_NOERR) print*,'NOOOOOOO'
+!      IF (status .NE. nf90_noerr) print*,'NOOOOOOO'
 !      print *,lats
 !stop

LMDZ6/branches/Amaury_dev/libf/phylmd/Dust/read_vent.F

@@ -3 +3 @@
       USE mod_grid_phy_lmdz
       USE mod_phys_lmdz_para
-      USE lmdz_netcdf, ONLY: nf90_get_var
+      USE netcdf, ONLY: nf90_get_var
 !      USE write_field_phy
       IMPLICIT NONE 

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/interp_sulf_input.F90

@@ -6 +6 @@
   USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, & 
                       nf95_inq_varid, nf95_inquire_dimension, nf95_open
-  USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+  USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
   USE mod_grid_phy_lmdz

LMDZ6/branches/Amaury_dev/libf/phylmd/StratAer/stratH2O_methox.F90

@@ -8 +8 @@
   USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, & 
                       nf95_inq_varid, nf95_inquire_dimension, nf95_open
-  USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+  USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
   USE mod_grid_phy_lmdz

LMDZ6/branches/Amaury_dev/libf/phylmd/condsurf.F90

@@ -7 +7 @@
   USE indice_sol_mod
   USE time_phylmdz_mod, ONLY: annee_ref
-  USE lmdz_netcdf, ONLY: nf90_get_var,nf_open,nf_inq_varid,nf_noerr,nf_close,nf_nowrite
+  USE netcdf, ONLY: nf90_get_var,nf90_open,nf90_inq_varid,nf90_noerr,nf90_close,nf90_nowrite
   IMPLICIT NONE
 
@@ -88 +88 @@
   !$OMP MASTER
   IF (is_mpi_root) THEN
-    ierr = nf_open(fich, nf_nowrite, nid)
-    IF (ierr/=nf_noerr) THEN
+    ierr = nf90_open(fich, nf90_nowrite, nid)
+    IF (ierr/=nf90_noerr) THEN
       WRITE (6, *) ' Pb d''ouverture du fichier ', fich
       WRITE (6, *) ' Le fichier limit ', fich, ' (avec 4 chiffres , pour'
@@ -105 +105 @@
     ! Bilan flux de chaleur au sol:
 
-    ierr = nf_inq_varid(nid, 'BILS', nvarid)
-    IF (ierr/=nf_noerr) THEN
+    ierr = nf90_inq_varid(nid, 'BILS', nvarid)
+    IF (ierr/=nf90_noerr) THEN
       CALL abort_physic('cond_surf', 'Le champ <BILS> est absent', 1)
     END IF
     PRINT *, 'debut,epais', debut, epais, 'jour,jourvrai', jour, jourvrai
     ierr = nf90_get_var(nid, nvarid,  lmt_bils_glo, debut, epais)
-    IF (ierr/=nf_noerr) THEN
+    IF (ierr/=nf90_noerr) THEN
       CALL abort_physic('condsurf', 'Lecture echouee pour <BILS>', 1)
     END IF
@@ -118 +118 @@
     ! Fermer le fichier:
 
-    ierr = nf_close(nid)
+    ierr = nf90_close(nid)
 
   END IF ! is_mpi_root==0

LMDZ6/branches/Amaury_dev/libf/phylmd/create_etat0_unstruct_mod.F90

@@ -23 +23 @@
   SUBROUTINE init_create_etat0_unstruct
   USE lmdz_xios
-  USE lmdz_netcdf, ONLY: NF90_NOWRITE,nf90_close,nf90_noerr,nf90_open
+  USE netcdf, ONLY: NF90_NOWRITE,nf90_close,nf90_noerr,nf90_open
   USE mod_phys_lmdz_para
   IMPLICIT NONE

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/1DUTILS.h

@@ -673 +673 @@
       USE logic_mod, ONLY: fxyhypb, ysinus
       USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn
-      USE lmdz_netcdf, ONLY:nf_open,nf_write,nf_noerr
+      USE netcdf, ONLY:nf90_open,nf90_write,nf90_noerr
 
       IMPLICIT NONE
@@ -820 +820 @@
       USE logic_mod, ONLY: fxyhypb, ysinus
       USE temps_mod, ONLY: annee_ref,day_end,day_ref,itau_dyn,itaufin
-      USE lmdz_netcdf, ONLY:nf_open,nf_write,nf_noerr
+      USE netcdf, ONLY:nf90_open,nf90_write,nf90_noerr
 
       IMPLICIT NONE
@@ -868 +868 @@
 
 !     modname = 'dyn1dredem'
-!     ierr = NF_OPEN(fichnom, NF_WRITE, nid)
-!     IF (ierr .NE. NF_NOERR) THEN
+!     ierr = nf90_open(fichnom, nf90_write, nid)
+!     IF (ierr .NE. nf90_noerr) THEN
 !        abort_message="Pb. d ouverture "//fichnom
 !        CALL abort_gcm('Modele 1D',abort_message,1)

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_amma_read.F90

@@ -1 +1 @@
 MODULE mod_1D_amma_read
-        USE lmdz_netcdf, ONLY: nf90_get_var,nf_open,nf_noerr,nf_open,nf_nowrite,&
-                nf_inq_dimid,nf_inq_dimlen,nf_strerror,nf_inq_varid
+        USE netcdf, ONLY: nf90_get_var,nf90_open,nf90_noerr,nf90_open,nf90_nowrite,&
+                nf90_inq_dimid,nf90_inquire_dimension,nf90_strerror,nf90_inq_varid
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !Declarations specifiques au cas AMMA
@@ -63 +63 @@
       fich_amma='amma.nc'
       print*,'fich_amma ',fich_amma
-      ierr = NF_OPEN(fich_amma,NF_NOWRITE,nid)
-      print*,'fich_amma,NF_NOWRITE,nid ',fich_amma,NF_NOWRITE,nid
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open(fich_amma,nf90_nowrite,nid)
+      print*,'fich_amma,nf90_nowrite,nid ',fich_amma,nf90_nowrite,nid
+      if (ierr/=nf90_noerr) then
          write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'lev',rid)
-      IF (ierr/=NF_NOERR) THEN
+      ierr=nf90_inq_dimid(nid,'lev',rid)
+      IF (ierr/=nf90_noerr) THEN
          print*, 'Oh probleme lecture dimension zz'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,nlev_amma)
+      ierr=nf90_inquire_dimension(nid,rid,len=nlev_amma)
       print*,'OK nid,rid,nlev_amma',nid,rid,nlev_amma
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'time',rid)
+      ierr=nf90_inq_dimid(nid,'time',rid)
       print*,'nid,rid',nid,rid
       nt_amma=0
-      IF (ierr/=NF_NOERR) THEN
+      IF (ierr/=nf90_noerr) THEN
         stop 'probleme lecture dimension sens'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,nt_amma)
+      ierr=nf90_inquire_dimension(nid,rid,len=nt_amma)
       print*,'nid,rid,nlev_amma',nid,rid,nt_amma
 
@@ -195 +195 @@
       integer var3didin(nbvar3d)
 
-       ierr=NF_INQ_VARID(nid,"zz",var3didin(1)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"zz",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lev'
          endif
 
 
-      ierr=NF_INQ_VARID(nid,"temp",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"temp",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'temp'
          endif
 
-      ierr=NF_INQ_VARID(nid,"qv",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"qv",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'qv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(5))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"dw",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dw",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dw'
          endif
 
-      ierr=NF_INQ_VARID(nid,"dt",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dt",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dt'
          endif
 
-      ierr=NF_INQ_VARID(nid,"dq",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dq",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dq'
          endif
       
-      ierr=NF_INQ_VARID(nid,"sens",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"sens",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'sens'
          endif
 
-      ierr=NF_INQ_VARID(nid,"flat",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"flat",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'flat'
          endif
 
-      ierr=NF_INQ_VARID(nid,"pp",var3didin(11))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"pp",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
       endif
 
@@ -265 +265 @@
  
          ierr = nf90_get_var(nid,var3didin(1),zz)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -272 +272 @@
 
          ierr = nf90_get_var(nid,var3didin(2),temp)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -279 +279 @@
 
          ierr = nf90_get_var(nid,var3didin(3),qv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -286 +286 @@
  
          ierr = nf90_get_var(nid,var3didin(4),u)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -293 +293 @@
 
          ierr = nf90_get_var(nid,var3didin(5),v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -300 +300 @@
 
          ierr = nf90_get_var(nid,var3didin(6),dw)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -307 +307 @@
 
          ierr = nf90_get_var(nid,var3didin(7),dt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -314 +314 @@
 
          ierr = nf90_get_var(nid,var3didin(8),dq)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -321 +321 @@
 
          ierr = nf90_get_var(nid,var3didin(9),sens)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -328 +328 @@
 
          ierr = nf90_get_var(nid,var3didin(10),flat)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -335 +335 @@
 
          ierr = nf90_get_var(nid,var3didin(11),pp)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_cases_read.F90

@@ -1 +1 @@
 MODULE mod_1D_cases_read
-  USE lmdz_netcdf, ONLY: nf_noerr,nf_strerror,nf_inq_varid,nf_inq_dimlen,nf_inq_dimid,&
-          nf_nowrite,nf_open,nf90_get_var
+  USE netcdf, ONLY: nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_inquire_dimension,nf90_inq_dimid,&
+          nf90_nowrite,nf90_open,nf90_get_var
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -93 +93 @@
       fich_cas='setup/cas.nc'
       print*,'fich_cas ',fich_cas
-      ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
-      print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-      if (ierr/=NF_NOERR) then
+      ierr = nf90_open(fich_cas,nf90_nowrite,nid)
+      print*,'fich_cas,nf90_nowrite,nid ',fich_cas,nf90_nowrite,nid
+      if (ierr/=nf90_noerr) then
          write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'lat',rid)
-      IF (ierr/=NF_NOERR) THEN
+      ierr=nf90_inq_dimid(nid,'lat',rid)
+      IF (ierr/=nf90_noerr) THEN
          print*, 'Oh probleme lecture dimension lat'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,ii)
+      ierr=nf90_inquire_dimension(nid,rid,len=ii)
       print*,'OK1 nid,rid,lat',nid,rid,ii
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'lon',rid)
-      IF (ierr/=NF_NOERR) THEN
+      ierr=nf90_inq_dimid(nid,'lon',rid)
+      IF (ierr/=nf90_noerr) THEN
          print*, 'Oh probleme lecture dimension lon'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,jj)
+      ierr=nf90_inquire_dimension(nid,rid,len=jj)
       print*,'OK2 nid,rid,lat',nid,rid,jj
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'lev',rid)
-      IF (ierr/=NF_NOERR) THEN
+      ierr=nf90_inq_dimid(nid,'lev',rid)
+      IF (ierr/=nf90_noerr) THEN
          print*, 'Oh probleme lecture dimension zz'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas)
+      ierr=nf90_inquire_dimension(nid,rid,len=nlev_cas)
       print*,'OK3 nid,rid,nlev_cas',nid,rid,nlev_cas
 !.......................................................................
-      ierr=NF_INQ_DIMID(nid,'time',rid)
+      ierr=nf90_inq_dimid(nid,'time',rid)
       print*,'nid,rid',nid,rid
       nt_cas=0
-      IF (ierr/=NF_NOERR) THEN
+      IF (ierr/=nf90_noerr) THEN
         stop 'probleme lecture dimension sens'
       ENDIF
-      ierr=NF_INQ_DIMLEN(nid,rid,nt_cas)
+      ierr=nf90_inquire_dimension(nid,rid,len=nt_cas)
       print*,'OK4 nid,rid,nt_cas',nid,rid,nt_cas
 
@@ -288 +288 @@
       integer var3didin(nbvar3d)
 
-       ierr=NF_INQ_VARID(nid,"zz",var3didin(1))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"zz",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lev'
          endif
 
-      ierr=NF_INQ_VARID(nid,"pp",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"pp",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'plev'
          endif
 
 
-      ierr=NF_INQ_VARID(nid,"temp",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"temp",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'temp'
          endif
 
-      ierr=NF_INQ_VARID(nid,"qv",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"qv",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'qv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"rh",var3didin(5))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"rh",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'rh'
          endif
 
-      ierr=NF_INQ_VARID(nid,"theta",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"theta",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'theta'
          endif
 
-      ierr=NF_INQ_VARID(nid,"rv",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"rv",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'rv'
          endif
 
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-       ierr=NF_INQ_VARID(nid,"ug",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"ug",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'ug'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vg",var3didin(11))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vg",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vg'
          endif
 
-      ierr=NF_INQ_VARID(nid,"w",var3didin(12))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"w",var3didin(12))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'w'
          endif
 
-      ierr=NF_INQ_VARID(nid,"advu",var3didin(13))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"advu",var3didin(13))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advu'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hu",var3didin(14))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hu",var3didin(14))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hu'
          endif
 
-       ierr=NF_INQ_VARID(nid,"vu",var3didin(15))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"vu",var3didin(15))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vu'
          endif
 
-       ierr=NF_INQ_VARID(nid,"advv",var3didin(16))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"advv",var3didin(16))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hv",var3didin(17))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hv",var3didin(17))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hv'
          endif
 
-       ierr=NF_INQ_VARID(nid,"vv",var3didin(18))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"vv",var3didin(18))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"advT",var3didin(19))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"advT",var3didin(19))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advT'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hT",var3didin(20))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hT",var3didin(20))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hT'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vT",var3didin(21))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vT",var3didin(21))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vT'
          endif
 
-      ierr=NF_INQ_VARID(nid,"advq",var3didin(22))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"advq",var3didin(22))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advq'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hq",var3didin(23))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hq",var3didin(23))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hq'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vq",var3didin(24))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vq",var3didin(24))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vq'
          endif
 
-      ierr=NF_INQ_VARID(nid,"advth",var3didin(25))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"advth",var3didin(25))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advth'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hth",var3didin(26))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hth",var3didin(26))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hth'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vth",var3didin(27))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vth",var3didin(27))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vth'
          endif
 
-      ierr=NF_INQ_VARID(nid,"advr",var3didin(28))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"advr",var3didin(28))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'advr'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hr",var3didin(29))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hr",var3didin(29))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hr'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vr",var3didin(30))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vr",var3didin(30))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vr'
          endif
 
-      ierr=NF_INQ_VARID(nid,"radT",var3didin(31))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"radT",var3didin(31))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'radT'
          endif
 
-      ierr=NF_INQ_VARID(nid,"sens",var3didin(32))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"sens",var3didin(32))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'sens'
          endif
 
-      ierr=NF_INQ_VARID(nid,"flat",var3didin(33))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"flat",var3didin(33))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'flat'
          endif
 
-      ierr=NF_INQ_VARID(nid,"ts",var3didin(34))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"ts",var3didin(34))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'ts'
          endif
 
-      ierr=NF_INQ_VARID(nid,"ustar",var3didin(35))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"ustar",var3didin(35))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'ustar'
          endif
 
-      ierr=NF_INQ_VARID(nid,"uw",var3didin(36))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"uw",var3didin(36))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'uw'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vw",var3didin(37))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vw",var3didin(37))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vw'
          endif
 
-      ierr=NF_INQ_VARID(nid,"q1",var3didin(38))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"q1",var3didin(38))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'q1'
          endif
 
-      ierr=NF_INQ_VARID(nid,"q2",var3didin(39))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"q2",var3didin(39))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'q2'
          endif
 
          ierr = nf90_get_var(nid,var3didin(1),zz)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -532 +532 @@
 
          ierr = nf90_get_var(nid,var3didin(2),pp)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -540 +540 @@
 
          ierr = nf90_get_var(nid,var3didin(3),temp)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -547 +547 @@
 
          ierr = nf90_get_var(nid,var3didin(4),qv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -554 +554 @@
 
          ierr = nf90_get_var(nid,var3didin(5),rh)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -561 +561 @@
 
          ierr = nf90_get_var(nid,var3didin(6),theta)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -568 +568 @@
 
          ierr = nf90_get_var(nid,var3didin(7),rv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -575 +575 @@
 
          ierr = nf90_get_var(nid,var3didin(8),u)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -582 +582 @@
 
          ierr = nf90_get_var(nid,var3didin(9),v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -589 +589 @@
 
          ierr = nf90_get_var(nid,var3didin(10),ug)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -596 +596 @@
 
          ierr = nf90_get_var(nid,var3didin(11),vg)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -603 +603 @@
 
          ierr = nf90_get_var(nid,var3didin(12),w)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -610 +610 @@
 
          ierr = nf90_get_var(nid,var3didin(13),du)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -617 +617 @@
 
          ierr = nf90_get_var(nid,var3didin(14),hu)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -624 +624 @@
 
          ierr = nf90_get_var(nid,var3didin(15),vu)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -631 +631 @@
 
          ierr = nf90_get_var(nid,var3didin(16),dv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -638 +638 @@
 
          ierr = nf90_get_var(nid,var3didin(17),hv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -645 +645 @@
 
          ierr = nf90_get_var(nid,var3didin(18),vv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -652 +652 @@
 
          ierr = nf90_get_var(nid,var3didin(19),dt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -659 +659 @@
 
          ierr = nf90_get_var(nid,var3didin(20),ht)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -666 +666 @@
 
          ierr = nf90_get_var(nid,var3didin(21),vt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -673 +673 @@
 
          ierr = nf90_get_var(nid,var3didin(22),dq)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -680 +680 @@
 
          ierr = nf90_get_var(nid,var3didin(23),hq)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -687 +687 @@
 
          ierr = nf90_get_var(nid,var3didin(24),vq)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -694 +694 @@
 
          ierr = nf90_get_var(nid,var3didin(25),dth)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -701 +701 @@
 
          ierr = nf90_get_var(nid,var3didin(26),hth)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -708 +708 @@
 
          ierr = nf90_get_var(nid,var3didin(27),vth)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -715 +715 @@
 
          ierr = nf90_get_var(nid,var3didin(28),dr)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -722 +722 @@
 
          ierr = nf90_get_var(nid,var3didin(29),hr)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -729 +729 @@
 
          ierr = nf90_get_var(nid,var3didin(30),vr)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -736 +736 @@
 
          ierr = nf90_get_var(nid,var3didin(31),dtrad)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -743 +743 @@
 
          ierr = nf90_get_var(nid,var3didin(32),sens)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -750 +750 @@
 
          ierr = nf90_get_var(nid,var3didin(33),flat)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -757 +757 @@
 
          ierr = nf90_get_var(nid,var3didin(34),ts)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -764 +764 @@
 
          ierr = nf90_get_var(nid,var3didin(35),ustar)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -771 +771 @@
 
          ierr = nf90_get_var(nid,var3didin(36),uw)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -778 +778 @@
 
          ierr = nf90_get_var(nid,var3didin(37),vw)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -785 +785 @@
 
          ierr = nf90_get_var(nid,var3didin(38),q1)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -792 +792 @@
 
          ierr = nf90_get_var(nid,var3didin(39),q2)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_cases_read2.F90

@@ -3 +3 @@
 !
 MODULE mod_1D_cases_read2
-  USE lmdz_netcdf, ONLY: nf90_get_var,nf_noerr,nf_inq_varid,nf_inq_dimlen,nf_strerror,nf_open,&
-          nf_nowrite,nf_inq_dimid
+  USE netcdf, ONLY: nf90_get_var,nf90_noerr,nf90_inq_varid,nf90_inquire_dimension,nf90_strerror,nf90_open,&
+          nf90_nowrite,nf90_inq_dimid
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   !Declarations specifiques au cas standard
@@ -87 +87 @@
     fich_cas='setup/cas.nc'
     print*,'fich_cas ',fich_cas
-    ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
-    print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr/=NF_NOERR) then
+    ierr = nf90_open(fich_cas,nf90_nowrite,nid)
+    print*,'fich_cas,nf90_nowrite,nid ',fich_cas,nf90_nowrite,nid
+    if (ierr/=nf90_noerr) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-       write(*,*) NF_STRERROR(ierr)
+       write(*,*) nf90_strerror(ierr)
        stop ""
     endif
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lat',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,ii)
+    ierr=nf90_inquire_dimension(nid,rid,len=ii)
     print*,'OK1 nid,rid,lat',nid,rid,ii
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lon',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,jj)
+    ierr=nf90_inquire_dimension(nid,rid,len=jj)
     print*,'OK2 nid,rid,lat',nid,rid,jj
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lev',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension zz'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nlev_cas)
     print*,'OK3 nid,rid,nlev_cas',nid,rid,nlev_cas
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'time',rid)
+    ierr=nf90_inq_dimid(nid,'time',rid)
     print*,'nid,rid',nid,rid
     nt_cas=0
-    IF (ierr/=NF_NOERR) THEN
+    IF (ierr/=nf90_noerr) THEN
        stop 'probleme lecture dimension sens'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nt_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nt_cas)
     print*,'OK4 nid,rid,nt_cas',nid,rid,nt_cas
 
@@ -196 +196 @@
     fich_cas='setup/cas.nc'
     print*,'fich_cas ',fich_cas
-    ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
-    print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr/=NF_NOERR) then
+    ierr = nf90_open(fich_cas,nf90_nowrite,nid)
+    print*,'fich_cas,nf90_nowrite,nid ',fich_cas,nf90_nowrite,nid
+    if (ierr/=nf90_noerr) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-       write(*,*) NF_STRERROR(ierr)
+       write(*,*) nf90_strerror(ierr)
        stop ""
     endif
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lat',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,ii)
+    ierr=nf90_inquire_dimension(nid,rid,len=ii)
     print*,'OK1 read2: nid,rid,lat',nid,rid,ii
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lon',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,jj)
+    ierr=nf90_inquire_dimension(nid,rid,len=jj)
     print*,'OK2 read2: nid,rid,lat',nid,rid,jj
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'nlev',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'nlev',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nlev_cas)
     print*,'OK3 read2: nid,rid,nlev_cas',nid,rid,nlev_cas
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'time',rid)
+    ierr=nf90_inq_dimid(nid,'time',rid)
     nt_cas=0
-    IF (ierr/=NF_NOERR) THEN
+    IF (ierr/=nf90_noerr) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nt_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nt_cas)
     print*,'OK4 read2: nid,rid,nt_cas',nid,rid,nt_cas
 
@@ -324 +324 @@
     fich_cas='cas.nc'
     print*,'fich_cas ',fich_cas
-    ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
-    print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr/=NF_NOERR) then
+    ierr = nf90_open(fich_cas,nf90_nowrite,nid)
+    print*,'fich_cas,nf90_nowrite,nid ',fich_cas,nf90_nowrite,nid
+    if (ierr/=nf90_noerr) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-       write(*,*) NF_STRERROR(ierr)
+       write(*,*) nf90_strerror(ierr)
        stop ""
     endif
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lat',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,ii)
+    ierr=nf90_inquire_dimension(nid,rid,len=ii)
     print*,'OK1 read2: nid,rid,lat',nid,rid,ii
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lon',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,jj)
+    ierr=nf90_inquire_dimension(nid,rid,len=jj)
     print*,'OK2 read2: nid,rid,lat',nid,rid,jj
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lev',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nlev_cas)
     print*,'OK3 read2: nid,rid,nlev_cas',nid,rid,nlev_cas
     IF ( .NOT. ( nlev_cas > 10 .AND. nlev_cas < 1000 )) THEN
@@ -357 +357 @@
     ENDIF
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'time',rid)
+    ierr=nf90_inq_dimid(nid,'time',rid)
     nt_cas=0
-    IF (ierr/=NF_NOERR) THEN
+    IF (ierr/=nf90_noerr) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nt_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nt_cas)
     print*,'OK4 read2: nid,rid,nt_cas',nid,rid,nt_cas
     ! Lecture de l'axe des temps
     print*,'LECTURE DU TEMPS'
-    ierr=NF_INQ_VARID(nid,'time',timeid)
-    if(ierr/=NF_NOERR) then
+    ierr=nf90_inq_varid(nid,'time',timeid)
+    if(ierr/=nf90_noerr) then
        print *,'Variable time manquante dans cas.nc:'
-       ierr=NF_NOERR
+       ierr=nf90_noerr
     else
        allocate(time_val(nt_cas))
        ierr = NF90_GET_VAR(nid,timeid,time_val)
-       if(ierr/=NF_NOERR) then
+       if(ierr/=nf90_noerr) then
           print *,'Pb a la lecture de time cas.nc: '
        endif
@@ -573 +573 @@
   enddo
   do i=1,nbvar3d
-     ierr=NF_INQ_VARID(nid,name_var(i),var3didin(i)) 
+     ierr=nf90_inq_varid(nid,name_var(i),var3didin(i))
      print *,'ierr=',i,ierr,name_var(i),var3didin(i)
-     if(ierr/=NF_NOERR) then
+     if(ierr/=nf90_noerr) then
         print *,'Variable manquante dans cas.nc:',name_var(i)
      endif
@@ -584 +584 @@
         ierr = NF90_GET_VAR(nid,var3didin(i),resul, count = [1, 1, nlevel, ntime])
         print *,'Dans read_cas2, on a lu ',ierr,var3didin(i),name_var(i)
-        if(ierr/=NF_NOERR) then
+        if(ierr/=nf90_noerr) then
            print *,'Pb a la lecture de cas.nc: ',name_var(i)
            stop "getvarup"
@@ -591 +591 @@
         print *,'Dans read_cas2, on a lu ',ierr,var3didin(i),name_var(i)
         ierr = NF90_GET_VAR(nid,var3didin(i),resul1, count = [1, 1, ntime])
-        if(ierr/=NF_NOERR) then
+        if(ierr/=nf90_noerr) then
            print *,'Pb a la lecture de cas.nc: ',name_var(i)
            stop "getvarup"
@@ -694 +694 @@
   !-----------------------------------------------------------------------
   do i=1,nbvar3d
-     ierr=NF_INQ_VARID(nid,name_var(i),var3didin(i)) 
-     if(ierr/=NF_NOERR) then
+     ierr=nf90_inq_varid(nid,name_var(i),var3didin(i))
+     if(ierr/=nf90_noerr) then
         print *,'Variable manquante dans cas.nc:',i,name_var(i)
-        ierr=NF_NOERR
+        ierr=nf90_noerr
         missing_var(i)=1
      else
@@ -704 +704 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),apbp, count = [1, 1, nlevel + 1])
            print *,'read2_cas(apbp), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -712 +712 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul, count = [1, 1, nlevel, ntime])
            print *,'read2_cas(resul), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -720 +720 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul2, count = [1, 1, ntime])
            print *,'read2_cas(resul2), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -728 +728 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul3)
            print *,'read2_cas(resul3), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -869 +869 @@
   print*,'ON EST LA'
   do i=1,nbvar3d
-     ierr=NF_INQ_VARID(nid,name_var(i),var3didin(i)) 
-     if(ierr/=NF_NOERR) then
+     ierr=nf90_inq_varid(nid,name_var(i),var3didin(i))
+     if(ierr/=nf90_noerr) then
         print *,'Variable manquante dans cas.nc:',i,name_var(i)
-        ierr=NF_NOERR
+        ierr=nf90_noerr
         missing_var(i)=1
      else
@@ -879 +879 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),apbp)
            print *,'read2_cas(apbp), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -887 +887 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul1)
            print *,'read2_cas(resul1), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -896 +896 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul)
            print *,'read2_cas(resul), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -905 +905 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul2)
            print *,'read2_cas(resul2), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"
@@ -914 +914 @@
            ierr = NF90_GET_VAR(nid,var3didin(i),resul3)
            print *,'read2_cas(resul3), on a lu ',i,name_var(i)
-           if(ierr/=NF_NOERR) then
+           if(ierr/=nf90_noerr) then
               print *,'Pb a la lecture de cas.nc: ',name_var(i)
               stop "getvarup"

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/mod_1D_cases_read_std.F90

@@ -3 +3 @@
 !
 MODULE mod_1D_cases_read_std
-  USE lmdz_netcdf, ONLY:nf_noerr,nf_inq_varid,nf_inq_dimid,nf_inq_dimlen,nf_open,nf_nowrite,&
-          nf_strerror,nf90_get_var
+  USE netcdf, ONLY:nf90_noerr,nf90_inq_varid,nf90_inq_dimid,nf90_inquire_dimension,nf90_open,nf90_nowrite,&
+          nf90_strerror,nf90_get_var
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -99 +99 @@
     fich_cas='cas.nc'
     print*,'fich_cas ',fich_cas
-    ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
-    print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr/=NF_NOERR) then
+    ierr = nf90_open(fich_cas,nf90_nowrite,nid)
+    print*,'fich_cas,nf90_nowrite,nid ',fich_cas,nf90_nowrite,nid
+    if (ierr/=nf90_noerr) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
-       write(*,*) NF_STRERROR(ierr)
+       write(*,*) nf90_strerror(ierr)
        stop ""
     endif
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lat',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,ii)
+    ierr=nf90_inquire_dimension(nid,rid,len=ii)
     print*,'OK1 read_SCM_cas: nid,rid,lat',nid,rid,ii
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lon',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,jj)
+    ierr=nf90_inquire_dimension(nid,rid,len=jj)
     print*,'OK2 read_SCM_cas: nid,rid,lat',nid,rid,jj
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr/=NF_NOERR) THEN
+    ierr=nf90_inq_dimid(nid,'lev',rid)
+    IF (ierr/=nf90_noerr) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nlev_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nlev_cas)
     print*,'OK3 read_SCM_cas: nid,rid,nlev_cas',nid,rid,nlev_cas
     IF ( .NOT. ( nlev_cas > 10 .AND. nlev_cas < 200000 )) THEN
@@ -132 +132 @@
     ENDIF
     !.......................................................................
-    ierr=NF_INQ_DIMID(nid,'time',rid)
+    ierr=nf90_inq_dimid(nid,'time',rid)
     nt_cas=0
-    IF (ierr/=NF_NOERR) THEN
+    IF (ierr/=nf90_noerr) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
-    ierr=NF_INQ_DIMLEN(nid,rid,nt_cas)
+    ierr=nf90_inquire_dimension(nid,rid,len=nt_cas)
     print*,'OK4 read_SCM_cas: nid,rid,nt_cas',nid,rid,nt_cas
     ! Lecture de l'axe des temps
     print*,'LECTURE DU TEMPS'
-    ierr=NF_INQ_VARID(nid,'time',timeid)
-    if(ierr/=NF_NOERR) then
+    ierr=nf90_inq_varid(nid,'time',timeid)
+    if(ierr/=nf90_noerr) then
        print *,'Variable time manquante dans cas.nc:'
-       ierr=NF_NOERR
+       ierr=nf90_noerr
     else
        allocate(time_val(nt_cas))
        ierr = NF90_GET_VAR(nid,timeid,time_val)
-       if(ierr/=NF_NOERR) then
+       if(ierr/=nf90_noerr) then
           print *,'A Pb a la lecture de time cas.nc: '
        endif
@@ -412 +412 @@
 
 
-    ierr=NF_INQ_VARID(nid,'ta',int_test)
-    if(ierr/=NF_NOERR) then
+    ierr=nf90_inq_varid(nid,'ta',int_test)
+    if(ierr/=nf90_noerr) then
        print*, '++++++++++++++++++++++++++++++'
        print*, 'variable ta missing in cas.nc '
@@ -429 +429 @@
     do i=1,nbvar3d
        missing_var(i)=0.
-       ierr=NF_INQ_VARID(nid,name_var(i),var3didin(i)) 
+       ierr=nf90_inq_varid(nid,name_var(i),var3didin(i))
        print*, 'name_var(i)', name_var(i), var3didin(i)
-       if(ierr/=NF_NOERR) then
+       if(ierr/=nf90_noerr) then
           print *,'Variable manquante dans cas.nc:',i,name_var(i)
-          ierr=NF_NOERR
+          ierr=nf90_noerr
           missing_var(i)=1
        else
@@ -456 +456 @@
              ierr = NF90_GET_VAR(nid,var3didin(i),apbp)
              print *,'read_SCM(apbp), on a lu ',i,name_var(i)
-             if(ierr/=NF_NOERR) then
+             if(ierr/=nf90_noerr) then
                 print *,'B Pb a la lecture de cas.nc: ',name_var(i)
                 stop "getvarup"
@@ -467 +467 @@
              ierr = NF90_GET_VAR(nid,var3didin(i),resul1)
              print *,'read_SCM(resul1), on a lu ',i,name_var(i)
-             if(ierr/=NF_NOERR) then
+             if(ierr/=nf90_noerr) then
                 print *,'C Pb a la lecture de cas.nc: ',name_var(i)
                 stop "getvarup"
@@ -480 +480 @@
              ierr = NF90_GET_VAR(nid,var3didin(i),resul)
              print *,'read_SCM(resul), on a lu ',i,name_var(i)
-             if(ierr/=NF_NOERR) then
+             if(ierr/=nf90_noerr) then
                 print *,'D Pb a la lecture de cas.nc: ',name_var(i)
                 stop "getvarup"
@@ -492 +492 @@
              ierr = NF90_GET_VAR(nid,var3didin(i),resul2)
              print *,'read_SCM(resul2), on a lu ',i,name_var(i)
-             if(ierr/=NF_NOERR) then
+             if(ierr/=nf90_noerr) then
                 print *,'E Pb a la lecture de cas.nc: ',name_var(i)
                 stop "getvarup"
@@ -504 +504 @@
              ierr = NF90_GET_VAR(nid,var3didin(i),resul3)
              print *,'read_SCM(resul3), on a lu ',i,name_var(i)
-             if(ierr/=NF_NOERR) then
+             if(ierr/=nf90_noerr) then
                 print *,'F Pb a la lecture de cas.nc: ',name_var(i)
                 stop "getvarup"

LMDZ6/branches/Amaury_dev/libf/phylmd/dyn1d/old_1DUTILS_read_interp.h

@@ -146 +146 @@
 !program reading forcings of the TWP-ICE experiment
 
-        use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
-            nf_inq_dimid,nf_inq_dimlen
+        use netcdf, ONLY: nf90_open,nf90_nowrite,nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_get_var,&
+            nf90_inq_dimid,nf90_inquire_dimension
 
 
@@ -177 +177 @@
       integer var3didin(nbvar3d)
 
-      ierr = NF_OPEN(fich_twpice,NF_NOWRITE,nid)
-      if (ierr.NE.NF_NOERR) then
+      ierr = nf90_open(fich_twpice,nf90_nowrite,nid)
+      if (ierr.NE.nf90_noerr) then
          write(*,*) 'ERROR: Pb opening forcings cdf file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 
-      ierr=NF_INQ_VARID(nid,"lat",var3didin(1))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"lat",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lat'
          endif
       
-       ierr=NF_INQ_VARID(nid,"lon",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"lon",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lon'
          endif
 
-       ierr=NF_INQ_VARID(nid,"alt",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"alt",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'alt'
          endif
 
-      ierr=NF_INQ_VARID(nid,"phis",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"phis",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'phis'
          endif
 
-      ierr=NF_INQ_VARID(nid,"T",var3didin(5))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"T",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'T'
          endif
 
-      ierr=NF_INQ_VARID(nid,"q",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"q",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'q'
          endif
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"omega",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"omega",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'omega'
          endif
 
-      ierr=NF_INQ_VARID(nid,"div",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"div",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'div'
          endif
 
-      ierr=NF_INQ_VARID(nid,"T_adv_h",var3didin(11))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"T_adv_h",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'T_adv_h'
          endif
 
-      ierr=NF_INQ_VARID(nid,"T_adv_v",var3didin(12))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"T_adv_v",var3didin(12))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'T_adv_v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"q_adv_h",var3didin(13))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"q_adv_h",var3didin(13))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'q_adv_h'
          endif
 
-      ierr=NF_INQ_VARID(nid,"q_adv_v",var3didin(14))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"q_adv_v",var3didin(14))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'q_adv_v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"s",var3didin(15))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"s",var3didin(15))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 's'
          endif
 
-      ierr=NF_INQ_VARID(nid,"s_adv_h",var3didin(16))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"s_adv_h",var3didin(16))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 's_adv_h'
          endif
     
-      ierr=NF_INQ_VARID(nid,"s_adv_v",var3didin(17))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"s_adv_v",var3didin(17))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 's_adv_v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"p_srf_aver",var3didin(18))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"p_srf_aver",var3didin(18))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'p_srf_aver'
          endif
 
-      ierr=NF_INQ_VARID(nid,"p_srf_center",var3didin(19))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"p_srf_center",var3didin(19))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'p_srf_center'
          endif
 
-      ierr=NF_INQ_VARID(nid,"T_srf",var3didin(20))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"T_srf",var3didin(20))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'T_srf'
          endif
@@ -315 +315 @@
           
          ierr = NF90_GET_VAR(nid,var3didin(1),lat)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -322 +322 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(2),lon)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -329 +329 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(3),alt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -336 +336 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(4),phis)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -343 +343 @@
           
          ierr = NF90_GET_VAR(nid,var3didin(5),T)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -350 +350 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(6),q)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -362 +362 @@
        enddo
          ierr = NF90_GET_VAR(nid,var3didin(7),u)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -369 +369 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(8),v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -376 +376 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(9),omega)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -389 +389 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(10),div)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -396 +396 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(11),T_adv_h)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -410 +410 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(12),T_adv_v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -423 +423 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(13),q_adv_h)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -437 +437 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(14),q_adv_v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -451 +451 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(15),s)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(16),s_adv_h)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(17),s_adv_v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(18),p_srf_aver)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(19),p_srf_center)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(20),T_srf)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -492 +492 @@
          subroutine catchaxis(nid,ttm,llm,time,lev,ierr)
 
-         use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
-            nf_inq_dimid,nf_inq_dimlen
+         use netcdf, ONLY: nf90_open,nf90_nowrite,nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_get_var,&
+            nf90_inq_dimid,nf90_inquire_dimension
 
          implicit none
@@ -507 +507 @@
 ! Control & lecture on dimensions
 ! ===============================
-         ierr=NF_INQ_DIMID(nid,"time",timedimin)
-         ierr=NF_INQ_VARID(nid,"time",timevar)
-         if (ierr.NE.NF_NOERR) then
+         ierr=nf90_inq_dimid(nid,"time",timedimin)
+         ierr=nf90_inq_varid(nid,"time",timevar)
+         if (ierr.NE.nf90_noerr) then
             write(*,*) 'ERROR: Field <time> is missing'
             stop ""  
          endif
-         ierr=NF_INQ_DIMLEN(nid,timedimin,timelen)
-
-         ierr=NF_INQ_DIMID(nid,"lev",levdimin)
-         ierr=NF_INQ_VARID(nid,"lev",levvar)
-         if (ierr.NE.NF_NOERR) then
+         ierr=nf90_inquire_dimension(nid,timedimin,len=timelen)
+
+         ierr=nf90_inq_dimid(nid,"lev",levdimin)
+         ierr=nf90_inq_varid(nid,"lev",levvar)
+         if (ierr.NE.nf90_noerr) then
              write(*,*) 'ERROR: Field <lev> is lacking'
              stop "" 
          endif
-         ierr=NF_INQ_DIMLEN(nid,levdimin,levlen)
+         ierr=nf90_inquire_dimension(nid,levdimin,len=levlen)
 
          if((timelen/=ttm).or.(levlen/=llm)) then
@@ -2170 +2170 @@
 
 
-      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
-            nf_inq_dimid,nf_inq_dimlen
+      use netcdf, ONLY: nf90_open,nf90_nowrite,nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_get_var,&
+            nf90_inq_dimid,nf90_inquire_dimension
       implicit none
 
@@ -2190 +2190 @@
       integer var3didin(nbvar3d)
 
-      ierr = NF_OPEN(fich_fire,NF_NOWRITE,nid)
-      if (ierr.NE.NF_NOERR) then
+      ierr = nf90_open(fich_fire,nf90_nowrite,nid)
+      if (ierr.NE.nf90_noerr) then
          write(*,*) 'ERROR: Pb opening forcings nc file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 
 
-       ierr=NF_INQ_VARID(nid,"zz",var3didin(1)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"zz",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lev'
          endif
 
 
-      ierr=NF_INQ_VARID(nid,"thetal",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"thetal",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'temp'
          endif
 
-      ierr=NF_INQ_VARID(nid,"qt",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"qt",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'qv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(5))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"tke",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"tke",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'tke'
          endif
 
-      ierr=NF_INQ_VARID(nid,"ugeo",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"ugeo",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'ug'
          endif
 
-      ierr=NF_INQ_VARID(nid,"vgeo",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"vgeo",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'vg'
          endif
       
-      ierr=NF_INQ_VARID(nid,"wls",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"wls",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'wls'
          endif
 
-      ierr=NF_INQ_VARID(nid,"dqtdx",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dqtdx",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dqtdx'
          endif
 
-      ierr=NF_INQ_VARID(nid,"dqtdy",var3didin(11))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dqtdy",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dqtdy'
       endif
 
-      ierr=NF_INQ_VARID(nid,"dqtdt",var3didin(12))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"dqtdt",var3didin(12))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dqtdt'
       endif
 
-      ierr=NF_INQ_VARID(nid,"thl_rad",var3didin(13))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"thl_rad",var3didin(13))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'thl_rad'
       endif
@@ -2280 +2280 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(1),zz)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2287 +2287 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(2),thl)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2294 +2294 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(3),qt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2301 +2301 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(4),u)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2308 +2308 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(5),v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2315 +2315 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(6),tke)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2322 +2322 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(7),ug)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2329 +2329 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(8),vg)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2336 +2336 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(9),wls)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2343 +2343 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(10),dqtdx)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2350 +2350 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(11),dqtdy)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2357 +2357 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(12),dqtdt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2364 +2364 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(13),thl_rad)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2380 +2380 @@
 !program reading initial profils and forcings of the Dice case study
 
-      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
-            nf_inq_dimid,nf_inq_dimlen
+      use netcdf, ONLY: nf90_open,nf90_nowrite,nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_get_var,&
+            nf90_inq_dimid,nf90_inquire_dimension
 
       implicit none
@@ -2407 +2407 @@
 
       pzero=100000.
-      ierr = NF_OPEN(fich_dice,NF_NOWRITE,nid)
-      if (ierr.NE.NF_NOERR) then
+      ierr = nf90_open(fich_dice,nf90_nowrite,nid)
+      if (ierr.NE.nf90_noerr) then
          write(*,*) 'ERROR: Pb opening forcings nc file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 
 
-       ierr=NF_INQ_VARID(nid,"height",var3didin(1)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"height",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'height'
          endif
 
-       ierr=NF_INQ_VARID(nid,"pf",var3didin(11)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"pf",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'pf'
          endif
 
-      ierr=NF_INQ_VARID(nid,"theta",var3didin(12))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"theta",var3didin(12))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'theta'
          endif
 
-      ierr=NF_INQ_VARID(nid,"qv",var3didin(13))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"qv",var3didin(13))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'qv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(14))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(14))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(15))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(15))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"o3mmr",var3didin(16))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"o3mmr",var3didin(16))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'o3'
          endif
 
-      ierr=NF_INQ_VARID(nid,"shf",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"shf",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'shf'
          endif
 
-      ierr=NF_INQ_VARID(nid,"lhf",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"lhf",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lhf'
          endif
       
-      ierr=NF_INQ_VARID(nid,"lwup",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"lwup",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'lwup'
          endif
 
-      ierr=NF_INQ_VARID(nid,"swup",var3didin(5))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"swup",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'dqtdx'
          endif
 
-      ierr=NF_INQ_VARID(nid,"Tg",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Tg",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Tg'
       endif
 
-      ierr=NF_INQ_VARID(nid,"ustar",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"ustar",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'ustar'
       endif
 
-      ierr=NF_INQ_VARID(nid,"psurf",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"psurf",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'psurf'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Ug",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Ug",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Ug'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Vg",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Vg",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Vg'
       endif
 
-      ierr=NF_INQ_VARID(nid,"hadvT",var3didin(17))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvT",var3didin(17))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvT'
       endif
 
-      ierr=NF_INQ_VARID(nid,"hadvq",var3didin(18))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvq",var3didin(18))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvq'
       endif
 
-      ierr=NF_INQ_VARID(nid,"hadvu",var3didin(19))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvu",var3didin(19))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvu'
       endif
 
-      ierr=NF_INQ_VARID(nid,"hadvv",var3didin(20))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvv",var3didin(20))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvv'
       endif
 
-      ierr=NF_INQ_VARID(nid,"w",var3didin(21))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"w",var3didin(21))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'w'
       endif
 
-      ierr=NF_INQ_VARID(nid,"omega",var3didin(22))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"omega",var3didin(22))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'omega'
       endif
@@ -2550 +2550 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(1),zz)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2557 +2557 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(11),pres)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2564 +2564 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(12),th)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2574 +2574 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(13),qv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2581 +2581 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(14),u)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2588 +2588 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(15),v)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2595 +2595 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(16),o3)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2602 +2602 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(2),shf)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2609 +2609 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(3),lhf)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2616 +2616 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(4),lwup)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2623 +2623 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(5),swup)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2630 +2630 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(6),tg)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2637 +2637 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(7),ustar)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2644 +2644 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(8),psurf)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2651 +2651 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(9),ug)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2658 +2658 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(10),vg)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2665 +2665 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(17),hadvt)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2672 +2672 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(18),hadvq)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2679 +2679 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(19),hadvu)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2686 +2686 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(20),hadvv)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2693 +2693 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(21),w)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2700 +2700 @@
 
          ierr = NF90_GET_VAR(nid,var3didin(22),omega)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
@@ -2714 +2714 @@
 !program reading initial profils and forcings of the Gabls4 case study
 
-      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
-            nf_inq_dimid,nf_inq_dimlen
+      use netcdf, ONLY: nf90_open,nf90_nowrite,nf90_noerr,nf90_strerror,nf90_inq_varid,nf90_get_var,&
+            nf90_inq_dimid,nf90_inquire_dimension
 
       implicit none
@@ -2743 +2743 @@
       integer var3didin(nbvar3d)
 
-      ierr = NF_OPEN(fich_gabls4,NF_NOWRITE,nid)
-      if (ierr.NE.NF_NOERR) then
+      ierr = nf90_open(fich_gabls4,nf90_nowrite,nid)
+      if (ierr.NE.nf90_noerr) then
          write(*,*) 'ERROR: Pb opening forcings nc file '
-         write(*,*) NF_STRERROR(ierr)
+         write(*,*) nf90_strerror(ierr)
          stop ""
       endif
 
 
-       ierr=NF_INQ_VARID(nid,"height",var3didin(1)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"height",var3didin(1))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'height'
          endif
 
-      ierr=NF_INQ_VARID(nid,"depth_sn",var3didin(2))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"depth_sn",var3didin(2))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'depth_sn'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Ug",var3didin(3))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Ug",var3didin(3))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Ug'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Vg",var3didin(4))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Vg",var3didin(4))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Vg'
       endif
-       ierr=NF_INQ_VARID(nid,"pf",var3didin(5)) 
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+       ierr=nf90_inq_varid(nid,"pf",var3didin(5))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'pf'
          endif
 
-      ierr=NF_INQ_VARID(nid,"theta",var3didin(6))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"theta",var3didin(6))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'theta'
          endif
 
-      ierr=NF_INQ_VARID(nid,"tempe",var3didin(7))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"tempe",var3didin(7))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'tempe'
          endif
 
-      ierr=NF_INQ_VARID(nid,"qv",var3didin(8))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"qv",var3didin(8))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'qv'
          endif
 
-      ierr=NF_INQ_VARID(nid,"u",var3didin(9))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"u",var3didin(9))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'u'
          endif
 
-      ierr=NF_INQ_VARID(nid,"v",var3didin(10))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"v",var3didin(10))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'v'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hadvT",var3didin(11))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvT",var3didin(11))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvt'
          endif
 
-      ierr=NF_INQ_VARID(nid,"hadvQ",var3didin(12))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"hadvQ",var3didin(12))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'hadvq'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Tsnow",var3didin(14))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Tsnow",var3didin(14))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'tsnow'
       endif
 
-      ierr=NF_INQ_VARID(nid,"snow_density",var3didin(15))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"snow_density",var3didin(15))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'snow_density'
       endif
 
-      ierr=NF_INQ_VARID(nid,"Tg",var3didin(16))
-         if(ierr/=NF_NOERR) then
-           write(*,*) NF_STRERROR(ierr)
+      ierr=nf90_inq_varid(nid,"Tg",var3didin(16))
+         if(ierr/=nf90_noerr) then
+           write(*,*) nf90_strerror(ierr)
            stop 'Tg'
       endif
@@ -2845 +2845 @@
  
          ierr = NF90_GET_VAR(nid,var3didin(1),zz_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(2),depth_sn)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(3),ug_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(4),vg_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(5),pf_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(6),th_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(7),t_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(8),qv_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(9),u_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(10),v_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(11),hadvt_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(12),hadvq_i)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(14),tsnow)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
  
          ierr = NF90_GET_VAR(nid,var3didin(15),snow_dens)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif
 
          ierr = NF90_GET_VAR(nid,var3didin(16),tg)
-         if(ierr/=NF_NOERR) then
-            write(*,*) NF_STRERROR(ierr)
+         if(ierr/=nf90_noerr) then
+            write(*,*) nf90_strerror(ierr)
             stop "getvarup"
          endif

LMDZ6/branches/Amaury_dev/libf/phylmd/grid_noro_m.F90

@@ -435 +435 @@
 ! Purpose: Read parameters usually determined with grid_noro from a file.
 !===============================================================================
-  USE lmdz_netcdf, ONLY: NF90_OPEN,  NF90_INQ_DIMID, NF90_INQUIRE_DIMENSION,        &
+  USE netcdf, ONLY: NF90_OPEN,  nf90_inq_dimid, NF90_INQUIRE_DIMENSION,        &
         NF90_NOERR, NF90_CLOSE, NF90_INQ_VARID, NF90_GET_VAR, NF90_STRERROR,   &
         NF90_NOWRITE
@@ -509 +509 @@
   REAL, ALLOCATABLE :: tmp(:)
   INTEGER :: n
-  CALL ncerr(NF90_INQ_DIMID(fid,dimd,did))
+  CALL ncerr(nf90_inq_dimid(fid,dimd,did))
   CALL ncerr(NF90_INQUIRE_DIMENSION(fid,did,len=n)); ALLOCATE(tmp(n))
   CALL ncerr(NF90_INQ_VARID(fid,dimd,did))

LMDZ6/branches/Amaury_dev/libf/phylmd/ice_sursat_mod.F90

@@ -96 +96 @@
   USE mod_phys_lmdz_para, ONLY: scatter, bcast
   USE print_control_mod, ONLY: lunout
-  USE lmdz_netcdf, ONLY: nf90_get_var, nf_inq_varid, nf_inq_dimlen, nf_inq_dimid, &
-      nf_open, nf_noerr
+  USE netcdf, ONLY: nf90_get_var, nf90_inq_varid, nf90_inquire_dimension, nf90_inq_dimid, &
+      nf90_open, nf90_noerr
 
   IMPLICIT NONE
@@ -134 +134 @@
   IF (is_mpi_root .AND. is_omp_root) THEN
       !
-      iret = nf_open('aircraft_phy.nc', 0, ncida)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to open aircraft_phy.nc file',1)
+      iret = nf90_open('aircraft_phy.nc', 0, ncida)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to open aircraft_phy.nc file',1)
       ! ... Get lengths
-      iret = nf_inq_dimid(ncida, 'time', varid)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get time dimid in aircraft_phy.nc file',1)
-      iret = nf_inq_dimlen(ncida, varid, ntimea)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get time dimlen aircraft_phy.nc file',1)
-      iret = nf_inq_dimid(ncida, 'vector', varid)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get vector dimid aircraft_phy.nc file',1)
-      iret = nf_inq_dimlen(ncida, varid, klona)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get vector dimlen aircraft_phy.nc file',1)
-      iret = nf_inq_dimid(ncida, 'lev', varid)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get lev dimid aircraft_phy.nc file',1)
-      iret = nf_inq_dimlen(ncida, varid, nleva)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get lev dimlen aircraft_phy.nc file',1)
+      iret = nf90_inq_dimid(ncida, 'time', varid)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get time dimid in aircraft_phy.nc file',1)
+      iret = nf90_inquire_dimension(ncida, varid,len= ntimea)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get time dimlen aircraft_phy.nc file',1)
+      iret = nf90_inq_dimid(ncida, 'vector', varid)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get vector dimid aircraft_phy.nc file',1)
+      iret = nf90_inquire_dimension(ncida, varid,len= klona)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get vector dimlen aircraft_phy.nc file',1)
+      iret = nf90_inq_dimid(ncida, 'lev', varid)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get lev dimid aircraft_phy.nc file',1)
+      iret = nf90_inquire_dimension(ncida, varid,len= nleva)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get lev dimlen aircraft_phy.nc file',1)
       !
       IF ( klona /= klon_glo ) THEN
@@ -167 +167 @@
       IF (error /= 0) CALL abort_physic(modname,'problem to allocate ph2o_airpl_glo',1)
       !
-      iret = nf_inq_varid(ncida, 'lev', varid)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get lev dimid aircraft_phy.nc file',1)
+      iret = nf90_inq_varid(ncida, 'lev', varid)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get lev dimid aircraft_phy.nc file',1)
       iret = nf90_get_var(ncida, varid, zmida)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to read zmida file',1)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to read zmida file',1)
       !
-      iret = nf_inq_varid(ncida, 'emi_co2_aircraft', varid)  !--CO2 as a proxy for m flown - 
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get emi_distance dimid aircraft_phy.nc file',1)
+      iret = nf90_inq_varid(ncida, 'emi_co2_aircraft', varid)  !--CO2 as a proxy for m flown -
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get emi_distance dimid aircraft_phy.nc file',1)
       iret = nf90_get_var(ncida, varid, pkm_airpl_glo)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to read pkm_airpl file',1)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to read pkm_airpl file',1)
       !
-      iret = nf_inq_varid(ncida, 'emi_h2o_aircraft', varid)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to get emi_h2o_aircraft dimid aircraft_phy.nc file',1)
+      iret = nf90_inq_varid(ncida, 'emi_h2o_aircraft', varid)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to get emi_h2o_aircraft dimid aircraft_phy.nc file',1)
       iret = nf90_get_var(ncida, varid, ph2o_airpl_glo)
-      IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to read ph2o_airpl file',1)
+      IF (iret /= nf90_noerr) CALL abort_physic(modname,'problem to read ph2o_airpl file',1)
       ! 
      ENDIF    !--is_mpi_root and is_omp_root

LMDZ6/branches/Amaury_dev/libf/phylmd/interfoce_lim.F90

@@ -10 +10 @@
   USE mod_phys_lmdz_para
   USE indice_sol_mod
-  USE lmdz_netcdf, ONLY: nf90_get_var,nf_close,nf_noerr,nf_inq_varid,nf_open,nf_nowrite
+  USE netcdf, ONLY: nf90_get_var,nf90_close,nf90_noerr,nf90_inq_varid,nf90_open,nf90_nowrite
   
   IMPLICIT NONE
@@ -114 +114 @@
 
         fich = TRIM(fich)
-        ierr = NF_OPEN (fich, NF_NOWRITE,nid)
-        IF (ierr/=NF_NOERR) THEN
+        ierr = nf90_open (fich, nf90_nowrite,nid)
+        IF (ierr/=nf90_noerr) THEN
            abort_message = 'Pb d''ouverture du fichier de conditions aux limites'
            CALL abort_physic(modname,abort_message,1)
@@ -131 +131 @@
            ! Fraction "ocean" 
            !
-           ierr = NF_INQ_VARID(nid, 'FOCE', nvarid)
-           IF (ierr /= NF_NOERR) THEN
+           ierr = nf90_inq_varid(nid, 'FOCE', nvarid)
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Le champ <FOCE> est absent'
               CALL abort_physic(modname,abort_message,1)
            ENDIF
            ierr = nf90_get_var(nid,nvarid,pct_tmp(:,is_oce),start,epais)
-           IF (ierr /= NF_NOERR) THEN
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Lecture echouee pour <FOCE>'
               CALL abort_physic(modname,abort_message,1)
@@ -144 +144 @@
            ! Fraction "glace de mer" 
            !
-           ierr = NF_INQ_VARID(nid, 'FSIC', nvarid)
-           IF (ierr /= NF_NOERR) THEN
+           ierr = nf90_inq_varid(nid, 'FSIC', nvarid)
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Le champ <FSIC> est absent'
               CALL abort_physic(modname,abort_message,1)
            ENDIF
            ierr = nf90_get_var(nid,nvarid,pct_tmp(:,is_sic),start,epais)
-           IF (ierr /= NF_NOERR) THEN
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Lecture echouee pour <FSIC>'
               CALL abort_physic(modname,abort_message,1)
@@ -157 +157 @@
            ! Fraction "terre" 
            !
-           ierr = NF_INQ_VARID(nid, 'FTER', nvarid)
-           IF (ierr /= NF_NOERR) THEN
+           ierr = nf90_inq_varid(nid, 'FTER', nvarid)
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Le champ <FTER> est absent'
               CALL abort_physic(modname,abort_message,1)
            ENDIF
            ierr = nf90_get_var(nid,nvarid,pct_tmp(:,is_ter),start,epais)
-           IF (ierr /= NF_NOERR) THEN
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Lecture echouee pour <FTER>'
               CALL abort_physic(modname,abort_message,1)
@@ -170 +170 @@
            ! Fraction "glacier terre" 
            !
-           ierr = NF_INQ_VARID(nid, 'FLIC', nvarid)
-           IF (ierr /= NF_NOERR) THEN
+           ierr = nf90_inq_varid(nid, 'FLIC', nvarid)
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Le champ <FLIC> est absent'
               CALL abort_physic(modname,abort_message,1)
            ENDIF
            ierr = nf90_get_var(nid,nvarid,pct_tmp(:,is_lic),start,epais)
-           IF (ierr /= NF_NOERR) THEN
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Lecture echouee pour <FLIC>'
               CALL abort_physic(modname,abort_message,1)
@@ -183 +183 @@
         ELSE  ! on en est toujours a rnatur
            ! 
-           ierr = NF_INQ_VARID(nid, 'NAT', nvarid)
-           IF (ierr /= NF_NOERR) THEN
+           ierr = nf90_inq_varid(nid, 'NAT', nvarid)
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Le champ <NAT> est absent'
               CALL abort_physic(modname,abort_message,1)
            ENDIF
            ierr = nf90_get_var(nid,nvarid,nat_lu,start,epais)
-           IF (ierr /= NF_NOERR) THEN
+           IF (ierr /= nf90_noerr) THEN
               abort_message = 'Lecture echouee pour <NAT>'
               CALL abort_physic(modname,abort_message,1)
@@ -213 +213 @@
 ! Lecture SST
 !
-        ierr = NF_INQ_VARID(nid, 'SST', nvarid)
-        IF (ierr /= NF_NOERR) THEN
+        ierr = nf90_inq_varid(nid, 'SST', nvarid)
+        IF (ierr /= nf90_noerr) THEN
            abort_message = 'Le champ <SST> est absent'
            CALL abort_physic(modname,abort_message,1)
         ENDIF
         ierr = nf90_get_var(nid,nvarid,sst_lu,start,epais)
-        IF (ierr /= NF_NOERR) THEN
+        IF (ierr /= nf90_noerr) THEN
            abort_message = 'Lecture echouee pour <SST>'
            CALL abort_physic(modname,abort_message,1)
@@ -228 +228 @@
 !
 !****************************************************************************************
-        ierr = NF_CLOSE(nid)
+        ierr = nf90_close(nid)
      ENDIF ! is_mpi_root
 

LMDZ6/branches/Amaury_dev/libf/phylmd/iostart.F90

@@ -30 +30 @@
 
   SUBROUTINE Open_startphy(filename)
-  USE lmdz_netcdf, ONLY: nf90_nowrite, nf90_noerr,nf90_open
+  USE netcdf, ONLY: nf90_nowrite, nf90_noerr,nf90_open
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -48 +48 @@
 
   SUBROUTINE Close_startphy
-  USE lmdz_netcdf, ONLY: nf90_close
+  USE netcdf, ONLY: nf90_close
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -61 +61 @@
 
   FUNCTION Inquire_Field(Field_name)
-  USE lmdz_netcdf, ONLY: nf90_noerr,nf90_inq_varid
+  USE netcdf, ONLY: nf90_noerr,nf90_inq_varid
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -115 +115 @@
   
   SUBROUTINE Get_field_rgen(field_name,field,field_size,found)
-  USE lmdz_netcdf, ONLY: nf90_inq_varid,nf90_noerr,nf90_get_var
+  USE netcdf, ONLY: nf90_inq_varid,nf90_noerr,nf90_get_var
   USE dimphy
   USE geometry_mod
@@ -251 +251 @@
 
   SUBROUTINE Get_var_rgen(var_name,var,var_size,found)
-  USE lmdz_netcdf, ONLY: nf90_noerr,nf90_get_var,nf90_inq_varid
+  USE netcdf, ONLY: nf90_noerr,nf90_get_var,nf90_inq_varid
   USE dimphy
   USE mod_grid_phy_lmdz
@@ -301 +301 @@
 
   SUBROUTINE open_restartphy(filename)
-  USE lmdz_netcdf, ONLY: nf90_create,nf90_clobber,nf90_64bit_offset,nf90_noerr,nf90_strerror,&
+  USE netcdf, ONLY: nf90_create,nf90_clobber,nf90_64bit_offset,nf90_noerr,nf90_strerror,&
           nf90_global,nf90_put_att,nf90_def_dim
   USE mod_phys_lmdz_para, ONLY: is_master
@@ -333 +333 @@
   
   SUBROUTINE enddef_restartphy
-  USE lmdz_netcdf, ONLY: nf90_enddef
+  USE netcdf, ONLY: nf90_enddef
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -343 +343 @@
 
   SUBROUTINE close_restartphy
-  USE lmdz_netcdf, ONLY: nf90_close
+  USE netcdf, ONLY: nf90_close
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -386 +386 @@
   
   SUBROUTINE put_field_rgen(pass, field_name,title,field,field_size)
-  USE lmdz_netcdf, ONLY: nf90_def_var,nf90_format,nf90_put_att,nf90_inq_varid,nf90_put_var
+  USE netcdf, ONLY: nf90_def_var,nf90_put_att,nf90_inq_varid,nf90_put_var
+  USE lmdz_netcdf_format, ONLY: nf90_format
   USE dimphy
   USE geometry_mod
@@ -425 +426 @@
          
 !      ierr = NF90_REDEF (nid_restart)
-      ierr = NF90_DEF_VAR (nid_restart, field_name, NF90_FORMAT,(/ idim /),nvarid)
+      ierr = NF90_DEF_VAR (nid_restart, field_name, nf90_format,(/ idim /),nvarid)
       IF (LEN_TRIM(title) > 0) ierr = NF90_PUT_ATT (nid_restart,nvarid,"title", title)
 !      ierr = NF90_ENDDEF(nid_restart)
@@ -509 +510 @@
 
   SUBROUTINE put_var_rgen(pass, var_name,title,var,var_size)
-  USE lmdz_netcdf, ONLY: nf90_format,nf90_def_var,nf90_put_var,nf90_inq_varid,nf90_put_att
+  USE netcdf, ONLY: nf90_def_var,nf90_put_var,nf90_inq_varid,nf90_put_att
+  USE lmdz_netcdf_format, ONLY: nf90_format
   USE dimphy
   USE mod_phys_lmdz_para
@@ -534 +536 @@
 !      ierr = NF90_REDEF (nid_restart)
 
-        ierr = NF90_DEF_VAR (nid_restart, var_name, NF90_FORMAT,(/ idim1 /),nvarid)
+        ierr = NF90_DEF_VAR (nid_restart, var_name, nf90_format,(/ idim1 /),nvarid)
         IF (LEN_TRIM(title)>0) ierr = NF90_PUT_ATT (nid_restart,nvarid,"title", title)
 !      ierr = NF90_ENDDEF(nid_restart)

LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ecrit.F90

@@ -22 +22 @@
 !=================================================================
  
-      USE lmdz_netcdf, ONLY: nf90_put_var,nf_inq_varid,nf_enddef,nf_redef,nf_sync,nf_noerr,&
-              nf_float,nf_def_var
+      USE netcdf, ONLY: nf90_put_var,nf90_inq_varid,nf90_enddef,nf90_redef,nf90_sync,nf90_noerr,&
+              nf90_float,nf90_def_var
       implicit none
 
@@ -103 +103 @@
            ! Get NetCDF ID of 'time' variable
 
-           ierr=NF_SYNC(nid)
+           ierr=nf90_sync(nid)
 
-           ierr= NF_INQ_VARID(nid,"time",varid)
+           ierr= nf90_inq_varid(nid,"time",varid)
            ! Write (append) the new date to the 'time' array
 
@@ -114 +114 @@
 !        print*,'IOTD Date ,varid,nid,ntime,date',varid,nid,ntime,date
 
-           if (ierr/=NF_NOERR) then
+           if (ierr/=nf90_noerr) then
               write(*,*) "***** PUT_VAR matter in writediagfi_nc"
               write(*,*) "***** with time"
@@ -161 +161 @@
 
       if (ntime==1) then
-          ierr = NF_REDEF (nid)
-          ierr = NF_DEF_VAR(nid,nom,NF_FLOAT,ndim,dim_cc,varid)
+          ierr = nf90_redef (nid)
+          ierr = nf90_def_var(nid,nom,nf90_float,dim_cc,varid)
           !print*,'DEF ',nom,nid,varid
-          ierr = NF_ENDDEF(nid)
+          ierr = nf90_enddef(nid)
       else
-         ierr= NF_INQ_VARID(nid,nom,varid)
+         ierr= nf90_inq_varid(nid,nom,varid)
           !print*,'INQ ',nom,nid,varid
 ! Commandes pour recuperer automatiquement les coordonnees
-!             ierr= NF_INQ_DIMID(nid,"longitude",id(1))
+!             ierr= nf90_inq_dimid(nid,"longitude",id(1))
       endif
 
@@ -175 +175 @@
       ierr= NF90_PUT_VAR(nid,varid,zx,corner,edges)
 
-      if (ierr/=NF_NOERR) then
+      if (ierr/=nf90_noerr) then
            write(*,*) "***** PUT_VAR problem in writediagfi"
            write(*,*) "***** with ",nom

LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_fin.F90

@@ -1 +1 @@
 SUBROUTINE iotd_fin
-  USE lmdz_netcdf, ONLY : nf_close
+  USE netcdf, ONLY : nf90_close
 
   IMPLICIT NONE
@@ -21 +21 @@
   !   ----------
 
-  ierr = NF_close(nid)
+  ierr = nf90_close(nid)
 
 END

LMDZ6/branches/Amaury_dev/libf/phylmd/iotd_ini.F90

@@ -1 +1 @@
       SUBROUTINE iotd_ini(fichnom,iim,jjm,llm,prlon,prlat,pcoordv,jour0,mois0,an0,t0,timestep,calendrier)
-            USE lmdz_netcdf, ONLY: nf_enddef,nf_put_att_text,nf_float,nf_def_var,nf_redef,&
-                    nf_global,nf_def_dim,nf_create,nf_clobber,nf_unlimited,nf90_put_var
+            USE netcdf, ONLY: nf90_enddef,nf90_put_att,nf90_float,nf90_def_var,nf90_redef,&
+                    nf90_global,nf90_def_dim,nf90_create,nf90_clobber,nf90_unlimited,nf90_put_var
       IMPLICIT NONE
 
@@ -91 +91 @@
     
       ! Create the NetCDF file
-      ierr=NF_CREATE(fichnom, NF_CLOBBER, nid)
-      ierr=NF_DEF_DIM(nid, "lon", iim, dim_coord(1))
-      ierr=NF_DEF_DIM(nid, "lat", jjm, dim_coord(2))
-      ierr=NF_DEF_DIM(nid, "lev", llm, dim_coord(3))
-      ierr=NF_DEF_DIM(nid,"time",NF_UNLIMITED,dim_coord(4))
-      ierr = NF_PUT_ATT_TEXT(nid,NF_GLOBAL,'Conventions',6,"CF-1.1")
-      !ierr = NF_PUT_ATT_TEXT(nid,NF_GLOBAL,'file_name',TRIM(fname))
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_create(fichnom, nf90_clobber, nid)
+      ierr=nf90_def_dim(nid, "lon", iim, dim_coord(1))
+      ierr=nf90_def_dim(nid, "lat", jjm, dim_coord(2))
+      ierr=nf90_def_dim(nid, "lev", llm, dim_coord(3))
+      ierr=nf90_def_dim(nid,"time",nf90_unlimited,dim_coord(4))
+      ierr = nf90_put_att(nid,nf90_global,'Conventions',"CF-1.1")
+      !ierr = nf90_put_att(nid,nf90_global,'file_name',TRIM(fname))
+      ierr=nf90_enddef(nid)
 
       ! Switch out of NetCDF Define mode
 
 
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_enddef(nid)
 !
 !  Contol parameters for this run
 ! ---- longitude -----------
 
-      ierr=NF_REDEF(nid)
-      ierr=NF_DEF_VAR(nid,"lon", NF_FLOAT, 1, dim_coord(1),nvarid)
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'axis',1,'X')
-      ierr=NF_PUT_ATT_TEXT(nid,nvarid,'units',12,"degrees_east")
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_redef(nid)
+      ierr=nf90_def_var(nid,"lon", nf90_float, dim_coord(1),nvarid)
+      ierr = nf90_put_att(nid,nvarid,'axis','X')
+      ierr=nf90_put_att(nid,nvarid,'units',"degrees_east")
+      ierr=nf90_enddef(nid)
       ierr=nf90_put_var(nid,nvarid,rlon)
        print*,ierr
 
 ! ---- latitude ------------
-      ierr=NF_REDEF(nid)
-      ierr=NF_DEF_VAR(nid, "lat", NF_FLOAT, 1, dim_coord(2),nvarid)
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'axis',1,'Y')
-      ierr=NF_PUT_ATT_TEXT(nid,nvarid,'units',13,"degrees_north")
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_redef(nid)
+      ierr=nf90_def_var(nid, "lat", nf90_float, dim_coord(2),nvarid)
+      ierr = nf90_put_att(nid,nvarid,'axis','Y')
+      ierr=nf90_put_att(nid,nvarid,'units',"degrees_north")
+      ierr=nf90_enddef(nid)
       ierr=nf90_put_var(nid,nvarid,rlat)
 !
 ! ---- vertical ------------
-      ierr=NF_REDEF(nid)
-      ierr=NF_DEF_VAR(nid, "lev", NF_FLOAT, 1,dim_coord(3),nvarid)
-      ierr=NF_PUT_ATT_TEXT(nid,nvarid,"long_name",10,"vert level")
+      ierr=nf90_redef(nid)
+      ierr=nf90_def_var(nid, "lev", nf90_float,dim_coord(3),nvarid)
+      ierr=nf90_put_att(nid,nvarid,"long_name","vert level")
       if ( coordv(2)>coordv(1) ) then
-         ierr=NF_PUT_ATT_TEXT(nid,nvarid,"long_name",10,"pseudo-alt")
-         ierr=NF_PUT_ATT_TEXT(nid,nvarid,'positive',2,"up")
+         ierr=nf90_put_att(nid,nvarid,"long_name","pseudo-alt")
+         ierr=nf90_put_att(nid,nvarid,'positive',"up")
       else
-         ierr=NF_PUT_ATT_TEXT(nid,nvarid,"long_name",8,"pressure")
-         ierr = NF_PUT_ATT_TEXT (nid,nvarid,'positive',4,"down")
+         ierr=nf90_put_att(nid,nvarid,"long_name","pressure")
+         ierr = nf90_put_att(nid,nvarid,'positive',"down")
       endif
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_enddef(nid)
       ierr=nf90_put_var(nid,nvarid,coordv)
 
 !
 ! ---- time ----------------
-      ierr=NF_REDEF(nid)
+      ierr=nf90_redef(nid)
       ! Define the 'time' variable
-      ierr=NF_DEF_VAR(nid, "time", NF_FLOAT, 1, dim_coord(4),nvarid)
+      ierr=nf90_def_var(nid, "time", nf90_float, dim_coord(4),nvarid)
 !     ! Add attributes
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'axis',1,'T')
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'standard_name',4,'time')
+      ierr = nf90_put_att(nid,nvarid,'axis','T')
+      ierr = nf90_put_att(nid,nvarid,'standard_name','time')
       WRITE(date0,'(i4.4,"-",i2.2,"-",i2.2)') an0,mois0,jour0
-      ierr=NF_PUT_ATT_TEXT(nid, nvarid,'units',33, &
+      ierr=nf90_put_att(nid, nvarid,'units', &
    "seconds since "//date0//" 00:00:00")
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'calendar',9,calendrier)
-      !ierr = NF_PUT_ATT_TEXT(nid,nvarid,'calendar',4,'360d')
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'title',4,'Time')
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'long_name',9,'Time axis')
+      ierr = nf90_put_att(nid,nvarid,'calendar',calendrier)
+      !ierr = nf90_put_att(nid,nvarid,'calendar','360d')
+      ierr = nf90_put_att(nid,nvarid,'title','Time')
+      ierr = nf90_put_att(nid,nvarid,'long_name','Time axis')
       WRITE(date0b,'(i4.4,"-",a3,"-",i2.2)') an0,cmois(mois0),jour0
-      ierr = NF_PUT_ATT_TEXT(nid,nvarid,'time_origin',20, &
+      ierr = nf90_put_att(nid,nvarid,'time_origin', &
           date0b//' 00:00:00')
-      ierr=NF_ENDDEF(nid)
+      ierr=nf90_enddef(nid)
 
 

LMDZ6/branches/Amaury_dev/libf/phylmd/limit_read_mod.F90

@@ -165 +165 @@
     USE mod_phys_lmdz_para
     USE surface_data, ONLY : type_ocean, ok_veget
-    USE lmdz_netcdf, ONLY:nf90_get_var,nf90_inq_varid,nf90_close,nf90_inquire_dimension,&
+    USE netcdf, ONLY:nf90_get_var,nf90_inq_varid,nf90_close,nf90_inquire_dimension,&
             nf90_inquire,nf90_get_att,nf90_inq_dimid,nf90_nowrite,nf90_noerr,nf90_open
     USE indice_sol_mod
@@ -249 +249 @@
           !--- ERROR IF FILE RECORDS NUMBER IS NOT EQUAL TO EXPECTED NUMBER OF DAYS          
           IF (grid_type==unstructured) THEN
-            ierr=NF90_INQ_DIMID(nid,"time_year",ndimid)
+            ierr=nf90_inq_dimid(nid,"time_year",ndimid)
           ELSE
             ierr=NF90_INQUIRE(nid, UnlimitedDimID=ndimid)
@@ -260 +260 @@
           !--- ERROR IF FILES AND LMDZ HORIZONTAL RESOLUTIONS DO NOT MATCH
           IF (grid_type==unstructured) THEN
-            ierr=NF90_INQ_DIMID(nid, 'cell', ndimid)
+            ierr=nf90_inq_dimid(nid, 'cell', ndimid)
           ELSE
-            ierr=NF90_INQ_DIMID(nid, 'points_physiques', ndimid)
+            ierr=nf90_inq_dimid(nid, 'points_physiques', ndimid)
           ENDIF
           ierr=NF90_INQUIRE_DIMENSION(nid, ndimid, len=nn)

LMDZ6/branches/Amaury_dev/libf/phylmd/limit_slab.F90

@@ -6 +6 @@
   USE mod_grid_phy_lmdz, ONLY: klon_glo
   USE mod_phys_lmdz_para
-  USE lmdz_netcdf, ONLY: nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,nf90_noerr,nf90_open
+  USE netcdf, ONLY: nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,nf90_noerr,nf90_open
   USE indice_sol_mod
   USE ocean_slab_mod, ONLY: nslay

LMDZ6/branches/Amaury_dev/libf/phylmd/mo_simple_plumes.F90

@@ -24 +24 @@
 MODULE MO_SIMPLE_PLUMES
 
-    USE lmdz_netcdf, ONLY:nf90_get_var,nf90_close,nf90_inq_varid,nf90_inq_dimid,&
+    USE netcdf, ONLY:nf90_get_var,nf90_close,nf90_inq_varid,nf90_inq_dimid,&
             nf90_inquire_dimension,nf90_noerr,nf90_nowrite,nf90_open
 

LMDZ6/branches/Amaury_dev/libf/phylmd/moy_undefSTD.F90

@@ -3 +3 @@
 
 SUBROUTINE moy_undefstd(itap, itapm1)
-  USE lmdz_netcdf, ONLY: nf90_fill_real
+  USE netcdf, ONLY: nf90_fill_real
   USE dimphy
 #ifdef CPP_IOIPSL 

LMDZ6/branches/Amaury_dev/libf/phylmd/open_climoz_m.F90

@@ -13 +13 @@
 !-------------------------------------------------------------------------------
   USE netcdf95, ONLY: nf95_open, nf95_close, nf95_gw_var, nf95_inq_varid
-  USE lmdz_netcdf,   ONLY: nf90_nowrite
+  USE netcdf,   ONLY: nf90_nowrite
   USE mod_phys_lmdz_mpi_data,      ONLY: is_mpi_root
   USE mod_phys_lmdz_mpi_transfert, ONLY: bcast_mpi

LMDZ6/branches/Amaury_dev/libf/phylmd/pbl_surface_mod.F90

@@ -415 +415 @@
     use lmdz_blowing_snow_ini, only : zeta_bs
     USE wxios, ONLY: missing_val_xios => missing_val, using_xios
-    USE lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
+    USE netcdf, only: missing_val_netcdf => nf90_fill_real
 
      

LMDZ6/branches/Amaury_dev/libf/phylmd/phyaqua_mod.F90

@@ -570 +570 @@
     USE mod_phys_lmdz_transfert_para, ONLY: gather
     USE phys_cal_mod, ONLY: year_len
-    use lmdz_netcdf, ONLY: nf90_def_var, nf90_put_var, nf90_get_var, nf_strerror, nf_close, &
-            nf_enddef, nf_put_att_text, nf_unlimited, nf_noerr, nf_global, nf_clobber, &
-            nf_64bit_offset, nf90_format, nf_def_dim, nf_create
+    USE netcdf, ONLY: nf90_def_var, nf90_put_var, nf90_get_var, nf90_strerror, nf90_close, &
+            nf90_enddef, nf90_put_att, nf90_unlimited, nf90_noerr, nf90_global, nf90_clobber, &
+            nf90_64bit_offset, nf90_def_dim, nf90_create
+    USE lmdz_netcdf_format, ONLY: nf90_format
     IMPLICIT NONE
 
@@ -604 +605 @@
       PRINT *, 'writelim: Ecriture du fichier limit'
 
-      ierr = nf_create('limit.nc', IOR(NF_CLOBBER,NF_64BIT_OFFSET), nid)
-
-      ierr = nf_put_att_text(nid, nf_global, 'title', 30, &
+      ierr = nf90_create('limit.nc', IOR(nf90_clobber,nf90_64bit_offset), nid)
+
+      ierr = nf90_put_att(nid, nf90_global, 'title', &
         'Fichier conditions aux limites')
-      ! !        ierr = NF_DEF_DIM (nid, "points_physiques", klon, ndim)
-      ierr = nf_def_dim(nid, 'points_physiques', klon_glo, ndim)
-      ierr = nf_def_dim(nid, 'time', nf_unlimited, ntim)
+      ! !        ierr = nf90_def_dim (nid, "points_physiques", klon, ndim)
+      ierr = nf90_def_dim(nid, 'points_physiques', klon_glo, ndim)
+      ierr = nf90_def_dim(nid, 'time', nf90_unlimited, ntim)
 
       dims(1) = ndim
       dims(2) = ntim
 
-      ierr = nf90_def_var(nid, 'TEMPS', NF90_FORMAT, [ntim], id_tim)
-      ierr = nf_put_att_text(nid, id_tim, 'title', 17, 'Jour dans l annee')
-
-      ierr = nf90_def_var(nid, 'NAT', NF90_FORMAT, dims, id_nat)
-      ierr = nf_put_att_text(nid, id_nat, 'title', 23, &
+      ierr = nf90_def_var(nid, 'TEMPS', nf90_format, [ntim], id_tim)
+      ierr = nf90_put_att(nid, id_tim, 'title', 'Jour dans l annee')
+
+      ierr = nf90_def_var(nid, 'NAT', nf90_format, dims, id_nat)
+      ierr = nf90_put_att(nid, id_nat, 'title', &
         'Nature du sol (0,1,2,3)')
 
-      ierr = nf90_def_var(nid, 'SST', NF90_FORMAT, dims, id_sst)
-      ierr = nf_put_att_text(nid, id_sst, 'title', 35, &
+      ierr = nf90_def_var(nid, 'SST', nf90_format, dims, id_sst)
+      ierr = nf90_put_att(nid, id_sst, 'title', &
         'Temperature superficielle de la mer')
 
-      ierr = nf90_def_var(nid, 'BILS', NF90_FORMAT, dims, id_bils)
-      ierr = nf_put_att_text(nid, id_bils, 'title', 32, &
+      ierr = nf90_def_var(nid, 'BILS', nf90_format, dims, id_bils)
+      ierr = nf90_put_att(nid, id_bils, 'title', &
         'Reference flux de chaleur au sol')
 
-      ierr = nf90_def_var(nid, 'ALB', NF90_FORMAT, dims, id_alb)
-      ierr = nf_put_att_text(nid, id_alb, 'title', 19, 'Albedo a la surface')
-
-      ierr = nf90_def_var(nid, 'RUG', NF90_FORMAT, dims, id_rug)
-      ierr = nf_put_att_text(nid, id_rug, 'title', 8, 'Rugosite')
-
-      ierr = nf90_def_var(nid, 'FTER', NF90_FORMAT, dims, id_fter)
-      ierr = nf_put_att_text(nid, id_fter, 'title',10,'Frac. Land')
-      ierr = nf90_def_var(nid, 'FOCE', NF90_FORMAT, dims, id_foce)
-      ierr = nf_put_att_text(nid, id_foce, 'title',11,'Frac. Ocean')
-      ierr = nf90_def_var(nid, 'FSIC', NF90_FORMAT, dims, id_fsic)
-      ierr = nf_put_att_text(nid, id_fsic, 'title',13,'Frac. Sea Ice')
-      ierr = nf90_def_var(nid, 'FLIC', NF90_FORMAT, dims, id_flic)
-      ierr = nf_put_att_text(nid, id_flic, 'title',14,'Frac. Land Ice')
-
-      ierr = nf_enddef(nid)
-      IF (ierr/=nf_noerr) THEN
+      ierr = nf90_def_var(nid, 'ALB', nf90_format, dims, id_alb)
+      ierr = nf90_put_att(nid, id_alb, 'title', 'Albedo a la surface')
+
+      ierr = nf90_def_var(nid, 'RUG', nf90_format, dims, id_rug)
+      ierr = nf90_put_att(nid, id_rug, 'title', 'Rugosite')
+
+      ierr = nf90_def_var(nid, 'FTER', nf90_format, dims, id_fter)
+      ierr = nf90_put_att(nid, id_fter, 'title','Frac. Land')
+      ierr = nf90_def_var(nid, 'FOCE', nf90_format, dims, id_foce)
+      ierr = nf90_put_att(nid, id_foce, 'title','Frac. Ocean')
+      ierr = nf90_def_var(nid, 'FSIC', nf90_format, dims, id_fsic)
+      ierr = nf90_put_att(nid, id_fsic, 'title','Frac. Sea Ice')
+      ierr = nf90_def_var(nid, 'FLIC', nf90_format, dims, id_flic)
+      ierr = nf90_put_att(nid, id_flic, 'title','Frac. Land Ice')
+
+      ierr = nf90_enddef(nid)
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error: failed to end define mode'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
 
@@ -655 +656 @@
       DO k = 1, year_len
         ierr = nf90_put_var(nid, id_tim, k, [k])
-        IF (ierr/=nf_noerr) THEN
+        IF (ierr/=nf90_noerr) THEN
           WRITE (*, *) 'writelim error with temps(k),k=', k
-          WRITE (*, *) nf_strerror(ierr)
+          WRITE (*, *) nf90_strerror(ierr)
         END IF
       END DO
@@ -668 +669 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_nat, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_nat'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -677 +678 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_sst, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_sst'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -686 +687 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_bils, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_bil'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -695 +696 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_alb, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_alb'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -704 +705 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_rug, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_rug'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -713 +714 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_fter, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_fter'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -722 +723 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_foce, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_foce'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -731 +732 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_fsic, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_fsic'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -740 +741 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_flic, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_flic'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -748 +749 @@
     ! close file:
     IF (is_master) THEN
-      ierr = nf_close(nid)
+      ierr = nf90_close(nid)
     END IF
 

LMDZ6/branches/Amaury_dev/libf/phylmd/phyetat0_mod.F90

@@ -40 +40 @@
   USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
   USE wxios, ONLY: missing_val_xios => missing_val, using_xios
-  use lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
+  use netcdf, only: missing_val_netcdf => nf90_fill_real
   use config_ocean_skin_m, only: activate_ocean_skin
 

LMDZ6/branches/Amaury_dev/libf/phylmd/phys_output_write_mod.F90

@@ -456 +456 @@
     USE ioipsl, ONLY: histend, histsync
     USE iophy, ONLY: set_itau_iophy, histwrite_phy
-    USE lmdz_netcdf, ONLY: nf90_fill_real
+    USE netcdf, ONLY: nf90_fill_real
     USE print_control_mod, ONLY: prt_level,lunout
     ! ug Pour les sorties XIOS

LMDZ6/branches/Amaury_dev/libf/phylmd/phys_state_var_mod.F90

@@ -10 +10 @@
 ! Declaration des variables
       USE dimphy
-      USE lmdz_netcdf, only: nf90_fill_real
+      USE netcdf, only: nf90_fill_real
       INTEGER, PARAMETER :: nlevSTD=17
       INTEGER, PARAMETER :: nlevSTD8=8

LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

@@ -48 +48 @@
     USE mod_phys_lmdz_para
     USE netcdf95, only: nf95_close
-    USE lmdz_netcdf, only: nf90_fill_real     ! IM for NMC files
+    USE netcdf, only: nf90_fill_real     ! IM for NMC files
     USE open_climoz_m, only: open_climoz ! ozone climatology from a file
     USE ozonecm_m, only: ozonecm ! ozone of J.-F. Royer

LMDZ6/branches/Amaury_dev/libf/phylmd/plevel.F90

@@ -7 +7 @@
   ! ================================================================
   ! ================================================================
-  USE lmdz_netcdf, ONLY: nf90_fill_real
+  USE netcdf, ONLY: nf90_fill_real
   USE dimphy
 #ifdef CPP_IOIPSL 

LMDZ6/branches/Amaury_dev/libf/phylmd/press_coefoz_m.F90

@@ -24 +24 @@
 
     use netcdf95, only: nf95_open, nf95_close, nf95_gw_var, nf95_inq_varid
-    use lmdz_netcdf, only: nf90_nowrite
+    use netcdf, only: nf90_nowrite
 
     use mod_phys_lmdz_mpi_data, only: is_mpi_root

LMDZ6/branches/Amaury_dev/libf/phylmd/read_map2D.F90

@@ -3 +3 @@
 ! Return variable for the given timestep. 
   USE dimphy
-  USE lmdz_netcdf, ONLY: nf90_open,nf90_close,nf90_nowrite,nf90_noerr,nf90_get_var,nf90_inq_varid
+  USE netcdf, ONLY: nf90_open,nf90_close,nf90_nowrite,nf90_noerr,nf90_get_var,nf90_inq_varid
   USE mod_grid_phy_lmdz
   USE mod_phys_lmdz_para

LMDZ6/branches/Amaury_dev/libf/phylmd/read_pstoke.F90

@@ -17 +17 @@
   ! ******************************************************************************
 
-  USE lmdz_netcdf, ONLY: nf90_open,nf90_inq_varid,nf90_nowrite,nf90_get_var,nf_inq_dim,&
-          nf_inq_dimid
+  USE netcdf, ONLY: nf90_open,nf90_inq_varid,nf90_nowrite,nf90_get_var,nf90_inquire_dimension,&
+          nf90_inq_dimid
   USE dimphy
   USE indice_sol_mod
@@ -225 +225 @@
     ! ID pour les dimensions
 
-    status = nf_inq_dimid(ncidp, 'y', yid)
-    status = nf_inq_dimid(ncidp, 'x', xid)
-    status = nf_inq_dimid(ncidp, 'sig_s', zid)
-    status = nf_inq_dimid(ncidp, 'time_counter', tid)
+    status = nf90_inq_dimid(ncidp, 'y', yid)
+    status = nf90_inq_dimid(ncidp, 'x', xid)
+    status = nf90_inq_dimid(ncidp, 'sig_s', zid)
+    status = nf90_inq_dimid(ncidp, 'time_counter', tid)
 
     ! lecture des dimensions
 
-    status = nf_inq_dim(ncidp, yid, namedim, ncjm)
-    status = nf_inq_dim(ncidp, xid, namedim, ncim)
-    status = nf_inq_dim(ncidp, zid, namedim, ncklevo)
-    status = nf_inq_dim(ncidp, tid, namedim, ncrec)
+    status = nf90_inquire_dimension(ncidp, yid, namedim, ncjm)
+    status = nf90_inquire_dimension(ncidp, xid, namedim, ncim)
+    status = nf90_inquire_dimension(ncidp, zid, namedim, ncklevo)
+    status = nf90_inquire_dimension(ncidp, tid, namedim, ncrec)
 
     zrec = ncrec

LMDZ6/branches/Amaury_dev/libf/phylmd/read_pstoke0.F90

@@ -16 +16 @@
   ! ******************************************************************************
 
-  USE lmdz_netcdf, ONLY: nf_inq_dimid,nf_inq_dim,nf90_get_var,nf90_inq_varid,nf90_open,&
+  USE netcdf, ONLY: nf90_inq_dimid,nf90_inquire_dimension,nf90_get_var,nf90_inq_varid,nf90_open,&
           nf90_nowrite
   USE dimphy
@@ -225 +225 @@
     ! ID pour les dimensions
 
-    status = nf_inq_dimid(ncidp, 'y', yid)
-    status = nf_inq_dimid(ncidp, 'x', xid)
-    status = nf_inq_dimid(ncidp, 'sig_s', zid)
-    status = nf_inq_dimid(ncidp, 'time_counter', tid)
+    status = nf90_inq_dimid(ncidp, 'y', yid)
+    status = nf90_inq_dimid(ncidp, 'x', xid)
+    status = nf90_inq_dimid(ncidp, 'sig_s', zid)
+    status = nf90_inq_dimid(ncidp, 'time_counter', tid)
 
     ! lecture des dimensions
 
-    status = nf_inq_dim(ncidp, yid, namedim, ncjm)
-    status = nf_inq_dim(ncidp, xid, namedim, ncim)
-    status = nf_inq_dim(ncidp, zid, namedim, nckev)
-    status = nf_inq_dim(ncidp, tid, namedim, ncrec)
+    status = nf90_inquire_dimension(ncidp, yid, namedim, ncjm)
+    status = nf90_inquire_dimension(ncidp, xid, namedim, ncim)
+    status = nf90_inquire_dimension(ncidp, zid, namedim, nckev)
+    status = nf90_inquire_dimension(ncidp, tid, namedim, ncrec)
 
     zrec = ncrec

LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosol_mod.F90

@@ -3 +3 @@
 MODULE readaerosol_mod
 
-  USE lmdz_netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_get_var,nf90_inq_varid,&
+  USE netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_get_var,nf90_inq_varid,&
           nf90_inquire_dimension,nf90_inq_dimid,nf90_open,nf90_nowrite,nf90_close
 
@@ -205 +205 @@
 
           ! Read and test longitudes
-          CALL check_err( nf90_inq_dimid(ncid, "lon", dimID),"pb inq dim lon") 
+          CALL check_err( nf90_inq_dimid(ncid, "lon", dimID),"pb inq dim lon")
           CALL check_err( nf90_inquire_dimension(ncid, dimID, len = nbp_lon_src),"pb inq dim lon")
           CALL check_err( nf90_inq_varid(ncid, 'lon', varid),"pb inq lon" )
@@ -212 +212 @@
 
           ! Read and test latitudes
-          CALL check_err( nf90_inq_dimid(ncid, "lat", dimID),"pb inq dim lat") 
+          CALL check_err( nf90_inq_dimid(ncid, "lat", dimID),"pb inq dim lat")
           CALL check_err( nf90_inquire_dimension(ncid, dimID, len = nbp_lat_src),"pb inq dim lat")
           CALL check_err( nf90_inq_varid(ncid, 'lat', varid),"pb inq lat" )
@@ -398 +398 @@
 !    Old type of file should contain the dimension 'PRESNIVS'
 !****************************************************************************************
-       ierr = nf90_inq_dimid(ncid, 'lev', dimid) 
+       ierr = nf90_inq_dimid(ncid, 'lev', dimid)
        IF (ierr /= NF90_NOERR) THEN
           ! Coordinate axe lev not found. Check for presnivs.
-          ierr = nf90_inq_dimid(ncid, 'presnivs', dimid) 
+          ierr = nf90_inq_dimid(ncid, 'presnivs', dimid)
           IF (ierr /= NF90_NOERR) THEN
              ierr = nf90_inq_dimid(ncid, 'PRESNIVS', dimid)

LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosolstrato.F90

@@ -3 +3 @@
     use netcdf95, only: nf95_close, nf95_gw_var, nf95_inq_dimid, & 
                         nf95_inq_varid, nf95_open
-    use lmdz_netcdf, only: nf90_get_var, nf90_noerr, nf90_nowrite
+    use netcdf, only: nf90_get_var, nf90_noerr, nf90_nowrite
 
     USE phys_cal_mod, ONLY : mth_cur

LMDZ6/branches/Amaury_dev/libf/phylmd/readaerosolstrato_m.F90

@@ -24 +24 @@
 
 SUBROUTINE init_readaerosolstrato1
-  USE lmdz_netcdf, ONLY: nf90_nowrite
+  USE netcdf, ONLY: nf90_nowrite
   USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, &
                       nf95_inq_varid, nf95_open
@@ -67 +67 @@
   
 SUBROUTINE init_readaerosolstrato2
-  USE lmdz_netcdf, ONLY: nf90_nowrite
+  USE netcdf, ONLY: nf90_nowrite
   USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, &
                       nf95_inq_varid, nf95_open

LMDZ6/branches/Amaury_dev/libf/phylmd/readchlorophyll.F90

@@ -8 +8 @@
 
     USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, nf95_inq_varid, nf95_open
-    USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+    USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
     USE phys_cal_mod, ONLY: mth_cur
     USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid2dto1d_glo

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_horiz_time_climoz_m.F90

@@ -4 +4 @@
   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, grid_type, unstructured
   USE nrtype,            ONLY: pi
-  USE lmdz_netcdf,   ONLY: NF90_CLOBBER, NF90_FLOAT,     NF90_OPEN,   &
+  USE netcdf,   ONLY: NF90_CLOBBER, NF90_FLOAT,     NF90_OPEN,   &
                       NF90_NOWRITE, NF90_NOERR,     NF90_GET_ATT, NF90_GLOBAL
   USE netcdf95, ONLY: NF95_DEF_DIM, NF95_INQ_DIMID, NF95_INQUIRE_DIMENSION,    &
@@ -702 +702 @@
 !
 !-------------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY: NF90_NOERR, NF90_strerror
+  USE netcdf, ONLY: NF90_NOERR, NF90_strerror
 !-------------------------------------------------------------------------------
 ! Arguments:

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_lat_time_coefoz_m.F90

@@ -45 +45 @@
     use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var, &
          nf95_put_var, nf95_gw_var
-    use lmdz_netcdf, only: nf90_nowrite
+    use netcdf, only: nf90_nowrite
     use nrtype, only: pi
     use regular_lonlat_mod, only: boundslat_reg, south
@@ -245 +245 @@
     use netcdf95, only: nf95_create, nf95_def_dim, nf95_def_var, &
          nf95_put_att, nf95_enddef, nf95_copy_att, nf95_put_var
-    use lmdz_netcdf, only: nf90_clobber, nf90_float, nf90_copy_att, nf90_global
+    use netcdf, only: nf90_clobber, nf90_float, nf90_copy_att, nf90_global
     use nrtype, only: pi
     use regular_lonlat_mod, only : lat_reg
@@ -328 +328 @@
     subroutine handle_err_copy_att(att_name)
 
-      use lmdz_netcdf, only: nf90_noerr, nf90_strerror
+      use netcdf, only: nf90_noerr, nf90_strerror
 
       character(len=*), intent(in):: att_name

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_comb_coefoz_m.F90

@@ -72 +72 @@
 
     use netcdf95, only: nf95_open, nf95_close
-    use lmdz_netcdf, only: nf90_nowrite
+    use netcdf, only: nf90_nowrite
     use assert_m, only: assert
     use dimphy, only: klon

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_o3_m.F90

@@ -26 +26 @@
 
     use netcdf95, only: nf95_open, nf95_close, nf95_inq_varid, nf95_get_var
-    use lmdz_netcdf, only:  nf90_nowrite
+    use netcdf, only:  nf90_nowrite
     use assert_m, only: assert
     use regr_conserv_m, only: regr_conserv

LMDZ6/branches/Amaury_dev/libf/phylmd/regr_pr_time_av_m.F90

@@ -115 +115 @@
   USE netcdf95,       ONLY: NF95_INQ_VARID, NF95_INQUIRE_VARIABLE, &
                             NF95_INQ_DIMID, NF95_INQUIRE_DIMENSION, nf95_get_var
-  USE lmdz_netcdf,         ONLY: NF90_INQ_VARID, NF90_NOERR
+  USE netcdf,         ONLY: NF90_INQ_VARID, NF90_NOERR
   USE assert_m,       ONLY: assert
   USE assert_eq_m,    ONLY: assert_eq

LMDZ6/branches/Amaury_dev/libf/phylmd/tracco2i_mod.F90

@@ -351 +351 @@
 
     USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_varid, nf95_open
-    USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+    USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
     USE carbon_cycle_mod, ONLY : fco2_ff, fco2_bb, fco2_land, fco2_ocean

LMDZ6/branches/Amaury_dev/libf/phylmd/undefSTD.F90

@@ -3 +3 @@
 
 SUBROUTINE undefstd(itap, read_climoz)
-  USE lmdz_netcdf, ONLY: nf90_fill_real
+  USE netcdf, ONLY: nf90_fill_real
   USE dimphy
 #ifdef CPP_IOIPSL 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/limit_read_mod.F90

@@ -274 +274 @@
     USE mod_phys_lmdz_para
     USE surface_data, ONLY : type_ocean, ok_veget
-    USE lmdz_netcdf, ONLY:nf90_noerr,nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,&
+    USE netcdf, ONLY:nf90_noerr,nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,&
             nf90_inq_dimid,nf90_inquire_dimension,nf90_open,nf90_get_att,nf90_inquire
     USE indice_sol_mod
@@ -367 +367 @@
           !--- ERROR IF FILE RECORDS NUMBER IS NOT EQUAL TO EXPECTED NUMBER OF DAYS          
           IF (grid_type==unstructured) THEN
-            ierr=NF90_INQ_DIMID(nid,"time_year",ndimid)
+            ierr=nf90_inq_dimid(nid,"time_year",ndimid)
           ELSE
             ierr=NF90_INQUIRE(nid, UnlimitedDimID=ndimid)
@@ -378 +378 @@
           !--- ERROR IF FILES AND LMDZ HORIZONTAL RESOLUTIONS DO NOT MATCH
           IF (grid_type==unstructured) THEN
-            ierr=NF90_INQ_DIMID(nid, 'cell', ndimid)
+            ierr=nf90_inq_dimid(nid, 'cell', ndimid)
           ELSE
-            ierr=NF90_INQ_DIMID(nid, 'points_physiques', ndimid)
+            ierr=nf90_inq_dimid(nid, 'points_physiques', ndimid)
           ENDIF
           ierr=NF90_INQUIRE_DIMENSION(nid, ndimid, len=nn)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyaqua_mod.F90

@@ -591 +591 @@
     USE mod_phys_lmdz_transfert_para, ONLY: gather
     USE phys_cal_mod, ONLY: year_len
-    USE lmdz_netcdf, ONLY:nf_clobber,nf_close,nf_noerr,nf_strerror,nf_put_att_text,nf_def_var,&
-            nf_def_dim,nf_create,nf90_put_var,nf_unlimited,nf_global,nf_64bit_offset,nf90_format,&
-            nf_enddef
+    USE netcdf, ONLY:nf90_clobber,nf90_close,nf90_noerr,nf90_strerror,nf90_put_att,nf90_def_var,&
+            nf90_def_dim,nf90_create,nf90_put_var,nf90_unlimited,nf90_global,nf90_64bit_offset,&
+            nf90_enddef
+    USE lmdz_netcdf_format, ONLY: nf90_format
     IMPLICIT NONE
 
@@ -625 +626 @@
       PRINT *, 'writelim: Ecriture du fichier limit'
 
-      ierr = nf_create('limit.nc', IOR(NF_CLOBBER,NF_64BIT_OFFSET), nid)
-
-      ierr = nf_put_att_text(nid, nf_global, 'title', 30, &
+      ierr = nf90_create('limit.nc', IOR(nf90_clobber,nf90_64bit_offset), nid)
+
+      ierr = nf90_put_att(nid, nf90_global, 'title', &
         'Fichier conditions aux limites')
-      ! !        ierr = NF_DEF_DIM (nid, "points_physiques", klon, ndim)
-      ierr = nf_def_dim(nid, 'points_physiques', klon_glo, ndim)
-      ierr = nf_def_dim(nid, 'time', nf_unlimited, ntim)
+      ! !        ierr = nf90_def_dim (nid, "points_physiques", klon, ndim)
+      ierr = nf90_def_dim(nid, 'points_physiques', klon_glo, ndim)
+      ierr = nf90_def_dim(nid, 'time', nf90_unlimited, ntim)
 
       dims(1) = ndim
       dims(2) = ntim
 
-      ierr = nf_def_var(nid, 'TEMPS', NF90_FORMAT, 1, ntim, id_tim)
-      ierr = nf_put_att_text(nid, id_tim, 'title', 17, 'Jour dans l annee')
-
-      ierr = nf_def_var(nid, 'NAT', NF90_FORMAT, 2, dims, id_nat)
-      ierr = nf_put_att_text(nid, id_nat, 'title', 23, &
+      ierr = nf90_def_var(nid, 'TEMPS', nf90_format, ntim, id_tim)
+      ierr = nf90_put_att(nid, id_tim, 'title', 'Jour dans l annee')
+
+      ierr = nf90_def_var(nid, 'NAT', nf90_format, dims, id_nat)
+      ierr = nf90_put_att(nid, id_nat, 'title', &
         'Nature du sol (0,1,2,3)')
 
-      ierr = nf_def_var(nid, 'SST', NF90_FORMAT, 2, dims, id_sst)
-      ierr = nf_put_att_text(nid, id_sst, 'title', 35, &
+      ierr = nf90_def_var(nid, 'SST', nf90_format, dims, id_sst)
+      ierr = nf90_put_att(nid, id_sst, 'title', &
         'Temperature superficielle de la mer')
 
-      ierr = nf_def_var(nid, 'BILS', NF90_FORMAT, 2, dims, id_bils)
-      ierr = nf_put_att_text(nid, id_bils, 'title', 32, &
+      ierr = nf90_def_var(nid, 'BILS', nf90_format, dims, id_bils)
+      ierr = nf90_put_att(nid, id_bils, 'title', &
         'Reference flux de chaleur au sol')
 
-      ierr = nf_def_var(nid, 'ALB', NF90_FORMAT, 2, dims, id_alb)
-      ierr = nf_put_att_text(nid, id_alb, 'title', 19, 'Albedo a la surface')
-
-      ierr = nf_def_var(nid, 'RUG', NF90_FORMAT, 2, dims, id_rug)
-      ierr = nf_put_att_text(nid, id_rug, 'title', 8, 'Rugosite')
-
-      ierr = nf_def_var(nid, 'FTER', NF90_FORMAT, 2, dims, id_fter)
-      ierr = nf_put_att_text(nid, id_fter, 'title',10,'Frac. Land')
-      ierr = nf_def_var(nid, 'FOCE', NF90_FORMAT, 2, dims, id_foce)
-      ierr = nf_put_att_text(nid, id_foce, 'title',11,'Frac. Ocean')
-      ierr = nf_def_var(nid, 'FSIC', NF90_FORMAT, 2, dims, id_fsic)
-      ierr = nf_put_att_text(nid, id_fsic, 'title',13,'Frac. Sea Ice')
-      ierr = nf_def_var(nid, 'FLIC', NF90_FORMAT, 2, dims, id_flic)
-      ierr = nf_put_att_text(nid, id_flic, 'title',14,'Frac. Land Ice')
-
-      ierr = nf_enddef(nid)
-      IF (ierr/=nf_noerr) THEN
+      ierr = nf90_def_var(nid, 'ALB', nf90_format, dims, id_alb)
+      ierr = nf90_put_att(nid, id_alb, 'title', 'Albedo a la surface')
+
+      ierr = nf90_def_var(nid, 'RUG', nf90_format, dims, id_rug)
+      ierr = nf90_put_att(nid, id_rug, 'title', 'Rugosite')
+
+      ierr = nf90_def_var(nid, 'FTER', nf90_format, dims, id_fter)
+      ierr = nf90_put_att(nid, id_fter, 'title','Frac. Land')
+      ierr = nf90_def_var(nid, 'FOCE', nf90_format, dims, id_foce)
+      ierr = nf90_put_att(nid, id_foce, 'title','Frac. Ocean')
+      ierr = nf90_def_var(nid, 'FSIC', nf90_format, dims, id_fsic)
+      ierr = nf90_put_att(nid, id_fsic, 'title','Frac. Sea Ice')
+      ierr = nf90_def_var(nid, 'FLIC', nf90_format, dims, id_flic)
+      ierr = nf90_put_att(nid, id_flic, 'title','Frac. Land Ice')
+
+      ierr = nf90_enddef(nid)
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error: failed to end define mode'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
 
@@ -676 +677 @@
       DO k = 1, year_len
         ierr = nf90_put_var(nid, id_tim, k, [k])
-        IF (ierr/=nf_noerr) THEN
+        IF (ierr/=nf90_noerr) THEN
           WRITE (*, *) 'writelim error with temps(k),k=', k
-          WRITE (*, *) nf_strerror(ierr)
+          WRITE (*, *) nf90_strerror(ierr)
         END IF
       END DO
@@ -689 +690 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_nat, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_nat'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -698 +699 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_sst, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_sst'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -707 +708 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_bils, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_bil'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -716 +717 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_alb, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_alb'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -725 +726 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_rug, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_rug'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -734 +735 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_fter, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_fter'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -743 +744 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_foce, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_foce'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -752 +753 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_fsic, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_fsic'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -761 +762 @@
     IF (is_master) THEN
       ierr = nf90_put_var(nid, id_flic, phy_glo)
-      IF (ierr/=nf_noerr) THEN
+      IF (ierr/=nf90_noerr) THEN
         WRITE (*, *) 'writelim error with phy_flic'
-        WRITE (*, *) nf_strerror(ierr)
+        WRITE (*, *) nf90_strerror(ierr)
       END IF
     END IF
@@ -769 +770 @@
     ! close file:
     IF (is_master) THEN
-      ierr = nf_close(nid)
+      ierr = nf90_close(nid)
     END IF
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyetat0_mod.F90

@@ -48 +48 @@
   USE time_phylmdz_mod, ONLY: init_iteration, pdtphys, itau_phy
   USE wxios, ONLY: missing_val_xios => missing_val, using_xios
-  use lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
+  use netcdf, only: missing_val_netcdf => nf90_fill_real
   use config_ocean_skin_m, only: activate_ocean_skin
 #ifdef ISO

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -48 +48 @@
     USE mod_phys_lmdz_para
     USE netcdf95, only: nf95_close
-    USE lmdz_netcdf, only: nf90_fill_real     ! IM for NMC files
+    USE netcdf, only: nf90_fill_real     ! IM for NMC files
     USE open_climoz_m, only: open_climoz ! ozone climatology from a file
     USE ozonecm_m, only: ozonecm ! ozone of J.-F. Royer

LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90

@@ -3 +3 @@
 
     ! flag to include modifications to ensure energy conservation (if flag >0)
-    USE add_phys_tend_mod, only : fl_cor_ebil 
+    USE add_phys_tend_mod, only : fl_cor_ebil
 #ifdef ISO
     USE infotrac_phy, ONLY: ntiso,nqtot,ivap,iliq,isol,iqWIsoPha
@@ -11 +11 @@
     USE isotopes_mod, ONLY: iso_eau,iso_hdo,iso_o18,ridicule
 #ifdef ISOTRAC
-    USE isotrac_routines_mod, ONLY: iso_verif_traceur_pbidouille    
+    USE isotrac_routines_mod, ONLY: iso_verif_traceur_pbidouille
 #endif
-#endif 
+#endif
 #endif
     IMPLICIT none
@@ -25 +25 @@
 
     REAL za,zb,zdelta,zlvdcp,zlsdcp
-    INTEGER i,k,ixt,ivapcur,iliqcur,isolcur    
+    INTEGER i,k,ixt,ivapcur,iliqcur,isolcur
 
 
     !--------Stochastic Boundary Layer Triggering: ALE_BL--------
-    !---Propri\'et\'es du thermiques au LCL 
+    !---Propri\'et\'es du thermiques au LCL
     include "YOMCST.h"
     include "YOETHF.h"
@@ -38 +38 @@
     ! Re-evaporer l'eau liquide nuageuse
     !
-    iliqcur= iqWIsoPha(ixt,iliq)    
-    ivapcur= iqWIsoPha(ixt,ivap)    
-    isolcur= iqWIsoPha(ixt,isol)   
+    iliqcur= iqWIsoPha(ixt,iliq)
+    ivapcur= iqWIsoPha(ixt,ivap)
+    isolcur= iqWIsoPha(ixt,isol)
 !print *,'rrevap ; fl_cor_ebil:',fl_cor_ebil,' iflag_ice_thermo:',iflag_ice_thermo,' RVTMP2',RVTMP2
     DO k = 1, klev  ! re-evaporation de l'eau liquide nuageuse
@@ -68 +68 @@
              !        za = - MAX(0.0,ql_seri(i,k)) &
              !             * (zlvdcp*(1.-zdelta)+zlsdcp*zdelta)
-             za = - MAX(0.0,qx(i,k,iliqcur))*zlvdcp & 
+             za = - MAX(0.0,qx(i,k,iliqcur))*zlvdcp &
                   - MAX(0.0,qx(i,k,iliqcur))*zlsdcp
              d_t_eva(i,k) = za
@@ -89 +89 @@
 
     enddo ! do ixt=1,1+niso*(nzone +1)
-    
+
 
 RETURN

LMDZ6/branches/Amaury_dev/tools/make_sso/make_sso_SpherePack.f90

@@ -6 +6 @@
 ! Purpose: Project ETOPO file (GMT4 axes conventions) on spherical harmonics.
 !-------------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY: nf90_noerr,nf90_strerror,nf90_close,nf90_put_var,nf90_enddef,&
+  USE netcdf, ONLY: nf90_noerr,nf90_strerror,nf90_close,nf90_put_var,nf90_enddef,&
           nf90_put_att,nf90_global,nf90_real,nf90_def_var,nf90_def_dim,nf90_inq_varid,&
           nf90_nowrite,nf90_inquire_dimension,nf90_inquire_variable,nf90_open

LMDZ6/branches/Amaury_dev/tools/netcdf95/Attributes/nf95_copy_att.f90

@@ -8 +8 @@
   subroutine nf95_copy_att(ncid_in, varid_in, name, ncid_out, varid_out, ncerr)
 
-    use lmdz_netcdf, only: nf90_copy_att
+    use netcdf, only: nf90_copy_att
 
     use nf95_abort_m, only: nf95_abort

LMDZ6/branches/Amaury_dev/tools/netcdf95/Attributes/nf95_get_att.f90

@@ -2 +2 @@
 
   use nf95_abort_m, only: nf95_abort
-  use lmdz_netcdf, only: nf90_get_att, nf90_noerr
+  use netcdf, only: nf90_get_att, nf90_noerr
   use nf95_inquire_attribute_m, only: nf95_inquire_attribute
   use nf95_constants, only: nf95_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Attributes/nf95_get_missing.F90

@@ -1 +1 @@
 module nf95_get_missing_m
 
-  use lmdz_netcdf, only: nf90_noerr
+  use netcdf, only: nf90_noerr
   use nf95_get_att_m, only: nf95_get_att
 
@@ -18 +18 @@
   subroutine nf95_get_missing_real(ncid, varid, missing)
 
-    use lmdz_netcdf, only: NF90_FILL_REAL
+    use netcdf, only: NF90_FILL_REAL
     use typesizes, only: FourByteReal
 
@@ -44 +44 @@
   subroutine nf95_get_missing_dble(ncid, varid, missing)
 
-    use lmdz_netcdf, only: NF90_FILL_double
+    use netcdf, only: NF90_FILL_double
     use typesizes, only: EightByteReal
 
@@ -70 +70 @@
   subroutine nf95_get_missing_short_int(ncid, varid, missing)
 
-    use lmdz_netcdf, only: NF90_FILL_short
+    use netcdf, only: NF90_FILL_short
     use typesizes, only: TwoByteInt
 
@@ -96 +96 @@
   subroutine nf95_get_missing_int(ncid, varid, missing)
 
-    use lmdz_netcdf, only: NF90_FILL_INT
+    use netcdf, only: NF90_FILL_INT
 
     integer, intent(in)::  ncid, varid
@@ -121 +121 @@
   subroutine nf95_get_missing_char(ncid, varid, missing)
 
-    use lmdz_netcdf, only: NF90_FILL_char
+    use netcdf, only: NF90_FILL_char
 
     integer, intent(in)::  ncid, varid

LMDZ6/branches/Amaury_dev/tools/netcdf95/Attributes/nf95_inquire_attribute.f90

@@ -10 +10 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inquire_attribute
+    use netcdf, only: nf90_inquire_attribute
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Attributes/nf95_put_att.f90

@@ -1 +1 @@
 module nf95_put_att_m
 
-  use lmdz_netcdf, only: nf90_put_att
+  use netcdf, only: nf90_put_att
   use nf95_abort_m, only: nf95_abort
   use nf95_constants, only: nf95_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_close.f90

@@ -10 +10 @@
     ! call it.
 
-    use lmdz_netcdf, only: nf90_close, nf90_strerror
+    use netcdf, only: nf90_close, nf90_strerror
 
     use nf95_constants, only: nf95_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_create.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_create
+    use netcdf, only: nf90_create
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_create_single.f90

@@ -1 +1 @@
 module nf95_create_single_m
 
-  use lmdz_netcdf, only: NF90_MAX_NAME
+  use netcdf, only: NF90_MAX_NAME
 
   implicit none
@@ -19 +19 @@
     ! Shortcut to create a file containing a single primary variable.
 
-    use lmdz_netcdf, only: NF90_CLOBBER, NF90_FLOAT
+    use netcdf, only: NF90_CLOBBER, NF90_FLOAT
 
     use nf95_create_m, only: nf95_create

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_enddef.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_enddef
+    use netcdf, only: nf90_enddef
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_find_coord.f90

@@ -15 +15 @@
     ! attribute "std_name".
 
-    use lmdz_netcdf, only: NF90_MAX_NAME, NF90_NOERR
+    use netcdf, only: NF90_MAX_NAME, NF90_NOERR
     use nf95_get_att_m, only: nf95_get_att
     use nf95_inq_varid_m, only: nf95_inq_varid

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_inquire.f90

@@ -10 +10 @@
     
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inquire
+    use netcdf, only: nf90_inquire
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_open.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_open
+    use netcdf, only: nf90_open
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_redef.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_redef
+    use netcdf, only: nf90_redef
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Datasets/nf95_sync.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_sync
+    use netcdf, only: nf90_sync
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Groups/nf95_inq_file_ncid.f90

@@ -11 +11 @@
     ! by nf95_abort, so it cannot call it.
 
-    use lmdz_netcdf, only: nf90_strerror
+    use netcdf, only: nf90_strerror
 
     use nf95_constants, only: Nf95_ENOGRP, nf95_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Groups/nf95_inq_grp_parent.f90

@@ -12 +12 @@
     use, intrinsic:: ISO_C_BINDING
 
-    use lmdz_netcdf, only: nf90_strerror
+    use netcdf, only: nf90_strerror
 
     use nc_constants, only: NC_NOERR

LMDZ6/branches/Amaury_dev/tools/netcdf95/Groups/nf95_inq_grps.f90

@@ -26 +26 @@
     use, intrinsic:: ISO_C_BINDING
 
-    use lmdz_netcdf, only: nf90_noerr
+    use netcdf, only: nf90_noerr
 
     use nc_constants, only: nc_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/check_start_count.f90

@@ -19 +19 @@
     use nf95_close_m, only: nf95_close
     use nf95_inquire_variable_m, only: nf95_inquire_variable
-    use lmdz_netcdf, only: nf90_noerr
+    use netcdf, only: nf90_noerr
 
     character(len=*), intent(in):: name_calling ! name of calling procedure

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_def_var.f90

@@ -7 +7 @@
   ! "nf95_def_var_scalar" cannot be distinguished from "nf95_def_var_oneDim".
 
-  use lmdz_netcdf, only: nf90_def_var
+  use netcdf, only: nf90_def_var
   use nf95_abort_m, only: nf95_abort
   use nf95_constants, only: nf95_noerr

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_get_var.f90

@@ -1 +1 @@
 module nf95_get_var_m
 
-  use lmdz_netcdf, only: nf90_get_var, NF90_NOERR
+  use netcdf, only: nf90_get_var, NF90_NOERR
   
   use nf95_abort_m, only: nf95_abort

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_inq_varid.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inq_varid
+    use netcdf, only: nf90_inq_varid
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_inquire_variable.f90

@@ -16 +16 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inquire_variable, nf90_max_var_dims
+    use netcdf, only: nf90_inquire_variable, nf90_max_var_dims
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/Variables/nf95_put_var.f90

@@ -1 +1 @@
 module nf95_put_var_m
 
-  use lmdz_netcdf, only: nf90_put_var
+  use netcdf, only: nf90_put_var
   use nf95_abort_m, only: nf95_abort
   use check_start_count_m, only: check_start_count

LMDZ6/branches/Amaury_dev/tools/netcdf95/nf95_abort.f90

@@ -10 +10 @@
 
     ! Libraries:mod_phys_lmdz_mpi_transfert
-    use lmdz_netcdf, only: nf90_strerror
+    use netcdf, only: nf90_strerror
 
     use nf95_close_m, only: nf95_close

LMDZ6/branches/Amaury_dev/tools/netcdf95/nf95_def_dim.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_def_dim
+    use netcdf, only: nf90_def_dim
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/nf95_inq_dimid.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inq_dimid
+    use netcdf, only: nf90_inq_dimid
     use nf95_constants, only: nf95_noerr
 

LMDZ6/branches/Amaury_dev/tools/netcdf95/nf95_inquire_dimension.f90

@@ -8 +8 @@
 
     use nf95_abort_m, only: nf95_abort
-    use lmdz_netcdf, only: nf90_inquire_dimension
+    use netcdf, only: nf90_inquire_dimension
     use nf95_constants, only: nf95_noerr