Changeset 5075

Timestamp:

Jul 19, 2024, 10:05:57 AM (4 months ago)

Author:

abarral

Message:

[continued & end] replace netcdf by lmdz_netcdf.F90 wrapper
"use netcdf" is now only used in lmdz_netcdf.F90 (except ecrad and obsolete/)
<include "netcdf.inc"> is now likewise only used in lmdz_netcdf.F90.

systematically specify explicitely <USE lmdz_netcdf, ONLY:> (probably left some missing, to correct later on)

Further replacement of nf_put_* by nf90_put_* (same for _get_)

[minor] replace deprecated boolean operators along the way

Location:

LMDZ6/trunk

Files:

• libf/dyn3d/dynetat0.F90 (modified) (1 diff)
• libf/dyn3d/dynredem.F90 (modified) (2 diffs)
• libf/dyn3d/dynredem_mod.F90 (modified) (1 diff)
• libf/dyn3d/guide_mod.F90 (modified) (1 diff)
• libf/dyn3d/iniacademic.F90 (modified) (3 diffs)
• libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 (modified) (3 diffs)
• libf/dyn3dmem/dynetat0_loc.F90 (modified) (1 diff)
• libf/dyn3dmem/dynredem_loc.F90 (modified) (2 diffs)
• libf/dyn3dmem/dynredem_mod.F90 (modified) (1 diff)
• libf/dyn3dmem/iniacademic_loc.F90 (modified) (3 diffs)
• libf/dynphy_lonlat/phylmd/ce0l.F90 (modified) (1 diff)
• libf/dynphy_lonlat/phylmd/limit_netcdf.F90 (modified) (3 diffs)
• libf/misc/lmdz_netcdf.F90 (modified) (1 diff)
• libf/misc/write_field.F90 (modified) (6 diffs)
• libf/misc/wxios.F90 (modified) (6 diffs)
• libf/phylmd/Dust/condsurfc.F (modified) (2 diffs)
• libf/phylmd/Dust/condsurfc_new.F (modified) (15 diffs)
• libf/phylmd/Dust/condsurfs.F (modified) (2 diffs)
• libf/phylmd/Dust/condsurfs_new.F (modified) (19 diffs)
• libf/phylmd/Dust/phys_output_write_spl_mod.F90 (modified) (1 diff)
• libf/phylmd/Dust/phytracr_spl_mod.F90 (modified) (20 diffs)
• libf/phylmd/Dust/read_dust.F (modified) (2 diffs)
• libf/phylmd/Dust/read_surface.F90 (modified) (1 diff)
• libf/phylmd/Dust/read_vent.F (modified) (2 diffs)
• libf/phylmd/StratAer/interp_sulf_input.F90 (modified) (1 diff)
• libf/phylmd/StratAer/stratH2O_methox.F90 (modified) (2 diffs)
• libf/phylmd/condsurf.F90 (modified) (1 diff)
• libf/phylmd/create_etat0_unstruct_mod.F90 (modified) (4 diffs)
• libf/phylmd/dyn1d/1DUTILS.h (modified) (4 diffs)
• libf/phylmd/dyn1d/1D_decl_cases.h (modified) (1 diff)
• libf/phylmd/dyn1d/mod_1D_amma_read.F90 (modified) (6 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read.F90 (modified) (20 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read2.F90 (modified) (38 diffs)
• libf/phylmd/dyn1d/mod_1D_cases_read_std.F90 (modified) (23 diffs)
• libf/phylmd/dyn1d/old_1DUTILS_read_interp.h (modified) (5 diffs)
• libf/phylmd/dyn1d/old_1D_decl_cases.h (modified) (1 diff)
• libf/phylmd/dyn1d/old_lmdz1d.F90 (modified) (27 diffs)
• libf/phylmd/grid_noro_m.F90 (modified) (1 diff)
• libf/phylmd/ice_sursat_mod.F90 (modified) (36 diffs)
• libf/phylmd/inlandsis/surf_inlandsis_mod.F90 (modified) (20 diffs)
• libf/phylmd/interfoce_lim.F90 (modified) (1 diff)
• libf/phylmd/iostart.F90 (modified) (10 diffs)
• libf/phylmd/iotd_ecrit.F90 (modified) (4 diffs)
• libf/phylmd/iotd_fin.F90 (modified) (1 diff)
• libf/phylmd/iotd_ini.F90 (modified) (7 diffs)
• libf/phylmd/limit_read_mod.F90 (modified) (1 diff)
• libf/phylmd/limit_slab.F90 (modified) (2 diffs)
• 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/phyetat0_mod.F90 (modified) (9 diffs)
• libf/phylmd/phys_output_write_mod.F90 (modified) (26 diffs)
• 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/plevel_new.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) (3 diffs)
• libf/phylmd/readaerosol_mod.F90 (modified) (8 diffs)
• libf/phylmd/readaerosolstrato.F90 (modified) (7 diffs)
• libf/phylmd/readaerosolstrato_m.F90 (modified) (2 diffs)
• libf/phylmd/readchlorophyll.F90 (modified) (7 diffs)
• 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/rrtm/read_rsun_rrtm.F90 (modified) (1 diff)
• libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90 (modified) (1 diff)
• libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90 (modified) (1 diff)
• libf/phylmd/tracco2i_mod.F90 (modified) (8 diffs)
• libf/phylmd/undefSTD.F90 (modified) (1 diff)
• libf/phylmdiso/isotopes_routines_mod.F90 (modified) (2 diffs)
• libf/phylmdiso/limit_read_mod.F90 (modified) (1 diff)
• libf/phylmdiso/phyaqua_mod.F90 (modified) (3 diffs)
• libf/phylmdiso/phyetat0_mod.F90 (modified) (1 diff)
• libf/phylmdiso/physiq_mod.F90 (modified) (1 diff)
• 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/trunk/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 netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQ_VARID, &
+  USE lmdz_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/trunk/libf/dyn3d/dynredem.F90

@@ -9 +9 @@
   USE strings_mod, ONLY: maxlen
   USE infotrac, ONLY: nqtot, tracers
-  USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
+  USE lmdz_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 netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
+  USE lmdz_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/trunk/libf/dyn3d/dynredem_mod.F90

@@ -1 +1 @@
 MODULE dynredem_mod
 
-  USE lmdz_netcdf
+  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
   IMPLICIT NONE; PRIVATE
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err

LMDZ6/trunk/libf/dyn3d/guide_mod.F90

@@ -72 +72 @@
   SUBROUTINE guide_init
 
-    use netcdf, only: nf90_noerr
+    use lmdz_netcdf, only: nf90_noerr
     USE control_mod, ONLY: day_step
     USE serre_mod, ONLY: grossismx

LMDZ6/trunk/libf/dyn3d/iniacademic.F90

@@ -22 +22 @@
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
   USE readTracFiles_mod, ONLY: addPhase
-  use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID
-  use netcdf, only : NF90_CLOSE, NF90_GET_VAR
-
+  use lmdz_netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE,NF90_GET_VAR
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -143 +141 @@
      relief=0.
      ierr = NF90_OPEN ('relief_in.nc', NF90_NOWRITE,nid_relief)
-     if (ierr.EQ.NF90_NOERR) THEN
+     if (ierr==NF90_NOERR) THEN
          ierr=NF90_INQ_VARID(nid_relief,'RELIEF',varid)
          if (ierr==NF90_NOERR) THEN
@@ -248 +246 @@
         tetastrat=ttp*zsig**(-kappa)
         tetapv=tetastrat
-        IF ((ok_pv).AND.(zsig.LT.0.1)) THEN
+        IF ((ok_pv).AND.(zsig<0.1)) THEN
            tetapv=tetastrat*(zsig*10.)**(kappa*cpp*gam_pv/1000./g)
         ENDIF

LMDZ6/trunk/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 netcdf, only: nf90_def_var, nf90_int, nf90_float, nf90_put_var
+  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
   
   IMPLICIT NONE
@@ -21 +22 @@
   INCLUDE "paramet.h"
   INCLUDE "comgeom.h"
-  INCLUDE "netcdf.inc"
 
 !======================== 
@@ -232 +232 @@
 
 SUBROUTINE handle_err(status)
-  INCLUDE "netcdf.inc"
+  USE lmdz_netcdf, ONLY: nf_strerror
 
   INTEGER status
-  IF (status.NE.nf_noerr) THEN
+  IF (status/=nf_noerr) THEN
      PRINT *,NF_STRERROR(status)
      CALL abort_gcm('grilles_gcm_netcdf','netcdf error',1)

LMDZ6/trunk/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 netcdf,      ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_INQUIRE_DIMENSION, NF90_INQ_VARID, &
+  USE lmdz_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/trunk/libf/dyn3dmem/dynredem_loc.F90

@@ -11 +11 @@
   USE strings_mod, ONLY: maxlen
   USE infotrac, ONLY: nqtot, tracers
-  USE netcdf, ONLY: NF90_CREATE, NF90_DEF_DIM, NF90_INQ_VARID, NF90_GLOBAL,    &
+  USE lmdz_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 netcdf,   ONLY: NF90_OPEN,  NF90_NOWRITE, NF90_GET_VAR, NF90_INQ_VARID,  &
+  USE lmdz_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/trunk/libf/dyn3dmem/dynredem_mod.F90

@@ -4 +4 @@
   USE parallel_lmdz
   USE mod_hallo
-  USE lmdz_netcdf
+  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
   PRIVATE
   PUBLIC :: dynredem_write_u, dynredem_write_v, dynredem_read_u, err

LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90

@@ -23 +23 @@
   USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
   USE readTracFiles_mod, ONLY: addPhase
-  use netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID
-  use netcdf, only : NF90_CLOSE, NF90_GET_VAR
-
+  use lmdz_netcdf, only : NF90_NOWRITE,NF90_OPEN,NF90_NOERR,NF90_INQ_VARID,NF90_CLOSE, NF90_GET_VAR
 
   !   Author:    Frederic Hourdin      original: 15/01/93
@@ -155 +153 @@
      relief=0.
      ierr = NF90_OPEN ('relief_in.nc', NF90_NOWRITE,nid_relief)
-     if (ierr.EQ.NF90_NOERR) THEN
+     if (ierr==NF90_NOERR) THEN
          ierr=NF90_INQ_VARID(nid_relief,'RELIEF',varid)
          if (ierr==NF90_NOERR) THEN
@@ -257 +255 @@
         tetastrat=ttp*zsig**(-kappa)
         tetapv=tetastrat
-        IF ((ok_pv).AND.(zsig.LT.0.1)) THEN
+        IF ((ok_pv).AND.(zsig<0.1)) THEN
            tetapv=tetastrat*(zsig*10.)**(kappa*cpp*gam_pv/1000./g)
         ENDIF

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -21 +21 @@
   USE etat0phys,      ONLY: etat0phys_netcdf
   USE limit,          ONLY: limit_netcdf
-  USE netcdf,         ONLY: NF90_OPEN, NF90_NOWRITE, NF90_CLOSE, NF90_NOERR,    &
+  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 infotrac,       ONLY: init_infotrac

LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

@@ -71 +71 @@
 #ifndef CPP_1D
   USE indice_sol_mod
-  USE netcdf,             ONLY: NF90_OPEN,    NF90_CREATE,  NF90_CLOSE,        &
+  USE lmdz_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_DOUBLE,  NF90_GLOBAL,       &
+                  NF90_NOERR,   NF90_NOWRITE,  NF90_GLOBAL,       &
                   NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT,      &
-                  NF90_64BIT_OFFSET
+                  NF90_64BIT_OFFSET, NF90_FORMAT
   USE inter_barxy_m,      ONLY: inter_barxy
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
   USE comconst_mod, ONLY: pi
   USE phys_cal_mod, ONLY: calend
-  USE lmdz_netcdf, ONLY: NF90_FORMAT
   IMPLICIT NONE
 !-------------------------------------------------------------------------------
@@ -322 +321 @@
 !     2) Dimensional variables have the same names as corresponding dimensions.
 !-----------------------------------------------------------------------------
-  USE netcdf, ONLY: NF90_OPEN, NF90_INQ_VARID, NF90_INQUIRE_VARIABLE, &
+  USE lmdz_netcdf, ONLY: NF90_OPEN, NF90_INQ_VARID, NF90_INQUIRE_VARIABLE, &
        NF90_CLOSE, NF90_INQ_DIMID, NF90_INQUIRE_DIMENSION, NF90_GET_VAR, &
        NF90_GET_ATT
@@ -741 +740 @@
 ! Purpose: NetCDF errors handling.
 !-------------------------------------------------------------------------------
-  USE netcdf, ONLY : NF90_NOERR, NF90_STRERROR
+  USE lmdz_netcdf, ONLY : NF90_NOERR, NF90_STRERROR
   IMPLICIT NONE
 !-------------------------------------------------------------------------------

LMDZ6/trunk/libf/misc/lmdz_netcdf.F90

@@ -4 +4 @@
 !  1) Turn netcdf into a "real" fortran module, without the INCLUDE call
 !  2) Handle the NC_DOUBLE CPP key. This key should ONLY be used here.
-! Ideally, the "real" netcdf module/headers should ONLY be called here. (WIP) TODO
+! The "real" netcdf module/headers should ONLY be called here.
 ! ---------------------------------------------
-! TODO check all uses of `use netcdf` + netcdf.inc
 
 MODULE lmdz_netcdf

LMDZ6/trunk/libf/misc/write_field.F90

@@ -1 @@
-!
-! $Id$
-!
 module write_field
-implicit none
+  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
+
+  implicit none
 
   integer, parameter :: MaxWriteField = 100
@@ -73 +73 @@
     subroutine WriteField_gen(name,Field,dimx,dimy,dimz)
     implicit none
-    include 'netcdf.inc'
       character(len=*) :: name
       integer :: dimx,dimy,dimz
@@ -102 +101 @@
       count(4)=1
 
-      status = NF_PUT_VARA_DOUBLE(FieldId(Index),FieldVarId(Index),start,count,Field)
+      status = nf90_put_var(FieldId(Index),FieldVarId(Index),Field,start,count)
       status = NF_SYNC(FieldId(Index))
       
@@ -109 +108 @@
     subroutine CreateNewField(name,dimx,dimy,dimz)
     implicit none
-    include 'netcdf.inc'  
       character(len=*) :: name
       integer :: dimx,dimy,dimz
@@ -126 +124 @@
       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),NF_DOUBLE,4,TabDim,FieldVarId(NbField))
+      status = NF_DEF_VAR(FieldId(NbField),FieldName(NbField),NF90_FORMAT,4,TabDim,FieldVarId(NbField))
       status = NF_ENDDEF(FieldId(NbField))
 
     end subroutine CreateNewField
-    
-    
     
   subroutine write_field1D(name,Field)
@@ -285 +281 @@
                       //trim(int2str(pos+offset))      &    
                       //'," ---> ",g22.16," | ")'
-! dépent de l'implémention, sur compaq, c'est necessaire
+! d�pent de l'impl�mention, sur compaq, c'est necessaire
 !            Pos=Pos+ColumnSize
           endif

LMDZ6/trunk/libf/misc/wxios.F90

@@ -70 +70 @@
         reformaop = "average"
         
-        IF (op.EQ."inst(X)") THEN
+        IF (op=="inst(X)") THEN
             reformaop = "instant"
         END IF
         
-        IF (op.EQ."once") THEN
+        IF (op=="once") THEN
             reformaop = "once"
         END IF
         
-        IF (op.EQ."t_max(X)") THEN
+        IF (op=="t_max(X)") THEN
             reformaop = "maximum"
         END IF
         
-        IF (op.EQ."t_min(X)") THEN
+        IF (op=="t_min(X)") THEN
             reformaop = "minimum"
         END IF
@@ -604 +604 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_field(fieldname, fieldgroup, fieldlongname, fieldunit)
-        USE netcdf, only: nf90_fill_real
+        USE lmdz_netcdf, only: nf90_fill_real
 
         IMPLICIT NONE
@@ -621 +621 @@
         def = nf90_fill_real
         
-        IF (fieldunit .EQ. " ") THEN
+        IF (fieldunit == " ") THEN
             newunit = "-"
         ELSE
@@ -666 +666 @@
         
         ! Ajout Abd pour NMC:
-        IF (fid.LE.6) THEN
+        IF (fid<=6) THEN
           axis_id="presnivs"
         ELSE
@@ -682 +682 @@
         
         !On selectionne le bon groupe de champs:
-        IF (fdim.EQ.2) THEN
+        IF (fdim==2) THEN
           CALL xios_get_handle("fields_2D", fieldgroup)
         ELSE
@@ -726 +726 @@
             CALL xios_set_attr(field, level=field_level, enabled=.TRUE.)
             
-            IF (fdim.EQ.2) THEN
+            IF (fdim==2) THEN
                 !Si c'est un champ 2D:
                 IF (prt_level >= 10) THEN

LMDZ6/trunk/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
       IMPLICIT none
 !
@@ -10 +11 @@
 !
       INCLUDE "dimensions.h"
