Changeset 5088 for LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd

Timestamp:

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

Author:

abarral

Message:

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

Location:

LMDZ6/branches/Amaury_dev/libf/dynphy_lonlat/phylmd

Files:

• ce0l.F90 (modified) (2 diffs)
• limit_netcdf.F90 (modified) (4 diffs)

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

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

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

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