-      INCLUDE "netcdf.inc"
-      
+
       REAL lmt_bcff(klon), lmt_bcbb(klon),lmt_bc_penner(klon)
       REAL lmt_omff(klon), lmt_ombb(klon)

LMDZ6/trunk/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
       IMPLICIT none
 c
@@ -12 +13 @@
 c
       INCLUDE "dimensions.h"
-      INCLUDE "netcdf.inc"
-      
+
       REAL lmt_bcff(klon), lmt_bcnff(klon), lmt_bcba(klon)
       REAL lmt_omff(klon), lmt_omnff(klon), lmt_ombb(klon)
@@ -36 +36 @@
 c
 !      IF (jour.LT.0 .OR. jour.GT.(366-1)) THEN
-      IF (jour.LT.0 .OR. jour.GT.366) THEN
+      IF (jour<0 .OR. jour>366) THEN
          PRINT*,'Le jour demande n est pas correcte:', jour
          print *,'JE: FORCED TO CONTINUE (emissions have
@@ -58 +58 @@
 !
       ierr = NF_OPEN ("carbon_emissions.nc", NF_NOWRITE, nid1)
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
         write(6,*)' Pb d''ouverture du fichier limitbc.nc'
         write(6,*)' ierr = ', ierr
@@ -67 +67 @@
 !
       ierr = NF_INQ_VARID (nid1, "BCFF", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .  lmt_bcff_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_bcff_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -79 +78 @@
 !
       ierr = NF_INQ_VARID (nid1, "BCNFF", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .    lmt_bcnff_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_bcnff_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -89 +87 @@
 !
       ierr = NF_INQ_VARID (nid1, "BCBBL", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .  lmt_bcbbl_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_bcbbl_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources BC low'
          CALL exit(1)
@@ -99 +96 @@
 !
       ierr = NF_INQ_VARID (nid1, "BCBBH", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .      lmt_bcbbh_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_bcbbh_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources BC high'
          CALL exit(1)
@@ -109 +105 @@
 !
       ierr = NF_INQ_VARID (nid1, "BCBA", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais, 
-     .   lmt_bcba_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_bcba_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources BC'
          CALL exit(1)
@@ -125 +120 @@
 !
       ierr = NF_INQ_VARID (nid1, "OMFF", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .  lmt_omff_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_omff_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources OM'
          CALL exit(1)
@@ -135 +129 @@
 !
       ierr = NF_INQ_VARID (nid1, "OMNFF", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .   lmt_omnff_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_omnff_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources OM'
          CALL exit(1)
@@ -145 +138 @@
 !
       ierr = NF_INQ_VARID (nid1, "OMBBL", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais, 
-     .  lmt_ombbl_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_ombbl_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources OM low'
          CALL exit(1)
@@ -155 +147 @@
 !
       ierr = NF_INQ_VARID (nid1, "OMBBH", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .  lmt_ombbh_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_ombbh_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources OM high'
          CALL exit(1)
@@ -165 +156 @@
 !
       ierr = NF_INQ_VARID (nid1, "OMBA", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .   lmt_omba_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_omba_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources OM ship'
          CALL exit(1)
@@ -175 +165 @@
 !
       ierr = NF_INQ_VARID (nid1, "TERP", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid1, nvarid, debut, epais,
-     .  lmt_terp_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var (nid1, nvarid, lmt_terp_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources Terpene'
          CALL exit(1)

LMDZ6/trunk/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
       IMPLICIT none
 c
@@ -10 +11 @@
 c
       INCLUDE "dimensions.h"
-      INCLUDE "netcdf.inc"
 c
       REAL lmt_so2h(klon), lmt_so2b(klon), lmt_so2bb(klon)

LMDZ6/trunk/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
       IMPLICIT none
 c
@@ -15 +16 @@
 c
       INCLUDE "dimensions.h"
-      INCLUDE "netcdf.inc"
 c
       REAL lmt_so2b(klon), lmt_so2h(klon), lmt_so2nff(klon)
@@ -40 +40 @@
       INTEGER debut(2),epais(2)
 c
-      IF (jour.LT.0 .OR. jour.GT.(366-1)) THEN
+      IF (jour<0 .OR. jour>(366-1)) THEN
          PRINT*,'Le jour demande n est pas correcte:', jour
          print *,'JE: FORCED TO CONTINUE (emissions have
@@ -62 +62 @@
 !
       ierr = NF_OPEN ("sulphur_emissions_antro.nc", NF_NOWRITE, nid)
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_antro'
         write(6,*)' ierr = ', ierr
@@ -72 +72 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2FF_LOW", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais,lmt_so2b_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2b_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 low'
         print *,'JE klon, jour, debut ,epais ',klon_glo,jour,debut,epais
@@ -84 +84 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2FF_HIGH", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais,lmt_so2h_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2h_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 high'
         CALL exit(1)
@@ -93 +93 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2BBH", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, 
-     . epais, lmt_so2bb_h_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid,  lmt_so2bb_h_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 BB high'
         CALL exit(1)
@@ -103 +102 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2BBL", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, 
-     . epais, lmt_so2bb_l_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid,  lmt_so2bb_l_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 BB low'
         CALL exit(1)
@@ -113 +111 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2BA", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut,epais,lmt_so2ba_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2ba_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 ship'
         CALL exit(1)
@@ -122 +120 @@
 !
       ierr = NF_INQ_VARID (nid, "SO2NFF", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais,
-     .  lmt_so2nff_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2nff_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
         PRINT*, 'Pb de lecture pour les sources so2 non FF'
         CALL exit(1)
@@ -135 +132 @@
 !=======================================================================
       ierr = NF_OPEN ("sulphur_emissions_nat.nc", NF_NOWRITE, nid)
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_nat'
         write(6,*)' ierr = ', ierr
@@ -144 +141 @@
 c
       ierr = NF_INQ_VARID (nid, "DMSB", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid,debut,epais,lmt_dmsbio_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsbio_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources dms bio'
          CALL exit(1)
@@ -153 +150 @@
 c
       ierr = NF_INQ_VARID (nid, "H2SB", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid,debut,epais,lmt_h2sbio_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_h2sbio_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources h2s bio'
          CALL exit(1)
@@ -161 +158 @@
 c Ocean surface concentration of dms (emissions are computed later)
 c
-      IF (flag_dms.EQ.4) THEN 
+      IF (flag_dms==4) THEN
 c
       ierr = NF_INQ_VARID (nid, "DMSC2", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid,nvarid,debut,epais,lmt_dmsconc_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_dmsconc_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources dms conc 2'
          CALL exit(1)
@@ -190 +187 @@
       print *,' Jour = ',jour
       ierr = NF_OPEN ("sulphur_emissions_volc.nc", NF_NOWRITE, nid)
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
         write(6,*)' Pb d''ouverture du fichier sulphur_emissions_volc'
         write(6,*)' ierr = ', ierr
@@ -200 +197 @@
 !      ierr = NF_INQ_VARID (nid, "VOLC", nvarid)
       ierr = NF_INQ_VARID (nid, "flx_volc_cont", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais, 
-     .                           lmt_so2volc_cont_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2volc_cont_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources so2 volcan (cont)'
          CALL exit(1)
@@ -214 +210 @@
 !      ierr = NF_INQ_VARID (nid, "ALTI", nvarid)
       ierr = NF_INQ_VARID (nid, "flx_volc_altcont", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais, 
-     .                           lmt_altvolc_cont_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_altvolc_cont_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les altitudes volcan (cont)'
          CALL exit(1)
@@ -224 +219 @@
 c
       ierr = NF_INQ_VARID (nid, "flx_volc_expl", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais, 
-     .                           lmt_so2volc_expl_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_so2volc_expl_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les sources so2 volcan (expl)'
          CALL exit(1)
@@ -237 +231 @@
 c
       ierr = NF_INQ_VARID (nid, "flx_volc_altexpl", nvarid)
-      ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debut, epais, 
-     .                           lmt_altvolc_expl_glo)
-      IF (ierr .NE. NF_NOERR) THEN
+      ierr = nf90_get_var(nid, nvarid, lmt_altvolc_expl_glo, debut, epais)
+      IF (ierr /= NF_NOERR) THEN
          PRINT*, 'Pb de lecture pour les altitudes volcan'
          CALL exit(1)

LMDZ6/trunk/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 netcdf, ONLY: nf90_fill_real
+    USE lmdz_netcdf, ONLY: nf90_fill_real
     ! ug Pour les sorties XIOS
     USE lmdz_xios, ONLY: xios_update_calendar, using_xios

LMDZ6/trunk/libf/phylmd/Dust/phytracr_spl_mod.F90

@@ -1441 +1441 @@
        call abort_gcm('phytracr_mod', 'pb in ok_chimdust 1 SCDU',1)
           endif
-          if ( (id_codu .le. 0) .or. ( id_fine.le.0)  ) then  
+          if ( (id_codu <= 0) .or. ( id_fine<=0)  ) then
           call abort_gcm('phytracr_mod', 'pb in ok_chimdust 1',1) 
           endif
@@ -2437 +2437 @@
       ENDDO
       ENDDO
-      IF (iflag_conv.EQ.2) THEN
+      IF (iflag_conv==2) THEN
 ! Tiedke
       CALL cltrac_spl(pdtphys,coefh,yu1,yv1,t_seri,tmp_var,  &
                  aux_var2,paprs,pplay,aux_var3)
 
-      ELSE IF (iflag_conv.GE.3) THEN
+      ELSE IF (iflag_conv>=3) THEN
 !KE
       CALL cltrac(pdtphys, coefh,t_seri,tmp_var,aux_var2,paprs,pplay,  &
@@ -2494 +2494 @@
 
 
-      IF (iflag_conv.GE.3) THEN
+      IF (iflag_conv>=3) THEN
 
       IF (logitime) THEN
@@ -2786 +2786 @@
 
 
-      IF (iflag_conv.EQ.2) THEN
+      IF (iflag_conv==2) THEN
 
       IF (logitime) THEN
@@ -2839 +2839 @@
       print *,'iflag_conv bef incloud',iflag_conv
 
-        IF (iflag_conv.EQ.2) THEN
+        IF (iflag_conv==2) THEN
 ! Tiedke
       CALL incloud_scav(.false.,qmin,qmax,masse,henry,kk,prfl,          &
@@ -2877 +2877 @@
 !     .                                  his_dhbclsc,his_dhbccon,tr_seri)
 
-        IF (iflag_conv.EQ.2) THEN
+        IF (iflag_conv==2) THEN
 ! Tiedke
 
@@ -2991 +2991 @@
 !     .                                                 dtrconv,tr_seri)
 ! -------------------------------------------------------------     
-        IF (iflag_conv.EQ.2) THEN
+        IF (iflag_conv==2) THEN
 ! Tiedke
          CALL trconvect(pplay,t_seri,pdtphys,pmfu,pmfd,pen_u,pde_u,  &
@@ -3000 +3000 @@
          ENDDO
 
-        ELSE IF (iflag_conv.GE.3) THEN
+        ELSE IF (iflag_conv>=3) THEN
 ! KE
          print *,'JE: KE in phytracr_spl'
@@ -3164 +3164 @@
 
 
-       IF (iflag_conv.GE.3) THEN
+       IF (iflag_conv>=3) THEN
        IF (logitime) THEN
        CALL SYSTEM_CLOCK(COUNT=clock_start)
@@ -3195 +3195 @@
        ql_incl = ql_incloud_ref
 ! choix du lessivage
-      IF (iflag_lscav .EQ. 3 .OR. iflag_lscav .EQ. 4) THEN
+      IF (iflag_lscav == 3 .OR. iflag_lscav == 4) THEN
       !IF (.false.) THEN  ! test #DFB (Binta) sans lsc_scav_spl
         print *,'JE iflag_lscav',iflag_lscav
@@ -3362 +3362 @@
       CALL satellite_out_spla(jD_cur,jH_cur,pdtphys,rlat,rlon,   &
                               masque_aqua_cur, masque_terra_cur )
-      IF (jH_cur-pdtphys/86400. .LT. 0.) THEN
+      IF (jH_cur-pdtphys/86400. < 0.) THEN
        !new utc day: put in 0 everything
 !JE20150518<<
@@ -3470 +3470 @@
       ENDDO
 
-      IF (jH_cur+pdtphys/86400. .GE. 1.) THEN  
+      IF (jH_cur+pdtphys/86400. >= 1.) THEN
 !          print *,'last step of the day'
           DO i=1,klon
-               IF (masque_aqua(i).GT. 0) THEN
+               IF (masque_aqua(i)> 0) THEN
                    aod550_aqua(i)=aod550_aqua(i)/masque_aqua(i)
                    aod670_aqua(i)=aod670_aqua(i)/masque_aqua(i)
@@ -3506 +3506 @@
                    aod865_dustsco_aqua(i)= -999.
                ENDIF
-               IF (masque_terra(i).GT. 0) THEN
+               IF (masque_terra(i)> 0) THEN
                    aod550_terra(i)=aod550_terra(i)/masque_terra(i)
                    aod670_terra(i)=aod670_terra(i)/masque_terra(i)
@@ -3635 +3635 @@
       fluxss(:)=0.0
       DO i=1, klon
-         IF (iregion_ind(i).GT.0) THEN           ! LAND
+         IF (iregion_ind(i)>0) THEN           ! LAND
            ! SULFUR EMISSIONS
            fluxh2sff(i)= (lmt_so2ff_l(i)+lmt_so2ff_h(i))*frach2sofso2*  &       
@@ -3656 +3656 @@
            fluxff(i)=fluxbcff(i)+fluxomff(i)
          ENDIF
-         IF (iregion_bb(i).GT.0) THEN           ! LAND
+         IF (iregion_bb(i)>0) THEN           ! LAND
            ! SULFUR EMISSIONS
            fluxso2bb(i) =scale_param_bb(iregion_bb(i)) * fracso2emis *  &
@@ -4515 +4515 @@
       ENDIF
 
-      IF (test_sca .EQ. 0 ) THEN
+      IF (test_sca == 0 ) THEN
         ! READ file!!
         call read_scalenc(filescaleparams,paramname_ind,            &
@@ -4556 +4556 @@
 
       jH_sca=jH_sca+pdtphys/(24.*3600.)
-      IF (jH_sca.GT.(sca_resol)/24.) THEN
+      IF (jH_sca>(sca_resol)/24.) THEN
           test_sca=0
           jH_sca=jH_ini
@@ -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
       IMPLICIT NONE
-
-      include "netcdf.inc"
 
       CHARACTER*800 filescaleparams
@@ -4589 +4588 @@
           !nci=NCOPN(trim(adjustl(filescaleparams)),NCNOWRIT,rcode)
          ierr = NF_OPEN (trim(adjustl(filescaleparams)),NF_NOWRITE, nid)
-          if (ierr .EQ. NF_NOERR) THEN
+          if (ierr == NF_NOERR) THEN
           debutread=step_sca
           countread=1
@@ -4598 +4597 @@
             print *,varname
             ierr = NF_INQ_VARID (nid,trim(adjustl(varname)), nvarid)
-            ierr = NF_GET_VARA_DOUBLE (nid, nvarid, debutread,          &
-                         countread, auxreal)
-            IF (ierr .NE. NF_NOERR) THEN
+            ierr = nf90_get_var (nid, nvarid, auxreal, debutread, countread)
+            IF (ierr /= NF_NOERR) THEN
              PRINT*, 'Pb de lecture pour modvalues'
        print *,'JE  scale_var, step_sca',trim(adjustl(varname)),step_sca

LMDZ6/trunk/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
       IMPLICIT NONE 
 c
       INCLUDE "dimensions.h"
       INCLUDE "paramet.h"
-      INCLUDE "netcdf.inc"
 c
       INTEGER step, nbjour
@@ -45 +45 @@
 c
       start(3)=step
-c
-!      status=NF_GET_VARA_DOUBLE(ncid1,varid1,start,count,dust_nc)
+
       status=nf90_get_var(ncid1,varid1,dust_nc_glo,start,count)
-c
+
 !      call correctbid(iim,jjp1,dust_nc)
       call correctbid(nbp_lon,nbp_lat,dust_nc_glo)

LMDZ6/trunk/libf/phylmd/Dust/read_surface.F90

@@ -10 +10 @@
        USE mod_phys_lmdz_para
        USE iophy
-!       USE netcdf
+       USE lmdz_netcdf, ONLY:nf_inq_varid,nf_noerr,nf90_get_var
        IMPLICIT NONE
 
-       INCLUDE "netcdf.inc"
        INCLUDE "dimensions.h"
        INCLUDE "paramet.h"

LMDZ6/trunk/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 write_field_phy
       IMPLICIT NONE 
@@ -8 +9 @@
 c       INCLUDE "dimphy.h"
       INCLUDE "paramet.h"
-      INCLUDE "netcdf.inc"
 c
       INTEGER step, nbjour

LMDZ6/trunk/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 netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+  USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
   USE mod_grid_phy_lmdz

LMDZ6/trunk/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 netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+  USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
   USE mod_grid_phy_lmdz
@@ -79 +79 @@
 !
   
-  IF (debutphy .OR. mth_cur .NE. mth_pre) THEN
+  IF (debutphy .OR. mth_cur /= mth_pre) THEN
      
 !--preparation of global fields

LMDZ6/trunk/libf/phylmd/condsurf.F90

@@ -7 +7 @@
   USE indice_sol_mod
   USE time_phylmdz_mod, ONLY: annee_ref
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_get_var,nf_open,nf_inq_varid,nf_noerr,nf_close,nf_nowrite
   IMPLICIT NONE
 

LMDZ6/trunk/libf/phylmd/create_etat0_unstruct_mod.F90

@@ -23 +23 @@
   SUBROUTINE init_create_etat0_unstruct
   USE lmdz_xios
-  USE netcdf
+  USE lmdz_netcdf, ONLY: NF90_NOWRITE,nf90_close,nf90_noerr,nf90_open
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -126 +126 @@
       CALL xios_recv_field("qs",qsol_mpi)
       CALL xios_recv_field("mask",zmasq_mpi)
-      IF (landice_opt .LT. 2) CALL xios_recv_field("landice",lic_mpi)
+      IF (landice_opt < 2) CALL xios_recv_field("landice",lic_mpi)
     ENDIF
     CALL scatter_omp(tsol_mpi,tsol)
     CALL scatter_omp(qsol_mpi,qsol)
     CALL scatter_omp(zmasq_mpi,zmasq)
-    IF (landice_opt .LT. 2) CALL scatter_omp(lic_mpi,lic)
+    IF (landice_opt < 2) CALL scatter_omp(lic_mpi,lic)
 
     radsol(:)   = 0.0
@@ -143 +143 @@
 
     pctsrf(:,:) = 0
-    IF (landice_opt .LT. 2) THEN
+    IF (landice_opt < 2) THEN
        pctsrf(:,is_lic)=lic
        WHERE(pctsrf(:,is_lic)<EPSFRA) pctsrf(:,is_lic)=0.
@@ -180 +180 @@
   !--- The ocean and sea-ice fractions are not changed.
   !--- This option is only available if landice_opt<2.   
-  IF (landice_opt .LT. 2) THEN
+  IF (landice_opt < 2) THEN
      no_ter_antartique=.FALSE.
      CALL getin_p('no_ter_antartique',no_ter_antartique)

LMDZ6/trunk/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
 
       IMPLICIT NONE
@@ -682 +683 @@
       include "dimensions.h"
 !!#include "control.h"
-      include "netcdf.inc"
 
 !   Arguments:
@@ -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
 
       IMPLICIT NONE
@@ -829 +830 @@
       include "dimensions.h"
 !!#include "control.h"
-      include "netcdf.inc"
 
 !   Arguments:

LMDZ6/trunk/libf/phylmd/dyn1d/1D_decl_cases.h

@@ -1 @@
-        INCLUDE "netcdf.inc"
 
 ! Declarations specifiques au cas Toga

LMDZ6/trunk/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
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !Declarations specifiques au cas AMMA
@@ -6 +7 @@
 ! Option du cas AMMA ou on impose la discretisation verticale (Ap,Bp)
         integer nlev_amma, nt_amma
-
 
         integer year_ini_amma, day_ini_amma, mth_ini_amma
@@ -58 +58 @@
 SUBROUTINE read_1D_cases
       implicit none
-
-      INCLUDE "netcdf.inc"
 
       INTEGER nid,rid,ierr
@@ -172 +170 @@
 
 
-END MODULE mod_1D_amma_read
 !=====================================================================
       subroutine read_amma(nid,nlevel,ntime                          &
@@ -180 +177 @@
 !program reading forcings of the AMMA case study
       implicit none
-      INCLUDE "netcdf.inc"
 
       integer ntime,nlevel
@@ -459 +455 @@
         END
 
+END MODULE mod_1D_amma_read

LMDZ6/trunk/libf/phylmd/dyn1d/mod_1D_cases_read.F90

@@ -1 @@
-!
-! $Id$
-!
 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
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !Declarations specifiques au cas standard
         character*80 :: fich_cas
-! Discr?tisation 
+! Discr?tisation
         integer nlev_cas, nt_cas
 
@@ -57 +56 @@
         real, allocatable::  q_prof_cas(:)
         real, allocatable::  u_prof_cas(:)
-        real, allocatable::  v_prof_cas(:)        
+        real, allocatable::  v_prof_cas(:)
 
         real, allocatable::  vitw_prof_cas(:)
@@ -82 +81 @@
 
         real lat_prof_cas,sens_prof_cas,ts_prof_cas,ustar_prof_cas
-      
+
 
 
@@ -88 +87 @@
 
 SUBROUTINE read_1D_cas
-      implicit none
-
-      INCLUDE "netcdf.inc"
 
       INTEGER nid,rid,ierr
@@ -137 +133 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !profils moyens:
-        allocate(plev_cas(nlev_cas,nt_cas))        
+        allocate(plev_cas(nlev_cas,nt_cas))
         allocate(z_cas(nlev_cas,nt_cas))
         allocate(t_cas(nlev_cas,nt_cas),q_cas(nlev_cas,nt_cas),rh_cas(nlev_cas,nt_cas))
@@ -204 +200 @@
 !profils environnementaux:
         deallocate(plev_cas)
-        
+
         deallocate(z_cas)
         deallocate(t_cas,q_cas,rh_cas)
@@ -210 +206 @@
         deallocate(u_cas)
         deallocate(v_cas)
-        
+
 !forcing
         deallocate(ht_cas,vt_cas,dt_cas,dtrad_cas)
@@ -257 +253 @@
 END SUBROUTINE deallocate_1D_cases
 
-
-END MODULE mod_1D_cases_read
-!=====================================================================
+  !=====================================================================
       subroutine read_cas(nid,nlevel,ntime                          &
      &     ,zz,pp,temp,qv,rh,theta,rv,u,v,ug,vg,w,                   &
@@ -266 +260 @@
 
 !program reading forcing of the case study
-      implicit none
-      INCLUDE "netcdf.inc"
 
       integer ntime,nlevel
@@ -296 +288 @@
       integer var3didin(nbvar3d)
 
-       ierr=NF_INQ_VARID(nid,"zz",var3didin(1)) 
+       ierr=NF_INQ_VARID(nid,"zz",var3didin(1))
          if(ierr/=NF_NOERR) then
            write(*,*) NF_STRERROR(ierr)
            stop 'lev'
          endif
-      
-      ierr=NF_INQ_VARID(nid,"pp",var3didin(2)) 
+
+      ierr=NF_INQ_VARID(nid,"pp",var3didin(2))
          if(ierr/=NF_NOERR) then
            write(*,*) NF_STRERROR(ierr)
@@ -429 +421 @@
            stop 'advq'
          endif
-      
+
       ierr=NF_INQ_VARID(nid,"hq",var3didin(23))
          if(ierr/=NF_NOERR) then
@@ -465 +457 @@
            stop 'advr'
          endif
-      
+
       ierr=NF_INQ_VARID(nid,"hr",var3didin(29))
          if(ierr/=NF_NOERR) then
@@ -531 +523 @@
            stop 'q2'
          endif
- 
+
          ierr = nf90_get_var(nid,var3didin(1),zz)
          if(ierr/=NF_NOERR) then
@@ -560 +552 @@
          endif
 !          write(*,*)'lecture qv ok',qv
- 
+
          ierr = nf90_get_var(nid,var3didin(5),rh)
          if(ierr/=NF_NOERR) then
@@ -807 +799 @@
 
 
-         return 
+         return
          end subroutine read_cas
 !======================================================================
@@ -825 +817 @@
      &         ,hq_prof_cas,vq_prof_cas,lat_prof_cas,sens_prof_cas    &
      &         ,ustar_prof_cas,uw_prof_cas,vw_prof_cas,q1_prof_cas,q2_prof_cas)
-          
+
 
         implicit none
@@ -834 +826 @@
 ! day: current julian day (e.g. 717538.2)
 ! day1: first day of the simulation
-! nt_cas: total nb of data in the forcing 
+! nt_cas: total nb of data in the forcing
 ! pdt_cas: total time interval (in sec) between 2 forcing data
 !---------------------------------------------------------------------------------------
@@ -926 +918 @@
        it_cas1=INT(timeit/pdt_cas)+1
        IF (it_cas1 == nt_cas) THEN
-       it_cas2=it_cas1 
+       it_cas2=it_cas1
        ELSE
        it_cas2=it_cas1 + 1
@@ -952 +944 @@
 
        lat_prof_cas = lat_cas(it_cas2)                                       &
-     &          -frac*(lat_cas(it_cas2)-lat_cas(it_cas1)) 
+     &          -frac*(lat_cas(it_cas2)-lat_cas(it_cas1))
        sens_prof_cas = sens_cas(it_cas2)                                     &
      &          -frac*(sens_cas(it_cas2)-sens_cas(it_cas1))
@@ -1017 +1009 @@
 
 !**********************************************************************************************
+END MODULE mod_1D_cases_read

LMDZ6/trunk/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
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   !Declarations specifiques au cas standard
@@ -81 +82 @@
     implicit none
 
-    INCLUDE "netcdf.inc"
-
     INTEGER nid,rid,ierr
     INTEGER ii,jj
@@ -90 +89 @@
     ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
     print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr.NE.NF_NOERR) then
+    if (ierr/=NF_NOERR) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
        write(*,*) NF_STRERROR(ierr)
@@ -97 +96 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
@@ -104 +103 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
@@ -111 +110 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension zz'
     ENDIF
@@ -120 +119 @@
     print*,'nid,rid',nid,rid
     nt_cas=0
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        stop 'probleme lecture dimension sens'
     ENDIF
@@ -192 +191 @@
     implicit none
 
-    INCLUDE "netcdf.inc"
-
     INTEGER nid,rid,ierr
     INTEGER ii,jj
@@ -201 +198 @@
     ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
     print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr.NE.NF_NOERR) then
+    if (ierr/=NF_NOERR) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
        write(*,*) NF_STRERROR(ierr)
@@ -208 +205 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
@@ -215 +212 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
@@ -222 +219 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'nlev',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
@@ -230 +227 @@
     ierr=NF_INQ_DIMID(nid,'time',rid)
     nt_cas=0
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
@@ -317 +314 @@
   !**********************************************************************************************
   SUBROUTINE old_read_SCM_cas
-    use netcdf, only: nf90_get_var
     implicit none
 
-    INCLUDE "netcdf.inc"
     INCLUDE "date_cas.h"
 
@@ -331 +326 @@
     ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
     print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr.NE.NF_NOERR) then
+    if (ierr/=NF_NOERR) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
        write(*,*) NF_STRERROR(ierr)
@@ -338 +333 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
@@ -345 +340 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
@@ -352 +347 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
@@ -364 +359 @@
     ierr=NF_INQ_DIMID(nid,'time',rid)
     nt_cas=0
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
@@ -533 +528 @@
 
 
-END MODULE mod_1D_cases_read2
 !=====================================================================
 subroutine read_cas2(nid,nlevel,ntime                          &
@@ -541 +535 @@
 
   !program reading forcing of the case study
-  use netcdf, only: nf90_get_var
   implicit none
-  INCLUDE "netcdf.inc"
 
   integer ntime,nlevel
@@ -589 +581 @@
   do i=1,nbvar3d
      print *,'Dans read_cas2, on va lire ',var3didin(i),name_var(i)
-     if(i.LE.35) then
+     if(i<=35) then
         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)
@@ -658 +650 @@
 
   !program reading forcing of the case study
-  use netcdf, only: nf90_get_var
   implicit none
-  INCLUDE "netcdf.inc"
 
   integer ntime,nlevel
@@ -711 +701 @@
      else
         !-----------------------------------------------------------------------
-        if(i.LE.4) then     ! Lecture des coord pression en (nlevelp1,lat,lon)
+        if(i<=4) then     ! Lecture des coord pression en (nlevelp1,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),apbp, count = [1, 1, nlevel + 1])
            print *,'read2_cas(apbp), on a lu ',i,name_var(i)
@@ -719 +709 @@
            endif
            !-----------------------------------------------------------------------
-        else if(i.gt.4.and.i.LE.45) then   ! Lecture des variables en (time,nlevel,lat,lon)
+        else if(i>4.and.i<=45) then   ! Lecture des variables en (time,nlevel,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),resul, count = [1, 1, nlevel, ntime])
            print *,'read2_cas(resul), on a lu ',i,name_var(i)
@@ -727 +717 @@
            endif
            !-----------------------------------------------------------------------
-        else if (i.gt.45.and.i.LE.51) then   ! Lecture des variables en (time,lat,lon)
+        else if (i>45.and.i<=51) then   ! Lecture des variables en (time,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),resul2, count = [1, 1, ntime])
            print *,'read2_cas(resul2), on a lu ',i,name_var(i)
@@ -829 +819 @@
 
   !program reading forcing of the case study
-  use netcdf, only: nf90_get_var
   implicit none
-  INCLUDE "netcdf.inc"
 
   integer ntime,nlevel,k,t
@@ -888 +876 @@
      else
         !-----------------------------------------------------------------------
-        if(i.LE.4) then     ! Lecture des coord pression en (nlevelp1,lat,lon)
+        if(i<=4) then     ! Lecture des coord pression en (nlevelp1,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),apbp)
            print *,'read2_cas(apbp), on a lu ',i,name_var(i)
@@ -896 +884 @@
            endif
            !-----------------------------------------------------------------------
-        else if(i.gt.4.and.i.LE.12) then   ! Lecture des variables en (time,nlevel,lat,lon)
+        else if(i>4.and.i<=12) then   ! Lecture des variables en (time,nlevel,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),resul1)
            print *,'read2_cas(resul1), on a lu ',i,name_var(i)
@@ -905 +893 @@
            print*,'Lecture de la variable #i ',i,name_var(i),minval(resul1),maxval(resul1)
            !-----------------------------------------------------------------------
-        else if(i.gt.12.and.i.LE.54) then   ! Lecture des variables en (time,nlevel,lat,lon)
+        else if(i>12.and.i<=54) then   ! Lecture des variables en (time,nlevel,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),resul)
            print *,'read2_cas(resul), on a lu ',i,name_var(i)
@@ -914 +902 @@
            print*,'Lecture de la variable #i ',i,name_var(i),minval(resul),maxval(resul)
            !-----------------------------------------------------------------------
-        else if (i.gt.54.and.i.LE.65) then   ! Lecture des variables en (time,lat,lon)
+        else if (i>54.and.i<=65) then   ! Lecture des variables en (time,lat,lon)
            ierr = NF90_GET_VAR(nid,var3didin(i),resul2)
            print *,'read2_cas(resul2), on a lu ',i,name_var(i)
@@ -1148 +1136 @@
 
   it_cas1=INT(timeit/pdt_cas)+1
-  IF (it_cas1 .EQ. nt_cas) THEN
+  IF (it_cas1 == nt_cas) THEN
      it_cas2=it_cas1 
   ELSE
@@ -1157 +1145 @@
   !print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
 
-  if (it_cas1 .gt. nt_cas) then
+  if (it_cas1 > nt_cas) then
      write(*,*) 'PB-stop: day, day_ju_ini_cas,it_cas1, it_cas2, timeit: '            &
           ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit
@@ -1164 +1152 @@
 
   ! time interpolation:
-  IF (it_cas1 .EQ. it_cas2) THEN
+  IF (it_cas1 == it_cas2) THEN
      frac=0.
   ELSE
@@ -1363 +1351 @@
 
   it_cas1=INT(timeit/pdt_cas)+1
-  IF (it_cas1 .EQ. nt_cas) THEN
+  IF (it_cas1 == nt_cas) THEN
      it_cas2=it_cas1 
   ELSE
@@ -1373 +1361 @@
   !print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
 
-  if (it_cas1 .gt. nt_cas) then 
+  if (it_cas1 > nt_cas) then
      write(*,*) 'PB-stop: day, day_ju_ini_cas,it_cas1, it_cas2, timeit: '            &
           ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit
@@ -1380 +1368 @@
 
   ! time interpolation:
-  IF (it_cas1 .EQ. it_cas2) THEN
+  IF (it_cas1 == it_cas2) THEN
      frac=0.
   ELSE
@@ -1475 +1463 @@
 !**********************************************************************************************
 
+END MODULE mod_1D_cases_read2

LMDZ6/trunk/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
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -87 +89 @@
   !**********************************************************************************************
   SUBROUTINE read_SCM_cas
-    use netcdf, only: nf90_get_var
     implicit none
 
-    INCLUDE "netcdf.inc"
     INCLUDE "date_cas.h"
 
@@ -101 +101 @@
     ierr = NF_OPEN(fich_cas,NF_NOWRITE,nid)
     print*,'fich_cas,NF_NOWRITE,nid ',fich_cas,NF_NOWRITE,nid
-    if (ierr.NE.NF_NOERR) then
+    if (ierr/=NF_NOERR) then
        write(*,*) 'ERROR: GROS Pb opening forcings nc file '
        write(*,*) NF_STRERROR(ierr)
@@ -108 +108 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lat',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lat'
     ENDIF
@@ -115 +115 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lon',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension lon'
     ENDIF
@@ -122 +122 @@
     !.......................................................................
     ierr=NF_INQ_DIMID(nid,'lev',rid)
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        print*, 'Oh probleme lecture dimension nlev'
     ENDIF
@@ -134 +134 @@
     ierr=NF_INQ_DIMID(nid,'time',rid)
     nt_cas=0
-    IF (ierr.NE.NF_NOERR) THEN
+    IF (ierr/=NF_NOERR) THEN
        stop 'Oh probleme lecture dimension time'
     ENDIF
@@ -329 +329 @@
 
     !program reading forcing of the case study
-    use netcdf, only: nf90_get_var
     implicit none
-    INCLUDE "netcdf.inc"
     INCLUDE "compar1d.h"
 
@@ -455 +453 @@
           ! Reading variables 1D (N+1) vertical variables (nlevelp1,lat,lon)
           !-----------------------------------------------------------------------
-          if(i.LE.4) then
+          if(i<=4) then
              ierr = NF90_GET_VAR(nid,var3didin(i),apbp)
              print *,'read_SCM(apbp), on a lu ',i,name_var(i)
@@ -466 +464 @@
              !  Reading 1D (N) vertical varialbes    (nlevel,lat,lon)   
              !-----------------------------------------------------------------------
-          else if(i.gt.4.and.i.LE.12) then  
+          else if(i>4.and.i<=12) then
              ierr = NF90_GET_VAR(nid,var3didin(i),resul1)
              print *,'read_SCM(resul1), on a lu ',i,name_var(i)
@@ -479 +477 @@
              !  TBD : seems to be the same as above.
              !-----------------------------------------------------------------------
-          else if(i.gt.12.and.i.LE.61) then
+          else if(i>12.and.i<=61) then
              ierr = NF90_GET_VAR(nid,var3didin(i),resul)
              print *,'read_SCM(resul), on a lu ',i,name_var(i)
@@ -491 +489 @@
              !  Reading 1D time variables (time,lat,lon)
              !-----------------------------------------------------------------------
-          else if (i.gt.62.and.i.LE.75) then
+          else if (i>62.and.i<=75) then
              ierr = NF90_GET_VAR(nid,var3didin(i),resul2)
              print *,'read_SCM(resul2), on a lu ',i,name_var(i)
@@ -777 +775 @@
 
     it_cas1=INT(timeit/pdt_cas)+1
-    IF (it_cas1 .EQ. nt_cas) THEN
+    IF (it_cas1 == nt_cas) THEN
        it_cas2=it_cas1 
     ELSE
@@ -787 +785 @@
     !     print *,'it_cas1,it_cas2,time_cas1,time_cas2=',it_cas1,it_cas2,time_cas1,time_cas2
 
-    if (it_cas1 .gt. nt_cas) then 
+    if (it_cas1 > nt_cas) then
        write(*,*) 'PB-stop: day, day_ju_ini_cas,it_cas1, it_cas2, timeit: '            &
             ,day,day_ju_ini_cas,it_cas1,it_cas2,timeit
@@ -794 +792 @@
 
     ! time interpolation:
-    IF (it_cas1 .EQ. it_cas2) THEN
+    IF (it_cas1 == it_cas2) THEN
        frac=0.
     ELSE
@@ -989 +987 @@
     do l = 1, llm
 
-       if (play(l).ge.plev_prof_cas(nlev_cas)) then
+       if (play(l)>=plev_prof_cas(nlev_cas)) then
 
           mxcalc=l
@@ -996 +994 @@
           k2=0
 
-          if (play(l).le.plev_prof_cas(1)) then
+          if (play(l)<=plev_prof_cas(1)) then
 
              do k = 1, nlev_cas-1
-                if (play(l).le.plev_prof_cas(k).and. play(l).gt.plev_prof_cas(k+1)) then
+                if (play(l)<=plev_prof_cas(k).and. play(l)>plev_prof_cas(k+1)) then
                    k1=k
                    k2=k+1
@@ -1005 +1003 @@
              enddo
 
-             if (k1.eq.0 .or. k2.eq.0) then
+             if (k1==0 .or. k2==0) then
                 write(*,*) 'PB! k1, k2 = ',k1,k2
                 write(*,*) 'l,play(l) = ',l,play(l)/100
@@ -1019 +1017 @@
              t_mod_cas(l)= t_prof_cas(k2) - frac*(t_prof_cas(k2)-t_prof_cas(k1))
              theta_mod_cas(l)= th_prof_cas(k2) - frac*(th_prof_cas(k2)-th_prof_cas(k1))
-             if(theta_mod_cas(l).NE.0) t_mod_cas(l)= theta_mod_cas(l)*(play(l)/100000.)**(RD/RCPD)
+             if(theta_mod_cas(l)/=0) t_mod_cas(l)= theta_mod_cas(l)*(play(l)/100000.)**(RD/RCPD)
              thv_mod_cas(l)= thv_prof_cas(k2) - frac*(thv_prof_cas(k2)-thv_prof_cas(k1))
              thl_mod_cas(l)= thl_prof_cas(k2) - frac*(thl_prof_cas(k2)-thl_prof_cas(k1))
@@ -1068 +1066 @@
              t_mod_cas(l)= frac1*t_prof_cas(k1) - frac2*t_prof_cas(k2)
              theta_mod_cas(l)= frac1*th_prof_cas(k1) - frac2*th_prof_cas(k2)
-             if(theta_mod_cas(l).NE.0) t_mod_cas(l)= theta_mod_cas(l)*(play(l)/100000.)**(RD/RCPD)
+             if(theta_mod_cas(l)/=0) t_mod_cas(l)= theta_mod_cas(l)*(play(l)/100000.)**(RD/RCPD)
              thv_mod_cas(l)= frac1*thv_prof_cas(k1) - frac2*thv_prof_cas(k2)
              thl_mod_cas(l)= frac1*thl_prof_cas(k1) - frac2*thl_prof_cas(k2)
@@ -1165 +1163 @@
     do l = 1, llm+1
 
-       if (plev(l).ge.plev_prof_cas(nlev_cas)) then
+       if (plev(l)>=plev_prof_cas(nlev_cas)) then
 
           mxcalc=l
@@ -1171 +1169 @@
           k2=0
 
-          if (plev(l).le.plev_prof_cas(1)) then
+          if (plev(l)<=plev_prof_cas(1)) then
 
              do k = 1, nlev_cas-1
-                if (plev(l).le.plev_prof_cas(k).and. plev(l).gt.plev_prof_cas(k+1)) then
+                if (plev(l)<=plev_prof_cas(k).and. plev(l)>plev_prof_cas(k+1)) then
                    k1=k
                    k2=k+1
@@ -1180 +1178 @@
              enddo
 
-             if (k1.eq.0 .or. k2.eq.0) then
+             if (k1==0 .or. k2==0) then
                 write(*,*) 'PB! k1, k2 = ',k1,k2
                 write(*,*) 'l,plev(l) = ',l,plev(l)/100

LMDZ6/trunk/libf/phylmd/dyn1d/old_1DUTILS_read_interp.h

@@ -146 +146 @@
 !program reading forcings of the TWP-ICE experiment
 
-        use netcdf, only: nf90_get_var
+        use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
+            nf_inq_dimid,nf_inq_dimlen
+
 
       implicit none
-
-      INCLUDE "netcdf.inc"
 
       integer ntime,nlevel
@@ -492 +492 @@
          subroutine catchaxis(nid,ttm,llm,time,lev,ierr)
 
-         use netcdf, only: nf90_get_var
+         use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
+            nf_inq_dimid,nf_inq_dimlen
 
          implicit none
-         INCLUDE "netcdf.inc"
          integer nid,ttm,llm
          real*8 time(ttm)
@@ -2170 +2170 @@
 
 
-      use netcdf, only: nf90_get_var
+      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
+            nf_inq_dimid,nf_inq_dimlen
       implicit none
-
-      INCLUDE "netcdf.inc"
 
       integer ntime,nlevel
@@ -2381 +2380 @@
 !program reading initial profils and forcings of the Dice case study
 
-      use netcdf, only: nf90_get_var
+      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
+            nf_inq_dimid,nf_inq_dimlen
 
       implicit none
 
-      INCLUDE "netcdf.inc"
       INCLUDE "YOMCST.h"
 
@@ -2715 +2714 @@
 !program reading initial profils and forcings of the Gabls4 case study
 
-      use netcdf, only: nf90_get_var
+      use lmdz_netcdf, ONLY: nf_open,nf_nowrite,nf_noerr,nf_strerror,nf_inq_varid,nf90_get_var,&
+            nf_inq_dimid,nf_inq_dimlen
 
       implicit none
-
-      INCLUDE "netcdf.inc"
 
       integer ntime,nlevel,nsol

LMDZ6/trunk/libf/phylmd/dyn1d/old_1D_decl_cases.h

@@ -1 @@
-         INCLUDE "netcdf.inc"
 
 ! Declarations specifiques au cas Toga

LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.F90

@@ -44 +44 @@
    USE temps_mod, ONLY: annee_ref, calend, day_end, day_ini, day_ref, &
                         itau_dyn, itau_phy, start_time, year_len
-   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len 
+   USE phys_cal_mod, ONLY : year_len_phys_cal_mod => year_len
+   USE mod_1D_cases_read, ONLY: interp_case_time ! used in included old_1D_read_forc_cases.h
+
 
       implicit none
@@ -366 +368 @@
       if (forcing_type <=0) THEN
        forcing_les = .true.
-      elseif (forcing_type .eq.1) THEN
+      elseif (forcing_type ==1) THEN
        forcing_radconv = .true.
-      elseif (forcing_type .eq.2) THEN
+      elseif (forcing_type ==2) THEN
        forcing_toga    = .true.
-      elseif (forcing_type .eq.3) THEN
+      elseif (forcing_type ==3) THEN
        forcing_GCM2SCM = .true.
-      elseif (forcing_type .eq.4) THEN
+      elseif (forcing_type ==4) THEN
        forcing_twpice = .true.
-      elseif (forcing_type .eq.5) THEN
+      elseif (forcing_type ==5) THEN
        forcing_rico = .true.
-      elseif (forcing_type .eq.6) THEN
+      elseif (forcing_type ==6) THEN
        forcing_amma = .true.
-      elseif (forcing_type .eq.7) THEN
+      elseif (forcing_type ==7) THEN
        forcing_dice = .true.
-      elseif (forcing_type .eq.8) THEN
+      elseif (forcing_type ==8) THEN
        forcing_gabls4 = .true.
-      elseif (forcing_type .eq.101) THEN ! Cindynamo starts 1-10-2011 0h
+      elseif (forcing_type ==101) THEN ! Cindynamo starts 1-10-2011 0h
        forcing_case = .true.
        year_ini_cas=2011
@@ -389 +391 @@
        heure_ini_cas=0.
        pdt_cas=3*3600.         ! forcing frequency
-      elseif (forcing_type .eq.102) THEN ! Bomex starts 24-6-1969 0h
+      elseif (forcing_type ==102) THEN ! Bomex starts 24-6-1969 0h
        forcing_case = .true.
        year_ini_cas=1969
@@ -396 +398 @@
        heure_ini_cas=0.
        pdt_cas=1800.         ! forcing frequency
-      elseif (forcing_type .eq.103) THEN ! Arm_cu starts 21-6-1997 11h30
+      elseif (forcing_type ==103) THEN ! Arm_cu starts 21-6-1997 11h30
        forcing_case2 = .true.
        year_ini_cas=1997
@@ -403 +405 @@
        heure_ini_cas=11.5
        pdt_cas=1800.         ! forcing frequency
-      elseif (forcing_type .eq.104) THEN ! rico starts 16-12-2004 0h
+      elseif (forcing_type ==104) THEN ! rico starts 16-12-2004 0h
        forcing_case2 = .true.
        year_ini_cas=2004
@@ -410 +412 @@
        heure_ini_cas=0.
        pdt_cas=1800.         ! forcing frequency
-      elseif (forcing_type .eq.105) THEN ! bomex starts 16-12-2004 0h
+      elseif (forcing_type ==105) THEN ! bomex starts 16-12-2004 0h
        forcing_case2 = .true.
        year_ini_cas=1969
@@ -417 +419 @@
        heure_ini_cas=0.
        pdt_cas=1800.         ! forcing frequency
-      elseif (forcing_type .eq.106) THEN ! ayotte_24SC starts 6-11-1992 0h
+      elseif (forcing_type ==106) THEN ! ayotte_24SC starts 6-11-1992 0h
        forcing_case2 = .true.
        year_ini_cas=1992
@@ -424 +426 @@
        heure_ini_cas=10.
        pdt_cas=86400.        ! forcing frequency
-      elseif (forcing_type .eq.113) THEN ! Arm_cu starts 21-6-1997 11h30
+      elseif (forcing_type ==113) THEN ! Arm_cu starts 21-6-1997 11h30
        forcing_SCM = .true.
        year_ini_cas=1997
@@ -432 +434 @@
        mth_ini_cas=1 ! pour le moment on compte depuis le debut de l'annee
        call getin('time_ini',heure_ini_cas)
-      elseif (forcing_type .eq.40) THEN
+      elseif (forcing_type ==40) THEN
        forcing_GCSSold = .true.
-      elseif (forcing_type .eq.50) THEN
+      elseif (forcing_type ==50) THEN
        forcing_fire = .true.
-      elseif (forcing_type .eq.59) THEN
+      elseif (forcing_type ==59) THEN
        forcing_sandu   = .true.
-      elseif (forcing_type .eq.60) THEN
+      elseif (forcing_type ==60) THEN
        forcing_astex   = .true.
-      elseif (forcing_type .eq.61) THEN
+      elseif (forcing_type ==61) THEN
        forcing_armcu = .true.
-       IF(llm.NE.19.AND.llm.NE.40) stop 'Erreur nombre de niveaux !!'
+       IF(llm/=19.AND.llm/=40) stop 'Erreur nombre de niveaux !!'
       else
        write (*,*) 'ERROR : unknown forcing_type ', forcing_type
@@ -461 +463 @@
      jcode = iflag_nudge
      do i = 1,nudge_max
-       nudge(i) = mod(jcode,10) .ge. 1
+       nudge(i) = mod(jcode,10) >= 1
        jcode = jcode/10
      enddo
@@ -528 +530 @@
 
 ! Special case for arm_cu which lasts less than one day : 53100s !! (MPL 20111026)
-      IF(forcing_type .EQ. 61) fnday=53100./86400.
-      IF(forcing_type .EQ. 103) fnday=53100./86400.
+      IF(forcing_type == 61) fnday=53100./86400.
+      IF(forcing_type == 103) fnday=53100./86400.
 ! Special case for amma which lasts less than one day : 64800s !! (MPL 20120216)
-      IF(forcing_type .EQ. 6) fnday=64800./86400.
+      IF(forcing_type == 6) fnday=64800./86400.
 !     IF(forcing_type .EQ. 6) fnday=50400./86400.
- IF(forcing_type .EQ. 8 ) fnday=129600./86400. 
+ IF(forcing_type == 8 ) fnday=129600./86400.
       annee_ref = anneeref
       mois = 1
@@ -544 +546 @@
       day_end = day_ini + int(fnday)
 
-      IF (forcing_type .eq.2) THEN
+      IF (forcing_type ==2) THEN
 ! Convert the initial date of Toga-Coare to Julian day
       call ymds2ju                                                          &
      & (year_ini_toga,mth_ini_toga,day_ini_toga,heure,day_ju_ini_toga)
 
-      ELSEIF (forcing_type .eq.4) THEN
+      ELSEIF (forcing_type ==4) THEN
 ! Convert the initial date of TWPICE to Julian day
       call ymds2ju                                                          &
      & (year_ini_twpi,mth_ini_twpi,day_ini_twpi,heure_ini_twpi              &
      & ,day_ju_ini_twpi)
-      ELSEIF (forcing_type .eq.6) THEN
+      ELSEIF (forcing_type ==6) THEN
 ! Convert the initial date of AMMA to Julian day
       call ymds2ju                                                          &
      & (year_ini_amma,mth_ini_amma,day_ini_amma,heure_ini_amma              &
      & ,day_ju_ini_amma)
-      ELSEIF (forcing_type .eq.7) THEN
+      ELSEIF (forcing_type ==7) THEN
 ! Convert the initial date of DICE to Julian day
       call ymds2ju                                                         &
      & (year_ini_dice,mth_ini_dice,day_ini_dice,heure_ini_dice             & 
      & ,day_ju_ini_dice)
- ELSEIF (forcing_type .eq.8 ) THEN
+ ELSEIF (forcing_type ==8 ) THEN
 ! Convert the initial date of GABLS4 to Julian day
       call ymds2ju                                                         &
      & (year_ini_gabls4,mth_ini_gabls4,day_ini_gabls4,heure_ini_gabls4     & 
      & ,day_ju_ini_gabls4)
-      ELSEIF (forcing_type .gt.100) THEN
+      ELSEIF (forcing_type >100) THEN
 ! Convert the initial date to Julian day
       day_ini_cas=day_deb
@@ -577 +579 @@
      & ,day_ju_ini_cas)
       print*,'time case 2',day_ini_cas,day_ju_ini_cas
-      ELSEIF (forcing_type .eq.59) THEN
+      ELSEIF (forcing_type ==59) THEN
 ! Convert the initial date of Sandu case to Julian day
       call ymds2ju                                                          &
@@ -583 +585 @@
      &    time_ini*3600.,day_ju_ini_sandu)
 
-      ELSEIF (forcing_type .eq.60) THEN
+      ELSEIF (forcing_type ==60) THEN
 ! Convert the initial date of Astex case to Julian day
       call ymds2ju                                                          &
@@ -589 +591 @@
      &    time_ini*3600.,day_ju_ini_astex)
 
-      ELSEIF (forcing_type .eq.61) THEN
+      ELSEIF (forcing_type ==61) THEN
 ! Convert the initial date of Arm_cu case to Julian day
       call ymds2ju                                                          &
@@ -596 +598 @@
       ENDIF
 
-      IF (forcing_type .gt.100) THEN
+      IF (forcing_type >100) THEN
       daytime = day + heure_ini_cas/24. ! 1st day and initial time of the simulation 
       ELSE
@@ -638 +640 @@
       call phys_state_var_init(read_climoz)
 
-      if (ngrid.ne.klon) then
+      if (ngrid/=klon) then
          print*,'stop in inifis'
          print*,'Probleme de dimensions :'
@@ -702 +704 @@
       zlay=-rd*300.*log(play/psurf)/rg ! moved after reading profiles
 
-      IF (forcing_type .eq. 59) THEN
+      IF (forcing_type == 59) THEN
 ! pour forcing_sandu, on cherche l'indice le plus proche de 700hpa#3000m
       write(*,*) '***********************'
       do l = 1, llm
        write(*,*) 'l,play(l),presnivs(l): ',l,play(l),presnivs(l)
-       if (trouve_700 .and. play(l).le.70000) then
+       if (trouve_700 .and. play(l)<=70000) then
          llm700=l
          print *,'llm700,play=',llm700,play(l)/100.
@@ -826 +828 @@
         print*,'avant phyredem'
         pctsrf(1,:)=0.
-          if (nat_surf.eq.0.) then
+          if (nat_surf==0.) then
           pctsrf(1,is_oce)=1.
           pctsrf(1,is_ter)=0.
           pctsrf(1,is_lic)=0.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 1) then 
+        else if (nat_surf == 1) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=1.
           pctsrf(1,is_lic)=0.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 2) then 
+        else if (nat_surf == 2) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=0.
           pctsrf(1,is_lic)=1.
           pctsrf(1,is_sic)=0.
-        else if (nat_surf .eq. 3) then 
+        else if (nat_surf == 3) then
           pctsrf(1,is_oce)=0.
           pctsrf(1,is_ter)=0.
@@ -870 +872 @@
         pbl_tke(:,2,:)=1.e-2
         PRINT *, ' pbl_tke dans lmdz1d '
-        if (prt_level .ge. 5) then 
+        if (prt_level >= 5) then
          DO nsrf = 1,4
            PRINT *,'pbl_tke(1,:,',nsrf,') ',pbl_tke(1,:,nsrf)
@@ -1021 +1023 @@
       endif
 !Al1 ================  end restart =================================
-      IF (ecrit_slab_oc.eq.1) then
+      IF (ecrit_slab_oc==1) then
          open(97,file='div_slab.dat',STATUS='UNKNOWN')
-       elseif (ecrit_slab_oc.eq.0) then
+       elseif (ecrit_slab_oc==0) then
          open(97,file='div_slab.dat',STATUS='OLD')
        endif
@@ -1046 +1048 @@
       it_end = nint(fnday*day_step)
 !test JLD     it_end = 10
-      do while(it.le.it_end)
-
-       if (prt_level.ge.1) then
+      do while(it<=it_end)
+
+       if (prt_level>=1) then
          print*,'XXXXXXXXXXXXXXXXXXX ITAP,day,time=',                       &
      &             it,day,time,it_end,day_step
@@ -1054 +1056 @@
        endif
 !Al1 demande de restartphy.nc
-       if (it.eq.it_end) lastcall=.True.
+       if (it==it_end) lastcall=.True.
 
 !---------------------------------------------------------------------
@@ -1149 +1151 @@
 
        if (forcing_toga .or. forcing_GCSSold .or. forcing_twpice            &
-     &    .or.forcing_amma .or. forcing_type.eq.101) then
+     &    .or.forcing_amma .or. forcing_type==101) then
          fcoriolis=0.0 ; ug=0. ; vg=0.
        endif
@@ -1164 +1166 @@
 !on calcule dt_cooling
         do l=1,llm
-        if (play(l).ge.20000.) then
+        if (play(l)>=20000.) then
             dt_cooling(l)=-1.5/86400.
-        elseif ((play(l).ge.10000.).and.((play(l).lt.20000.))) then
+        elseif ((play(l)>=10000.).and.((play(l)<20000.))) then
             dt_cooling(l)=-1.5/86400.*(play(l)-10000.)/(10000.)-1./86400.*(20000.-play(l))/10000.*(temp(l)-200.)
         else
@@ -1273 +1275 @@
      &               +d_q_nudge(1:mxcalc,:) )
 
-        if (prt_level.ge.3) then
+        if (prt_level>=3) then
           print *,                                                          &
      &    'physiq-> temp(1),dt_phys(1),d_t_adv(1),dt_cooling(1) ',         &
@@ -1351 +1353 @@
 
 !Al1
-      if (ecrit_slab_oc.ne.-1) close(97)
+      if (ecrit_slab_oc/=-1) close(97)
 
 !Al1 Call to 1D equivalent of dynredem (an,mois,jour,heure ?)

LMDZ6/trunk/libf/phylmd/grid_noro_m.F90

@@ -435 +435 @@
 ! Purpose: Read parameters usually determined with grid_noro from a file.
 !===============================================================================
-  USE netcdf, ONLY: NF90_OPEN,  NF90_INQ_DIMID, NF90_INQUIRE_DIMENSION,        &
+  USE lmdz_netcdf, ONLY: NF90_OPEN,  NF90_INQ_DIMID, NF90_INQUIRE_DIMENSION,        &
         NF90_NOERR, NF90_CLOSE, NF90_INQ_VARID, NF90_GET_VAR, NF90_STRERROR,   &
         NF90_NOWRITE

LMDZ6/trunk/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
 
   IMPLICIT NONE
 
   INCLUDE "YOMCST.h"
-  INCLUDE 'netcdf.inc'
 
   !--------------------------------------------------------
@@ -168 +169 @@
       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 = nf_get_var_double(ncida, varid, zmida)
+      iret = nf90_get_var(ncida, varid, zmida)
       IF (iret /= NF_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 = nf_get_var_double(ncida, varid, pkm_airpl_glo)
+      iret = nf90_get_var(ncida, varid, pkm_airpl_glo)
       IF (iret /= NF_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 = nf_get_var_double(ncida, varid, ph2o_airpl_glo)
+      iret = nf90_get_var(ncida, varid, ph2o_airpl_glo)
       IF (iret /= NF_NOERR) CALL abort_physic(modname,'problem to read ph2o_airpl file',1)
       ! 
@@ -276 +277 @@
   !
   DO i=1, klon
-   IF (latitude_deg(i).GE.42.0.AND.latitude_deg(i).LE.48.0) THEN 
+   IF (latitude_deg(i)>=42.0.AND.latitude_deg(i)<=48.0) THEN
      flight_m(i,38) = 50000.0  !--5000 m of flight/second in grid cell x 10 scaling
    ENDIF
@@ -412 +413 @@
      pdf_b = pdf_k/(2.*sqrt(2.))
      pdf_e1 = pdf_a+pdf_b
-     IF (abs(pdf_e1).GE.erf_lim) THEN
+     IF (abs(pdf_e1)>=erf_lim) THEN
         pdf_e1 = sign(1.,pdf_e1)
         pdf_N = max(0.,sign(rneb,pdf_e1))
@@ -425 +426 @@
      ! On perd la memoire sur la temperature (sur qvc) pour garder
      ! celle sur alpha_cld
-     IF (pdf_N.GT.1.) THEN
+     IF (pdf_N>1.) THEN
         ! On inverse alpha_cld = int_qvc^infty P(q) dq
         ! pour determiner qvc = f(alpha_cld)
@@ -441 +442 @@
         pdf_a = log(qvc/q)/(pdf_k*sqrt(2.))
         pdf_e1 = pdf_a+pdf_b
-        IF (abs(pdf_e1).GE.erf_lim) THEN
+        IF (abs(pdf_e1)>=erf_lim) THEN
            pdf_e1 = sign(1.,pdf_e1)
         ELSE
@@ -461 +462 @@
         pdf_a = log(qvc*gamma_prec/q)/(pdf_k*sqrt(2.))
         pdf_e2 = pdf_a+pdf_b
-        IF (abs(pdf_e2).GE.erf_lim) THEN
+        IF (abs(pdf_e2)>=erf_lim) THEN
            pdf_e2 = sign(1.,pdf_e2)
         ELSE
@@ -468 +469 @@
         pdf_e2 = 0.5*(1.+pdf_e2) ! integrale sous P pour q > gamma qsat
 
-        IF (abs(pdf_e1-pdf_e2).LT.eps) THEN
+        IF (abs(pdf_e1-pdf_e2)<eps) THEN
            pdf_N1 = pdf_N2
         ELSE
@@ -475 +476 @@
 
         ! Barriere qui traite le cas gamma_prec = 1.
-        IF (pdf_N1.LE.0.) THEN
+        IF (pdf_N1<=0.) THEN
            pdf_N1 = 0.
-           IF (pdf_e2.GT.eps) THEN
+           IF (pdf_e2>eps) THEN
               pdf_N2 = rneb/pdf_e2
            ELSE
@@ -487 +488 @@
      ! Physique 1
      ! Sublimation
-     IF (qvc.LT.qsat) THEN
+     IF (qvc<qsat) THEN
         pdf_a = log(qvc/q)/(pdf_k*sqrt(2.))
         pdf_e1 = pdf_a+pdf_b
-        IF (abs(pdf_e1).GE.erf_lim) THEN
+        IF (abs(pdf_e1)>=erf_lim) THEN
            pdf_e1 = sign(1.,pdf_e1)
         ELSE
@@ -498 +499 @@
         pdf_a = log(qsat/q)/(pdf_k*sqrt(2.))
         pdf_e2 = pdf_a+pdf_b
-        IF (abs(pdf_e2).GE.erf_lim) THEN
+        IF (abs(pdf_e2)>=erf_lim) THEN
            pdf_e2 = sign(1.,pdf_e2)
         ELSE
@@ -516 +517 @@
 
      ! Condensation
-     IF (gamma_ss*qsat.LT.gamma_prec*qvc) THEN
+     IF (gamma_ss*qsat<gamma_prec*qvc) THEN
      
         pdf_a = log(gamma_ss*qsat/q)/(pdf_k*sqrt(2.))
         pdf_e1 = pdf_a+pdf_b
-        IF (abs(pdf_e1).GE.erf_lim) THEN
+        IF (abs(pdf_e1)>=erf_lim) THEN
            pdf_e1 = sign(1.,pdf_e1)
         ELSE
@@ -528 +529 @@
         pdf_a = log(gamma_prec*qvc/q)/(pdf_k*sqrt(2.))
         pdf_e2 = pdf_a+pdf_b
-        IF (abs(pdf_e2).GE.erf_lim) THEN
+        IF (abs(pdf_e2)>=erf_lim) THEN
            pdf_e2 = sign(1.,pdf_e2)
         ELSE
@@ -545 +546 @@
         pdf_a = log(gamma_ss*qsat/q)/(pdf_k*sqrt(2.))
         pdf_e1 = pdf_a+pdf_b
-        IF (abs(pdf_e1).GE.erf_lim) THEN
+        IF (abs(pdf_e1)>=erf_lim) THEN
            pdf_e1 = sign(1.,pdf_e1)
         ELSE
@@ -562 +563 @@
      pdf_a = log(qsat/q)/(pdf_k*sqrt(2.))
      pdf_e1 = pdf_a+pdf_b
-     IF (abs(pdf_e1).GE.erf_lim) THEN
+     IF (abs(pdf_e1)>=erf_lim) THEN
         pdf_e1 = sign(1.,pdf_e1)
      ELSE
@@ -570 +571 @@
 
      pdf_e2 = pdf_a-pdf_b
-     IF (abs(pdf_e2).GE.erf_lim) THEN
+     IF (abs(pdf_e2)>=erf_lim) THEN
         pdf_e2 = sign(1.,pdf_e2)
      ELSE
@@ -584 +585 @@
      pdf_a = log(max(qsat,qvc)/q)/(pdf_k*sqrt(2.))
      pdf_e1 = pdf_a-pdf_b
-     IF (abs(pdf_e1).GE.erf_lim) THEN
+     IF (abs(pdf_e1)>=erf_lim) THEN
         pdf_e1 = sign(1.,pdf_e1)
      ELSE
@@ -592 +593 @@
      pdf_a = log(min(gamma_ss*qsat,gamma_prec*qvc)/q)/(pdf_k*sqrt(2.))
      pdf_e2 = pdf_a-pdf_b
-     IF (abs(pdf_e2).GE.erf_lim) THEN
+     IF (abs(pdf_e2)>=erf_lim) THEN
         pdf_e2 = sign(1.,pdf_e2)
      ELSE
@@ -603 +604 @@
 
      ! Partie 2 (sous condition)
-     IF (gamma_ss*qsat.GT.gamma_prec*qvc) THEN
+     IF (gamma_ss*qsat>gamma_prec*qvc) THEN
         pdf_a = log(gamma_ss*qsat/q)/(pdf_k*sqrt(2.))
         pdf_e1 = pdf_a-pdf_b
-        IF (abs(pdf_e1).GE.erf_lim) THEN
+        IF (abs(pdf_e1)>=erf_lim) THEN
            pdf_e1 = sign(1.,pdf_e1)
         ELSE
@@ -632 +633 @@
 
      ! Physique 2 : Turbulence
-     IF (rneb.GT.eps.AND.rneb.LT.1.-eps) THEN ! rneb != 0 and != 1
+     IF (rneb>eps.AND.rneb<1.-eps) THEN ! rneb != 0 and != 1
        !
        tke = pbl_tke(i,k,is_ave)
@@ -642 +643 @@
        b_tur = (rneb*V_cell/4./PI/N_cld)**(1./3.)
        ! On verifie que la longeur de melange n'est pas trop grande
-       IF (L_tur.GT.b_tur) THEN
+       IF (L_tur>b_tur) THEN
           L_tur = b_tur
        ENDIF
@@ -665 +666 @@
        q_eq = q_eq/(V_env + V_cld)
 
-       IF (q_eq.GT.qsat) THEN
+       IF (q_eq>qsat) THEN
           drnebclr = - V_clr/V_cell
           dqclr = drnebclr*qclr/MAX(eps,rnebclr)
@@ -703 +704 @@
      ! Barrieres
      ! ISSR trop petite
-     IF (rnebss.LT.eps) THEN
+     IF (rnebss<eps) THEN
         rneb = MIN(rneb + rnebss,1.0-eps) !--ajout OB barriere
         qcld = qcld + qss
@@ -711 +712 @@
 
      ! le nuage est trop petit
-     IF (rneb.LT.eps) THEN
+     IF (rneb<eps) THEN
         ! s'il y a une ISSR on met tout dans l'ISSR, sinon dans le
         ! clear sky
-        IF (rnebss.LT.eps) THEN
+        IF (rnebss<eps) THEN
            rnebclr = 1.
            rnebss = 0. !--ajout OB
@@ -749 +750 @@
      !--critical T_LM below which no liquid contrail can form in exhaust
      !Tcontr(i,k) = 226.69+9.43*log(Gcontr-0.053)+0.72*(log(Gcontr-0.053))**2 !--K
-     IF (Gcontr .GT. 0.1) THEN
+     IF (Gcontr > 0.1) THEN
      !
        Tcontr = 226.69+9.43*log(Gcontr-0.053)+0.72*(log(Gcontr-0.053))**2 !--K
@@ -775 +776 @@
        !qcontr2 = eps_w*qcontr / (pplay+eps_w*qcontr)
        !
-       IF (t .LT. Tcontr) THEN !--contrail formation is possible
+       IF (t < Tcontr) THEN !--contrail formation is possible
        !
        !--compute fractions of persistent (P) and non-persistent(N) contrail potential regions
        !!IF (qcontr(i,k).GE.qsat) THEN
-       IF (qcontr2.GE.qsat) THEN
+       IF (qcontr2>=qsat) THEN
          !--none of the unsaturated clear sky is prone for contrail formation
          !!fcontrN(i,k) = 0.0
@@ -787 +788 @@
          pdf_a = log(qsat/q)/(pdf_k*sqrt(2.))
          pdf_e1 = pdf_a+pdf_b
-         IF (abs(pdf_e1).GE.erf_lim) THEN
+         IF (abs(pdf_e1)>=erf_lim) THEN
             pdf_e1 = sign(1.,pdf_e1)
          ELSE
@@ -796 +797 @@
          pdf_a = log(MIN(qcontr2,qvc)/q)/(pdf_k*sqrt(2.))
          pdf_e2 = pdf_a+pdf_b
-         IF (abs(pdf_e2).GE.erf_lim) THEN
+         IF (abs(pdf_e2)>=erf_lim) THEN
             pdf_e2 = sign(1.,pdf_e2)
          ELSE
@@ -807 +808 @@
          pdf_a = log(qsat/q)/(pdf_k*sqrt(2.))
          pdf_e1 = pdf_a+pdf_b
-         IF (abs(pdf_e1).GE.erf_lim) THEN
+         IF (abs(pdf_e1)>=erf_lim) THEN
             pdf_e1 = sign(1.,pdf_e1)
          ELSE
@@ -816 +817 @@
          pdf_a = log(MIN(qcontr2,qvc)/q)/(pdf_k*sqrt(2.))
          pdf_e2 = pdf_a+pdf_b
-         IF (abs(pdf_e2).GE.erf_lim) THEN
+         IF (abs(pdf_e2)>=erf_lim) THEN
             pdf_e2 = sign(1.,pdf_e2)
          ELSE
@@ -827 +828 @@
          pdf_a = log(MAX(qsat,qvc)/q)/(pdf_k*sqrt(2.))
          pdf_e1 = pdf_a+pdf_b
-         IF (abs(pdf_e1).GE.erf_lim) THEN
+         IF (abs(pdf_e1)>=erf_lim) THEN
             pdf_e1 = sign(1.,pdf_e1)
          ELSE
@@ -836 +837 @@
          pdf_a = log(MIN(qcontr2,MIN(gamma_prec*qvc,gamma_ss*qsat))/q)/(pdf_k*sqrt(2.))
          pdf_e2 = pdf_a+pdf_b
-         IF (abs(pdf_e2).GE.erf_lim) THEN
+         IF (abs(pdf_e2)>=erf_lim) THEN
             pdf_e2 = sign(1.,pdf_e2)
          ELSE
@@ -847 +848 @@
          pdf_a = log(gamma_prec*qvc/q)/(pdf_k*sqrt(2.))
          pdf_e1 = pdf_a+pdf_b
-         IF (abs(pdf_e1).GE.erf_lim) THEN
+         IF (abs(pdf_e1)>=erf_lim) THEN
             pdf_e1 = sign(1.,pdf_e1)
          ELSE
@@ -856 +857 @@
          pdf_a = log(MIN(qcontr2,gamma_ss*qsat)/q)/(pdf_k*sqrt(2.))
          pdf_e2 = pdf_a+pdf_b
-         IF (abs(pdf_e2).GE.erf_lim) THEN
+         IF (abs(pdf_e2)>=erf_lim) THEN
             pdf_e2 = sign(1.,pdf_e2)
          ELSE
@@ -875 +876 @@
          pdf_a = log(qcontr2/q)/(pdf_k*sqrt(2.))
          pdf_e1 = pdf_a+pdf_b   !--normalement pdf_b est deja defini
-         IF (abs(pdf_e1).GE.erf_lim) THEN
+         IF (abs(pdf_e1)>=erf_lim) THEN
             pdf_e1 = sign(1.,pdf_e1)
          ELSE
@@ -883 +884 @@
          pdf_a = log(qsat/q)/(pdf_k*sqrt(2.))
          pdf_e2 = pdf_a+pdf_b
-         IF (abs(pdf_e2).GE.erf_lim) THEN
+         IF (abs(pdf_e2)>=erf_lim) THEN
             pdf_e2 = sign(1.,pdf_e2)
          ELSE

LMDZ6/trunk/libf/phylmd/inlandsis/surf_inlandsis_mod.F90

@@ -638 +638 @@
             END DO
 
-            IF (sissnow(ikl) .LE. sn_low) THEN  !add snow
-                IF (isnoSV(ikl).GE.1) THEN
+            IF (sissnow(ikl) <= sn_low) THEN  !add snow
+                IF (isnoSV(ikl)>=1) THEN
                     dzsnSV(ikl, 1) = dzsnSV(ikl, 1) + sn_add / max(ro__SV(ikl, 1), epsi)
                     toicSV(ikl) = toicSV(ikl) - sn_add
@@ -657 +657 @@
             END IF
 
-            IF (sissnow(ikl) .ge. sn_upp) THEN  !thinnen snow layer below
+            IF (sissnow(ikl) >= sn_upp) THEN  !thinnen snow layer below
                 dzsnSV(ikl, 1) = dzsnSV(ikl, 1) / sn_div
                 toicSV(ikl) = toicSV(ikl) + dzsnSV(ikl, 1) * ro__SV(ikl, 1) / sn_div
@@ -1049 +1049 @@
         ! Objet: Lecture du fichier de conditions initiales pour SISVAT
         !======================================================================
-        include "netcdf.inc"
         !    include "indicesol.h"
 
@@ -1118 +1117 @@
 
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("AGESNOW" // str2, &
@@ -1128 +1127 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("DZSNOW" // str2, &
@@ -1138 +1137 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("G2SNOW" // str2, &
@@ -1148 +1147 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("G1SNOW" // str2, &
@@ -1158 +1157 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("ETA" // str2, &
@@ -1168 +1167 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("RO" // str2, &
@@ -1178 +1177 @@
         ENDDO
         DO isn = 1, nsismx
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("TSS" // str2, &
@@ -1188 +1187 @@
         ENDDO
         DO isn = 1, nsno
-            IF (isn.LE.99) THEN
+            IF (isn<=99) THEN
                 WRITE(str2, '(i2.2)') isn
                 CALL get_field("HISTORY" // str2, &
@@ -1287 +1286 @@
         IMPLICIT none
 
-        include "netcdf.inc"
         !    include "indicesol.h"
         !    include "dimsoil.h"
@@ -1403 +1401 @@
 
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "AGESNOW" // str2, &
@@ -1414 +1412 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "DZSNOW" // str2, &
@@ -1425 +1423 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "G2SNOW" // str2, &
@@ -1436 +1434 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "G1SNOW" // str2, &
@@ -1447 +1445 @@
             ENDDO
             DO isn = 1, nsismx
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "ETA" // str2, &
@@ -1458 +1456 @@
             ENDDO
             DO isn = 1, nsismx   !nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "RO" // str2, &
@@ -1469 +1467 @@
             ENDDO
             DO isn = 1, nsismx
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "TSS" // str2, &
@@ -1480 +1478 @@
             ENDDO
             DO isn = 1, nsno
-                IF (isn.LE.99) THEN
+                IF (isn<=99) THEN
                     WRITE(str2, '(i2.2)') isn
                     CALL put_field(pass, "HISTORY" // str2, &

LMDZ6/trunk/libf/phylmd/interfoce_lim.F90

@@ -10 +10 @@
   USE mod_phys_lmdz_para
   USE indice_sol_mod
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_get_var,nf_close,nf_noerr,nf_inq_varid,nf_open,nf_nowrite
   
   IMPLICIT NONE

LMDZ6/trunk/libf/phylmd/iostart.F90

@@ -30 +30 @@
 
   SUBROUTINE Open_startphy(filename)
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_nowrite, nf90_noerr,nf90_open
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -48 +48 @@
 
   SUBROUTINE Close_startphy
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_close
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -61 +61 @@
 
   FUNCTION Inquire_Field(Field_name)
-  USE lmdz_netcdf
+  USE lmdz_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
+  USE lmdz_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
+  USE lmdz_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
+  USE lmdz_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
   USE mod_grid_phy_lmdz, ONLY: klon_glo
@@ -332 +333 @@
   
   SUBROUTINE enddef_restartphy
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_enddef
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -342 +343 @@
 
   SUBROUTINE close_restartphy
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_close
   USE mod_phys_lmdz_para
   IMPLICIT NONE
@@ -385 +386 @@
   
   SUBROUTINE put_field_rgen(pass, field_name,title,field,field_size)
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_def_var,nf90_format,nf90_put_att,nf90_inq_varid,nf90_put_var
   USE dimphy
   USE geometry_mod
@@ -508 +509 @@
 
   SUBROUTINE put_var_rgen(pass, var_name,title,var,var_size)
-  USE lmdz_netcdf
+  USE lmdz_netcdf, ONLY: nf90_format,nf90_def_var,nf90_put_var,nf90_inq_varid,nf90_put_att
   USE dimphy
   USE mod_phys_lmdz_para

LMDZ6/trunk/libf/phylmd/iotd_ecrit.F90

@@ -22 +22 @@
 !=================================================================
  
-      use netcdf, only: nf90_put_var
+      USE lmdz_netcdf, ONLY: nf90_put_var,nf_inq_varid,nf_enddef,nf_redef,nf_sync,nf_noerr,&
+              nf_float,nf_def_var
       implicit none
 
 ! Commons
 
-      INCLUDE "netcdf.inc"
       INCLUDE "iotd.h"
 
@@ -90 +90 @@
 
 !! Quand on tombe sur la premiere variable on ajoute un pas de temps
-        if (nom.eq.firstnom) then
+        if (nom==firstnom) then
         ! We have identified a "first call" (at given date)
 
@@ -114 +114 @@
 !        print*,'IOTD Date ,varid,nid,ntime,date',varid,nid,ntime,date
 
-           if (ierr.ne.NF_NOERR) then
+           if (ierr/=NF_NOERR) then
               write(*,*) "***** PUT_VAR matter in writediagfi_nc"
               write(*,*) "***** with time"
@@ -175 +175 @@
       ierr= NF90_PUT_VAR(nid,varid,zx,corner,edges)
 
-      if (ierr.ne.NF_NOERR) then
+      if (ierr/=NF_NOERR) then
            write(*,*) "***** PUT_VAR problem in writediagfi"
            write(*,*) "***** with ",nom

LMDZ6/trunk/libf/phylmd/iotd_fin.F90

@@ -1 @@
-      SUBROUTINE iotd_fin
-      IMPLICIT NONE
+SUBROUTINE iotd_fin
+  USE lmdz_netcdf, ONLY : nf_close
 
-!=======================================================================
-!
-!   Auteur:  F. Hourdin
-!   -------
-!
-!   Objet:
-!   ------
-!   Light interface for netcdf outputs. can be used outside LMDZ
-!
-!=======================================================================
+  IMPLICIT NONE
 
+  !=======================================================================
+  !
+  !   Auteur:  F. Hourdin
+  !   -------
+  !
+  !   Objet:
+  !   ------
+  !   Light interface for netcdf outputs. can be used outside LMDZ
+  !
+  !=======================================================================
 
-      INCLUDE "netcdf.inc"
-      INCLUDE "iotd.h"
-      integer ierr
+  INCLUDE "iotd.h"
+  integer ierr
 
-!   Arguments:
-!   ----------
+  !   Arguments:
+  !   ----------
 
-      ierr=NF_close(nid)
+  ierr = NF_close(nid)
 
-      END
+END

LMDZ6/trunk/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
       IMPLICIT NONE
 
@@ -16 +18 @@
 !   -------------
 
-      INCLUDE "netcdf.inc"
       INCLUDE "iotd.h"
 
@@ -31 +32 @@
       real  px(1000)
       character (len=10) :: nom
-      real*4 rlon(iim),rlat(jjm),coordv(llm)
+      real(kind=4) rlon(iim),rlat(jjm),coordv(llm)
 
 !   Local:
@@ -71 +72 @@
       n_names_iotd_def=0
       open(99,file='iotd.def',form='formatted',status='old',iostat=ierr)
-         if ( ierr.eq.0 ) then
+         if ( ierr==0 ) then
             ierr=0
             do while (ierr==0)
@@ -112 +113 @@
       ierr=NF_PUT_ATT_TEXT(nid,nvarid,'units',12,"degrees_east")
       ierr=NF_ENDDEF(nid)
-      ierr=NF_PUT_VAR_REAL(nid,nvarid,rlon)
+      ierr=nf90_put_var(nid,nvarid,rlon)
        print*,ierr
 
@@ -121 +122 @@
       ierr=NF_PUT_ATT_TEXT(nid,nvarid,'units',13,"degrees_north")
       ierr=NF_ENDDEF(nid)
-      ierr=NF_PUT_VAR_REAL(nid,nvarid,rlat)
+      ierr=nf90_put_var(nid,nvarid,rlat)
 !
 ! ---- vertical ------------
@@ -135 +136 @@
       endif
       ierr=NF_ENDDEF(nid)
-      ierr=NF_PUT_VAR_REAL(nid,nvarid,coordv)
+      ierr=nf90_put_var(nid,nvarid,coordv)
 
 !

LMDZ6/trunk/libf/phylmd/limit_read_mod.F90

@@ -165 +165 @@
     USE mod_phys_lmdz_para
     USE surface_data, ONLY : type_ocean, ok_veget
-    USE netcdf
+    USE lmdz_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
     USE phys_cal_mod, ONLY : calend, year_len

LMDZ6/trunk/libf/phylmd/limit_slab.F90

@@ -6 +6 @@
   USE mod_grid_phy_lmdz, ONLY: klon_glo
   USE mod_phys_lmdz_para
-  USE netcdf 
+  USE lmdz_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
@@ -99 +99 @@
         END IF
         ! Try next layers if more than 1
-        IF ((nslay.GT.1).AND.read_bils) THEN
+        IF ((nslay>1).AND.read_bils) THEN
           DO i=2,nslay
             WRITE(str2,'(i2.2)') i
             ierr = NF90_INQ_VARID(nid,'BILS_OCE'//str2, nvarid)
-            IF (ierr.EQ.NF90_NOERR) THEN
+            IF (ierr==NF90_NOERR) THEN
               ierr = NF90_GET_VAR(nid,nvarid,bils_glo(:,i),start,epais)
             ENDIF

LMDZ6/trunk/libf/phylmd/mo_simple_plumes.F90

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

LMDZ6/trunk/libf/phylmd/moy_undefSTD.F90

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

LMDZ6/trunk/libf/phylmd/open_climoz_m.F90

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

LMDZ6/trunk/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 netcdf, only: missing_val_netcdf => nf90_fill_real
+    USE lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
 
      

LMDZ6/trunk/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 netcdf, only: missing_val_netcdf => nf90_fill_real
+  use lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
   use config_ocean_skin_m, only: activate_ocean_skin
 
@@ -152 +152 @@
   tab_cntrl(6)=nbapp_rad
 
-  IF (iflag_cycle_diurne.GE.1) tab_cntrl( 7) = iflag_cycle_diurne
+  IF (iflag_cycle_diurne>=1) tab_cntrl( 7) = iflag_cycle_diurne
   IF (soil_model) tab_cntrl( 8) =1.
   IF (new_oliq) tab_cntrl( 9) =1.
@@ -251 +251 @@
        + pctsrf(1 : klon, is_lic)
   DO i = 1 , klon
-     IF ( abs(fractint(i) - zmasq(i) ) .GT. EPSFRA ) THEN
+     IF ( abs(fractint(i) - zmasq(i) ) > EPSFRA ) THEN
         WRITE(*, *) 'phyetat0: attention fraction terre pas ',  &
              'coherente ', i, zmasq(i), pctsrf(i, is_ter) &
@@ -262 +262 @@
        + pctsrf(1 : klon, is_sic)
   DO i = 1 , klon
-     IF ( abs( fractint(i) - (1. - zmasq(i))) .GT. EPSFRA ) THEN
+     IF ( abs( fractint(i) - (1. - zmasq(i))) > EPSFRA ) THEN
         WRITE(*, *) 'phyetat0 attention fraction ocean pas ',  &
              'coherente ', i, zmasq(i) , pctsrf(i, is_oce) &
@@ -290 +290 @@
   DO nsrf = 1, nbsrf
      DO isw=1, nsw
-        IF (isw.GT.99) THEN
+        IF (isw>99) THEN
            PRINT*, "Trop de bandes SW"
            call abort_physic("phyetat0", "", 1)
@@ -313 +313 @@
 
    DO isoil=1, nsoilmx
-        IF (isoil.GT.99) THEN
+        IF (isoil>99) THEN
            PRINT*, "Trop de couches "
            call abort_physic("phyetat0", "", 1)
@@ -416 +416 @@
   !          dummy values (as is the case when generated by ce0l,
   !          or by iniaqua)
-  IF ( (maxval(q_ancien).EQ.minval(q_ancien))       .OR. &
-       (maxval(ql_ancien).EQ.minval(ql_ancien))     .OR. &
-       (maxval(qs_ancien).EQ.minval(qs_ancien))     .OR. &
-       (maxval(rneb_ancien).EQ.minval(rneb_ancien)) .OR. &
-       (maxval(prw_ancien).EQ.minval(prw_ancien))   .OR. &
-       (maxval(prlw_ancien).EQ.minval(prlw_ancien)) .OR. &
-       (maxval(prsw_ancien).EQ.minval(prsw_ancien)) .OR. &
-       (maxval(t_ancien).EQ.minval(t_ancien)) ) THEN
+  IF ( (maxval(q_ancien)==minval(q_ancien))       .OR. &
+       (maxval(ql_ancien)==minval(ql_ancien))     .OR. &
+       (maxval(qs_ancien)==minval(qs_ancien))     .OR. &
+       (maxval(rneb_ancien)==minval(rneb_ancien)) .OR. &
+       (maxval(prw_ancien)==minval(prw_ancien))   .OR. &
+       (maxval(prlw_ancien)==minval(prlw_ancien)) .OR. &
+       (maxval(prsw_ancien)==minval(prsw_ancien)) .OR. &
+       (maxval(t_ancien)==minval(t_ancien)) ) THEN
     ancien_ok=.false.
   ENDIF
 
   IF (ok_bs) THEN
-    IF ( (maxval(qbs_ancien).EQ.minval(qbs_ancien))       .OR. &
-         (maxval(prbsw_ancien).EQ.minval(prbsw_ancien)) ) THEN
+    IF ( (maxval(qbs_ancien)==minval(qbs_ancien))       .OR. &
+         (maxval(prbsw_ancien)==minval(prbsw_ancien)) ) THEN
        ancien_ok=.false.
     ENDIF
@@ -549 +549 @@
   IF ( type_ocean == 'slab' ) THEN
       CALL ocean_slab_init(phys_tstep, pctsrf)
-      IF (nslay.EQ.1) THEN
+      IF (nslay==1) THEN
         found=phyetat0_get(tslab,["tslab01","tslab  "],"tslab",0.)
       ELSE
@@ -578 +578 @@
               PRINT*, "Initialisation a 0/1m suivant fraction glace"
               seaice(:)=0.
-              WHERE (pctsrf(:,is_sic).GT.EPSFRA)
+              WHERE (pctsrf(:,is_sic)>EPSFRA)
                   seaice=917.
               ENDWHERE

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -456 +456 @@
     USE ioipsl, ONLY: histend, histsync
     USE iophy, ONLY: set_itau_iophy, histwrite_phy
-    USE netcdf, ONLY: nf90_fill_real
+    USE lmdz_netcdf, ONLY: nf90_fill_real
     USE print_control_mod, ONLY: prt_level,lunout
     ! ug Pour les sorties XIOS
@@ -555 +555 @@
       kmax_100m=1
       DO k=1, klev-1
-        IF (presnivs(k).GT.0.97*101325.) kmax_100m = k !--finding out max level for 100 m with a good margin
+        IF (presnivs(k)>0.97*101325.) kmax_100m = k !--finding out max level for 100 m with a good margin
       ENDDO
     ENDIF
@@ -782 +782 @@
           DO k=1, kmax_100m-1                                      !--we could stop much lower
             DO i=1,klon
-              IF (z(i,k).LT.100..AND.z(i,k+1).GE.100.) THEN
+              IF (z(i,k)<100..AND.z(i,k+1)>=100.) THEN
                 wind100m(i)=SQRT( (u_seri(i,k)+(100.-z(i,k))/(z(i,k+1)-z(i,k))*(u_seri(i,k+1)-u_seri(i,k)))**2.0 + &
                                   (v_seri(i,k)+(100.-z(i,k))/(z(i,k+1)-z(i,k))*(v_seri(i,k+1)-v_seri(i,k)))**2.0 )
@@ -794 +794 @@
          !--polynomial fit for 14,Vestas,1074,V136/3450 kW windmill - Olivier
          DO i=1,klon
-           IF (pctsrf(i,is_ter).GT.0.05 .AND. wind100m(i).NE.missing_val) THEN
+           IF (pctsrf(i,is_ter)>0.05 .AND. wind100m(i)/=missing_val) THEN
              x=wind100m(i)
-             IF (x.LE.3.0 .OR. x.GE.22.5) THEN
+             IF (x<=3.0 .OR. x>=22.5) THEN
                zx_tmp_fi2d(i)=0.0
-             ELSE IF (x.GE.10.0) THEN
+             ELSE IF (x>=10.0) THEN
                zx_tmp_fi2d(i)=1.0
              ELSE
@@ -815 +815 @@
          !--polynomial fit for 14,Vestas,867,V164/8000 kW - Olivier
          DO i=1,klon
-           IF (pctsrf(i,is_oce).GT.0.05 .AND. wind100m(i).NE.missing_val) THEN
+           IF (pctsrf(i,is_oce)>0.05 .AND. wind100m(i)/=missing_val) THEN
              x=wind100m(i)
-             IF (x.LE.3.0 .OR. x.GE.25.5) THEN
+             IF (x<=3.0 .OR. x>=25.5) THEN
                zx_tmp_fi2d(i)=0.0
-             ELSE IF (x.GE.12.5) THEN
+             ELSE IF (x>=12.5) THEN
                zx_tmp_fi2d(i)=1.0
              ELSE
@@ -1407 +1407 @@
        CALL histwrite_phy(o_uwat, uwat)
        CALL histwrite_phy(o_vwat, vwat)
-       IF (iflag_con.GE.3) THEN ! sb
+       IF (iflag_con>=3) THEN ! sb
           CALL histwrite_phy(o_cape, cape)
           CALL histwrite_phy(o_pbase, ema_pcb)
@@ -1512 +1512 @@
             DO k=1, nlevSTD
               bb2=clevSTD(k) 
-              IF (bb2.EQ."850".OR.bb2.EQ."700".OR. &
-                  bb2.EQ."500".OR.bb2.EQ."200".OR. &
-                  bb2.EQ."100".OR. &
-                  bb2.EQ."50".OR.bb2.EQ."10") THEN
+              IF (bb2=="850".OR.bb2=="700".OR. &
+                  bb2=="500".OR.bb2=="200".OR. &
+                  bb2=="100".OR. &
+                  bb2=="50".OR.bb2=="10") THEN
                   ll=ll+1
                   CALL histwrite_phy(o_uSTDlevs(ll),ulevSTD(:,k))
@@ -1530 +1530 @@
        IF (vars_defined) THEN
           DO i=1, klon
-             IF (pctsrf(i,is_oce).GT.epsfra.OR. &
-                  pctsrf(i,is_sic).GT.epsfra) THEN
+             IF (pctsrf(i,is_oce)>epsfra.OR. &
+                  pctsrf(i,is_sic)>epsfra) THEN
                 zx_tmp_fi2d(i) = (ftsol(i, is_oce) * pctsrf(i,is_oce)+ &
                      ftsol(i, is_sic) * pctsrf(i,is_sic))/ &
@@ -1543 +1543 @@
 
        ! Couplage convection-couche limite
-       IF (iflag_con.GE.3) THEN
+       IF (iflag_con>=3) THEN
           IF (iflag_coupl>=1) THEN
              CALL histwrite_phy(o_ale_bl, ale_bl)
@@ -1550 +1550 @@
        ENDIF !(iflag_con.GE.3)
        ! Wakes
-       IF (iflag_con.EQ.3) THEN
+       IF (iflag_con==3) THEN
           CALL histwrite_phy(o_Mipsh, Mipsh)
           IF (iflag_wake>=1) THEN
@@ -1620 +1620 @@
           CALL histwrite_phy(o_fqd, fqd)
        ENDIF !(iflag_con.EQ.3)
-       IF (iflag_con.EQ.3.OR.iflag_con.EQ.30) THEN
+       IF (iflag_con==3.OR.iflag_con==30) THEN
           ! sortie RomP convection descente insaturee iflag_con=30
           ! etendue a iflag_con=3 (jyg)
@@ -1651 +1651 @@
        IF (type_ocean=='slab ') THEN
           CALL histwrite_phy(o_slab_bils, slab_wfbils)
-          IF (nslay.EQ.1) THEN
+          IF (nslay==1) THEN
               IF (vars_defined) zx_tmp_fi2d(:)=tslab(:,1)
               CALL histwrite_phy(o_tslab, zx_tmp_fi2d)
@@ -1669 +1669 @@
           ENDIF
           IF (slab_hdiff) THEN
-            IF (nslay.EQ.1) THEN
+            IF (nslay==1) THEN
                 IF (vars_defined) zx_tmp_fi2d(:)=dt_hdiff(:,1)
                 CALL histwrite_phy(o_slab_hdiff, zx_tmp_fi2d)
@@ -1676 +1676 @@
             ENDIF
           ENDIF
-          IF (slab_ekman.GT.0) THEN
-            IF (nslay.EQ.1) THEN
+          IF (slab_ekman>0) THEN
+            IF (nslay==1) THEN
                 IF (vars_defined) zx_tmp_fi2d(:)=dt_ekman(:,1)
                 CALL histwrite_phy(o_slab_ekman, zx_tmp_fi2d)
@@ -1702 +1702 @@
        IF (vars_defined) THEN
           DO i=1, klon
-             IF (zt2m(i).LE.273.15) then
+             IF (zt2m(i)<=273.15) then
                 zx_tmp_fi2d(i)=MAX(0.,rh2m(i)*100.)
              ELSE
@@ -1744 +1744 @@
 !This is warranted by treating INCA aerosols as offline aerosols
 #ifndef CPP_ECRAD
-       IF (flag_aerosol.GT.0) THEN
+       IF (flag_aerosol>0) THEN
           IF (type_trac/='inca' .OR. config_inca=='aeNP') THEN 
 
@@ -1777 +1777 @@
        ENDIF
        !--STRAT AER
-       IF (flag_aerosol.GT.0.OR.flag_aerosol_strat.GT.0) THEN
+       IF (flag_aerosol>0.OR.flag_aerosol_strat>0) THEN
           DO naero = 1, naero_tot
              CALL histwrite_phy(o_tausumaero(naero),tausum_aero(:,2,naero))
           ENDDO
        ENDIF
-       IF (flag_aerosol_strat.GT.0) THEN
+       IF (flag_aerosol_strat>0) THEN
           CALL histwrite_phy(o_tausumaero_lw,tausum_aero(:,6,id_STRAT_phy))
        ENDIF
@@ -1933 +1933 @@
           CALL histwrite_phy(o_sollwai, zx_tmp_fi2d)
        ENDIF
-       IF (flag_aerosol.GT.0.AND.ok_cdnc) THEN
+       IF (flag_aerosol>0.AND.ok_cdnc) THEN
           CALL histwrite_phy(o_scdnc, scdnc)
           CALL histwrite_phy(o_cldncl, cldncl)
@@ -2002 +2002 @@
 #endif
 
-       IF (flag_aerosol_strat.EQ.2) THEN
+       IF (flag_aerosol_strat==2) THEN
          CALL histwrite_phy(o_stratomask, stratomask)
        ENDIF
@@ -2030 +2030 @@
        CALL histwrite_phy(o_rnebjn, zx_tmp_fi3d)
        CALL histwrite_phy(o_rhum, zx_rh)
-       IF (iflag_ice_thermo .GT. 0) THEN
+       IF (iflag_ice_thermo > 0) THEN
           IF (vars_defined) zx_tmp_fi3d = zx_rhl * 100.
           CALL histwrite_phy(o_rhl, zx_tmp_fi3d)
@@ -2111 +2111 @@
        CALL histwrite_phy(o_dqlphy2d,  zx_tmp_fi2d)
 
-       IF (nqo.EQ.3) THEN
+       IF (nqo==3) THEN
        CALL histwrite_phy(o_dqsphy,  d_qx(:,:,isol))
        IF (vars_defined) CALL water_int(klon,klev,d_qx(:,:,isol),zmasse,zx_tmp_fi2d)
@@ -2195 +2195 @@
        ENDIF
        CALL histwrite_phy(o_dtcon, zx_tmp_fi3d)
-       IF (iflag_thermals.EQ.0) THEN
+       IF (iflag_thermals==0) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_t_con(1:klon,1:klev)/pdtphys + &
@@ -2201 +2201 @@
           ENDIF
           CALL histwrite_phy(o_tntc, zx_tmp_fi3d)
-       ELSE IF(iflag_thermals.GE.1.AND.iflag_wake.EQ.1) THEN
+       ELSE IF(iflag_thermals>=1.AND.iflag_wake==1) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_t_con(1:klon,1:klev)/pdtphys + &
@@ -2218 +2218 @@
        CALL histwrite_phy(o_dqcon2d, zx_tmp_fi2d)
 
-       IF (iflag_thermals.EQ.0) THEN
+       IF (iflag_thermals==0) THEN
           IF (vars_defined) zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys
           CALL histwrite_phy(o_tnhusc, zx_tmp_fi3d)
-       ELSE IF (iflag_thermals.GE.1.AND.iflag_wake.EQ.1) THEN
+       ELSE IF (iflag_thermals>=1.AND.iflag_wake==1) THEN
           IF (vars_defined) THEN
              zx_tmp_fi3d(1:klon,1:klev)=d_q_con(1:klon,1:klev)/pdtphys + &
@@ -2694 +2694 @@
              DO k=1, nlevSTD
                 DO i=1, klon
-                   IF (O3STD(i,k).NE.missing_val) THEN
+                   IF (O3STD(i,k)/=missing_val) THEN
                       zx_tmp_fi3d_STD(i,k) = O3STD(i,k) * 1.e+9
                    ELSE
@@ -2707 +2707 @@
                 DO k=1, nlevSTD
                    DO i=1, klon
-                      IF (O3daySTD(i,k).NE.missing_val) THEN
+                      IF (O3daySTD(i,k)/=missing_val) THEN
                          zx_tmp_fi3d_STD(i,k) = O3daySTD(i,k) * 1.e+9
                       ELSE

LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90

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

LMDZ6/trunk/libf/phylmd/physiq_mod.F90

@@ -48 +48 @@
     USE mod_phys_lmdz_para
     USE netcdf95, only: nf95_close
-    USE netcdf, only: nf90_fill_real     ! IM for NMC files
+    USE lmdz_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/trunk/libf/phylmd/plevel.F90

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

LMDZ6/trunk/libf/phylmd/plevel_new.F90

@@ -8 +8 @@
   ! ================================================================
   ! ================================================================
-  USE netcdf
   USE dimphy
 #ifdef CPP_IOIPSL 

LMDZ6/trunk/libf/phylmd/press_coefoz_m.F90

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

LMDZ6/trunk/libf/phylmd/read_map2D.F90

@@ -3 +3 @@
 ! Return variable for the given timestep. 
   USE dimphy
-  USE netcdf
+  USE lmdz_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/trunk/libf/phylmd/read_pstoke.F90

@@ -17 +17 @@
   ! ******************************************************************************
 
-  USE netcdf
+  USE lmdz_netcdf, ONLY: nf90_open,nf90_inq_varid,nf90_nowrite,nf90_get_var,nf_inq_dim,&
+          nf_inq_dimid
   USE dimphy
   USE indice_sol_mod
@@ -23 +24 @@
 
   IMPLICIT NONE
-
-  include "netcdf.inc"
 
   INTEGER klono, klevo, imo, jmo

LMDZ6/trunk/libf/phylmd/read_pstoke0.F90

@@ -16 +16 @@
   ! ******************************************************************************
 
-  USE netcdf
+  USE lmdz_netcdf, ONLY: nf_inq_dimid,nf_inq_dim,nf90_get_var,nf90_inq_varid,nf90_open,&
+          nf90_nowrite
   USE dimphy
   USE indice_sol_mod
@@ -22 +23 @@
 
   IMPLICIT NONE
-
-  include "netcdf.inc"
 
   INTEGER kon, kev, zkon, zkev
@@ -253 +252 @@
     ! niveaux de pression
 
-    status = nf_get_vara_real(ncidp, varidpl, 1, kev, pl)
+    status = nf90_get_var(ncidp, varidpl, pl, [1], [kev])
 
     ! lecture de aire et phis

LMDZ6/trunk/libf/phylmd/readaerosol_mod.F90

@@ -2 +2 @@
 !
 MODULE readaerosol_mod
+
+  USE lmdz_netcdf, ONLY: nf90_strerror,nf90_noerr,nf90_get_var,nf90_inq_varid,&
+          nf90_inquire_dimension,nf90_inq_dimid,nf90_open,nf90_nowrite,nf90_close
 
   REAL, SAVE :: not_valid=-333.
@@ -86 +89 @@
 ! Read data depending on actual year and interpolate if necessary
 !****************************************************************************************
-     IF (iyr_in .LT. 1850) THEN
+     IF (iyr_in < 1850) THEN
         cyear='.nat'
         WRITE(lunout,*) 'get_aero 1 iyr_in=', iyr_in,'   ',cyear
@@ -93 +96 @@
         CALL get_aero_fromfile(name_aero, cyear, filename, klev_src, pt_ap, pt_b, pt_out, psurf, load)
         
-     ELSE IF (iyr_in .GE. 2100) THEN
+     ELSE IF (iyr_in >= 2100) THEN
         cyear='2100'
         WRITE(lunout,*) 'get_aero 2 iyr_in=', iyr_in,'   ',cyear
@@ -103 +106 @@
         ! Read data from 2 decades and interpolate to actual year
         ! a) from actual 10-yr-period
-        IF (iyr_in.LT.1900) THEN
+        IF (iyr_in<1900) THEN
            iyr1 = 1850
            iyr2 = 1900
-        ELSE IF (iyr_in.GE.1900.AND.iyr_in.LT.1920) THEN
+        ELSE IF (iyr_in>=1900.AND.iyr_in<1920) THEN
            iyr1 = 1900
            iyr2 = 1920
@@ -174 +177 @@
 
 SUBROUTINE init_aero_fromfile(flag_aerosol, aerosol_couple)
-  USE netcdf
   USE mod_phys_lmdz_para
   USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
@@ -265 +267 @@
 !****************************************************************************************
 
-    USE netcdf
     USE dimphy
     USE mod_grid_phy_lmdz, ONLY: nbp_lon_=>nbp_lon, nbp_lat_=>nbp_lat, klon_glo, &
@@ -507 +508 @@
 !****************************************************************************************
           DO imth=1, 12
-             IF (imth.EQ.1) THEN
+             IF (imth==1) THEN
                 cvar=TRIM(varname)//'JAN'
-             ELSE IF (imth.EQ.2) THEN
+             ELSE IF (imth==2) THEN
                 cvar=TRIM(varname)//'FEB'
-             ELSE IF (imth.EQ.3) THEN
+             ELSE IF (imth==3) THEN
                 cvar=TRIM(varname)//'MAR'
-             ELSE IF (imth.EQ.4) THEN
+             ELSE IF (imth==4) THEN
                 cvar=TRIM(varname)//'APR'
-             ELSE IF (imth.EQ.5) THEN
+             ELSE IF (imth==5) THEN
                 cvar=TRIM(varname)//'MAY'
-             ELSE IF (imth.EQ.6) THEN
+             ELSE IF (imth==6) THEN
                 cvar=TRIM(varname)//'JUN'
-             ELSE IF (imth.EQ.7) THEN
+             ELSE IF (imth==7) THEN
                 cvar=TRIM(varname)//'JUL'
-             ELSE IF (imth.EQ.8) THEN
+             ELSE IF (imth==8) THEN
                 cvar=TRIM(varname)//'AUG'
-             ELSE IF (imth.EQ.9) THEN
+             ELSE IF (imth==9) THEN
                 cvar=TRIM(varname)//'SEP'
-             ELSE IF (imth.EQ.10) THEN
+             ELSE IF (imth==10) THEN
                 cvar=TRIM(varname)//'OCT'
-             ELSE IF (imth.EQ.11) THEN
+             ELSE IF (imth==11) THEN
                 cvar=TRIM(varname)//'NOV'
-             ELSE IF (imth.EQ.12) THEN
+             ELSE IF (imth==12) THEN
                 cvar=TRIM(varname)//'DEC'
              END IF
@@ -716 +717 @@
 
   SUBROUTINE check_err(status,text)
-    USE netcdf
     USE print_control_mod, ONLY: lunout
     IMPLICIT NONE

LMDZ6/trunk/libf/phylmd/readaerosolstrato.F90

@@ -3 +3 @@
     use netcdf95, only: nf95_close, nf95_gw_var, nf95_inq_dimid, & 
                         nf95_inq_varid, nf95_open
-    use netcdf, only: nf90_get_var, nf90_noerr, nf90_nowrite
+    use lmdz_netcdf, only: nf90_get_var, nf90_noerr, nf90_nowrite
 
     USE phys_cal_mod, ONLY : mth_cur
@@ -68 +68 @@
 
 !--only read file if beginning of run or start of new month
-    IF (debut.OR.mth_cur.NE.mth_pre) THEN
+    IF (debut.OR.mth_cur/=mth_pre) THEN
 
 !--only root reads
     IF (is_mpi_root.AND.is_omp_root) THEN
 
-    IF (nbands.NE.2) THEN 
+    IF (nbands/=2) THEN
         abort_message='nbands doit etre egal a 2 dans readaerosolstrat'
         CALL abort_physic(modname,abort_message,1)
@@ -83 +83 @@
     CALL nf95_gw_var(ncid_in, varid, lev)
     n_lev = size(lev)
-    IF (n_lev.NE.klev) THEN 
+    IF (n_lev/=klev) THEN
        abort_message='Le nombre de niveaux n est pas egal a klev'
        CALL abort_physic(modname,abort_message,1)
@@ -93 +93 @@
     WRITE(lunout,*) 'LAT aerosol strato=', n_lat, latitude
     IF (grid_type/=unstructured) THEN
-      IF (n_lat.NE.nbp_lat) THEN 
+      IF (n_lat/=nbp_lat) THEN
          abort_message='Le nombre de lat n est pas egal a nbp_lat'
          CALL abort_physic(modname,abort_message,1)
@@ -104 +104 @@
     IF (grid_type/=unstructured) THEN
       WRITE(lunout,*) 'LON aerosol strato=', n_lon, longitude
-      IF (n_lon.NE.nbp_lon) THEN 
+      IF (n_lon/=nbp_lon) THEN
          abort_message='Le nombre de lon n est pas egal a nbp_lon'
          CALL abort_physic(modname,abort_message,1)
@@ -114 +114 @@
     n_month = size(time)
     WRITE(lunout,*) 'TIME aerosol strato=', n_month, time
-    IF (n_month.NE.12) THEN 
+    IF (n_month/=12) THEN
        abort_message='Le nombre de month n est pas egal a 12'
        CALL abort_physic(modname,abort_message,1)
@@ -131 +131 @@
 
 !---select the correct month
-    IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
+    IF (mth_cur<1.OR.mth_cur>12) THEN
      WRITE(lunout,*) 'probleme avec le mois dans readaerosolstrat =', mth_cur
     ENDIF

LMDZ6/trunk/libf/phylmd/readaerosolstrato_m.F90

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

LMDZ6/trunk/libf/phylmd/readchlorophyll.F90

@@ -8 +8 @@
 
     USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_dimid, nf95_inq_varid, nf95_open
-    USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+    USE lmdz_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
@@ -50 +50 @@
 
 !--only read file if beginning of run or start of new month
-    IF (debut.OR.mth_cur.NE.mth_pre) THEN
+    IF (debut.OR.mth_cur/=mth_pre) THEN
 
     IF (is_mpi_root.AND.is_omp_root) THEN
@@ -59 +59 @@
     CALL nf95_gw_var(ncid_in, varid, longitude)
     n_lon = size(longitude)
-    IF (n_lon.NE.nbp_lon) THEN
+    IF (n_lon/=nbp_lon) THEN
        abort_message='Le nombre de lon n est pas egal a nbp_lon'
        CALL abort_physic(modname,abort_message,1)
@@ -67 +67 @@
     CALL nf95_gw_var(ncid_in, varid, latitude)
     n_lat = size(latitude)
-    IF (n_lat.NE.nbp_lat) THEN 
+    IF (n_lat/=nbp_lat) THEN
        abort_message='Le nombre de lat n est pas egal a jnbp_lat'
        CALL abort_physic(modname,abort_message,1)
@@ -75 +75 @@
     CALL nf95_gw_var(ncid_in, varid, time)
     n_month = size(time)
-    IF (n_month.NE.12) THEN 
+    IF (n_month/=12) THEN
        abort_message='Le nombre de month n est pas egal a 12'
        CALL abort_physic(modname,abort_message,1)
@@ -92 +92 @@
 
 !---select the correct month
-    IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
+    IF (mth_cur<1.OR.mth_cur>12) THEN
       WRITE(lunout,*)'probleme avec le mois dans readchlorophyll =', mth_cur
     ENDIF
@@ -104 +104 @@
 !      if(isnan(chlorocon_mois_glo(i)))then ! isnan() is not in the Fortran standard...
 !      Another way to check for NaN:
-       IF (chlorocon_mois_glo(i).NE.chlorocon_mois_glo(i)) chlorocon_mois_glo(i)=0.
+       IF (chlorocon_mois_glo(i)/=chlorocon_mois_glo(i)) chlorocon_mois_glo(i)=0.
     ENDDO
 

LMDZ6/trunk/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 netcdf,   ONLY: NF90_CLOBBER, NF90_FLOAT,     NF90_OPEN,   &
+  USE lmdz_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 netcdf, ONLY: NF90_NOERR, NF90_strerror
+  USE lmdz_netcdf, ONLY: NF90_NOERR, NF90_strerror
 !-------------------------------------------------------------------------------
 ! Arguments:

LMDZ6/trunk/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 netcdf, only: nf90_nowrite
+    use lmdz_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 netcdf, only: nf90_clobber, nf90_float, nf90_copy_att, nf90_global
+    use lmdz_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 netcdf, only: nf90_noerr, nf90_strerror
+      use lmdz_netcdf, only: nf90_noerr, nf90_strerror
 
       character(len=*), intent(in):: att_name

LMDZ6/trunk/libf/phylmd/regr_pr_comb_coefoz_m.F90

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

LMDZ6/trunk/libf/phylmd/regr_pr_o3_m.F90

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

LMDZ6/trunk/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 netcdf,         ONLY: NF90_INQ_VARID, NF90_NOERR
+  USE lmdz_netcdf,         ONLY: NF90_INQ_VARID, NF90_NOERR
   USE assert_m,       ONLY: assert
   USE assert_eq_m,    ONLY: assert_eq

LMDZ6/trunk/libf/phylmd/rrtm/read_rsun_rrtm.F90

@@ -8 +8 @@
 
   USE netcdf95, ONLY: nf95_close, nf95_inq_varid, nf95_open, nf95_gw_var
-  USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+  USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
   USE phys_cal_mod, ONLY : days_elapsed, year_len

LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato1_rrtm.F90

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

LMDZ6/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90

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

LMDZ6/trunk/libf/phylmd/tracco2i_mod.F90

@@ -104 +104 @@
 
 ! Initialization of tr_seri(id_CO2) If it is not initialized
-      IF (MAXVAL(tr_seri(:,:,id_CO2)).LT.1.e-15) THEN 
+      IF (MAXVAL(tr_seri(:,:,id_CO2))<1.e-15) THEN
         tr_seri(:,:,id_CO2)=co2_ppm0*1.e-6/RMD*RMCO2 !--initialised from co2_ppm0 in rdem
       ENDIF 
@@ -299 +299 @@
 !--for every timestep comment out the IF ENDIF statements 
 !--otherwise this is updated every day
-    IF (debutphy.OR.day_cur.NE.day_pre) THEN
+    IF (debutphy.OR.day_cur/=day_pre) THEN
 
       CALL gather(tr_seri(:,:,id_CO2),co2_glo)
@@ -351 +351 @@
 
     USE netcdf95, ONLY: nf95_close, nf95_gw_var, nf95_inq_varid, nf95_open
-    USE netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
+    USE lmdz_netcdf, ONLY: nf90_get_var, nf90_noerr, nf90_nowrite
 
     USE carbon_cycle_mod, ONLY : fco2_ff, fco2_bb, fco2_land, fco2_ocean
@@ -401 +401 @@
         CALL nf95_gw_var(ncid_in, varid, vector)
         n_glo = size(vector)
-        IF (n_glo.NE.klon_glo) THEN
+        IF (n_glo/=klon_glo) THEN
            abort_message='sflx_lmdz_co2_ff: le nombre de points n est pas egal a klon_glo'
            CALL abort_physic(modname,abort_message,1)
@@ -409 +409 @@
         CALL nf95_gw_var(ncid_in, varid, time)
         n_month = size(time)
-        IF (n_month.NE.12) THEN
+        IF (n_month/=12) THEN
            abort_message='sflx_lmdz_co2_ff: le nombre de month n est pas egal a 12'
            CALL abort_physic(modname,abort_message,1)
@@ -434 +434 @@
       CALL nf95_gw_var(ncid_in, varid, vector)
       n_glo = size(vector)
-      IF (n_glo.NE.klon_glo) THEN
+      IF (n_glo/=klon_glo) THEN
          abort_message='sflx_lmdz_co2_bb: le nombre de points n est pas egal a klon_glo'
          CALL abort_physic(modname,abort_message,1)
@@ -442 +442 @@
       CALL nf95_gw_var(ncid_in, varid, time)
       n_month = size(time)
-      IF (n_month.NE.12) THEN
+      IF (n_month/=12) THEN
          abort_message='sflx_lmdz_co2_bb: le nombre de month n est pas egal a 12'
          CALL abort_physic(modname,abort_message,1)
@@ -474 +474 @@
 
 !---select the correct month
-  IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
+  IF (mth_cur<1.OR.mth_cur>12) THEN
     PRINT *,'probleme avec le mois dans co2_ini =', mth_cur
   ENDIF

LMDZ6/trunk/libf/phylmd/undefSTD.F90

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

LMDZ6/trunk/libf/phylmdiso/isotopes_routines_mod.F90

@@ -15871 +15871 @@
   USE isotopes_verif_mod
 #endif
-
        implicit none   
 
       ! equivalent de phyetat0 pour les isotopes  
 
-#include "netcdf.inc"
 #include "dimsoil.h"
 #include "clesphys.h"
@@ -16429 +16427 @@
    IMPLICIT NONE
 
-#include "netcdf.inc"
 #include "dimsoil.h"
 #include "clesphys.h"

LMDZ6/trunk/libf/phylmdiso/limit_read_mod.F90

@@ -274 +274 @@
     USE mod_phys_lmdz_para
     USE surface_data, ONLY : type_ocean, ok_veget
-    USE netcdf
+    USE lmdz_netcdf, ONLY:nf90_noerr,nf90_close,nf90_get_var,nf90_inq_varid,nf90_nowrite,&
+            nf90_inq_dimid,nf90_inquire_dimension,nf90_open
     USE indice_sol_mod
 #ifdef ISO

LMDZ6/trunk/libf/phylmdiso/phyaqua_mod.F90

@@ -147 +147 @@
     !END IF
     
-    if (year_len.ne.360) then
+    if (year_len/=360) then
       write (*,*) year_len
       write (*,*) 'iniaqua: 360 day calendar is required !'
@@ -960 +960 @@
       END IF
 
-      if (type_profil.EQ.20) then
+      if (type_profil==20) then
       print*,'Profile SST 20'
 !     Méthode 13 "Qmax2K" plateau réel �|  l'Equateur augmenté +2K
@@ -969 +969 @@
       endif
 
-      if (type_profil.EQ.21) then
+      if (type_profil==21) then
       print*,'Profile SST 21'
 !     Méthode 13 "Qmax2K" plateau réel �|  l'Equateur augmenté +2K

LMDZ6/trunk/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 netcdf, only: missing_val_netcdf => nf90_fill_real
+  use lmdz_netcdf, only: missing_val_netcdf => nf90_fill_real
   use config_ocean_skin_m, only: activate_ocean_skin
 #ifdef ISO

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -48 +48 @@
     USE mod_phys_lmdz_para
     USE netcdf95, only: nf95_close
-    USE netcdf, only: nf90_fill_real     ! IM for NMC files
+    USE lmdz_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/trunk/tools/make_sso/make_sso_SpherePack.f90

@@ -6 +6 @@
 ! Purpose: Project ETOPO file (GMT4 axes conventions) on spherical harmonics.
 !-------------------------------------------------------------------------------
-  USE netcdf
+  USE lmdz_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
 !  USE sphpack
   IMPLICIT NONE

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_copy_att.f90

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

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_get_att.f90

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

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_get_missing.F90

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

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_inquire_attribute.f90

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

LMDZ6/trunk/tools/netcdf95/Attributes/nf95_put_att.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_close.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_create.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_create_single.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_enddef.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_find_coord.f90

@@ -15 +15 @@
     ! attribute "std_name".
 
-    use netcdf, only: NF90_MAX_NAME, NF90_NOERR
+    use lmdz_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/trunk/tools/netcdf95/Datasets/nf95_inquire.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_open.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_redef.f90

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

LMDZ6/trunk/tools/netcdf95/Datasets/nf95_sync.f90

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

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_file_ncid.f90

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

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_grp_parent.f90

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

LMDZ6/trunk/tools/netcdf95/Groups/nf95_inq_grps.f90

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

LMDZ6/trunk/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 netcdf, only: nf90_noerr
+    use lmdz_netcdf, only: nf90_noerr
 
     character(len=*), intent(in):: name_calling ! name of calling procedure

LMDZ6/trunk/tools/netcdf95/Variables/nf95_def_var.f90

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

LMDZ6/trunk/tools/netcdf95/Variables/nf95_get_var.f90

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

LMDZ6/trunk/tools/netcdf95/Variables/nf95_inq_varid.f90

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

LMDZ6/trunk/tools/netcdf95/Variables/nf95_inquire_variable.f90

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

LMDZ6/trunk/tools/netcdf95/Variables/nf95_put_var.f90

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

LMDZ6/trunk/tools/netcdf95/nf95_abort.f90

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

LMDZ6/trunk/tools/netcdf95/nf95_def_dim.f90

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

LMDZ6/trunk/tools/netcdf95/nf95_inq_dimid.f90

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

LMDZ6/trunk/tools/netcdf95/nf95_inquire_dimension.f90

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