Changeset 5084 for LMDZ6/trunk/libf/dynphy_lonlat/phylmd

Timestamp:

Jul 19, 2024, 6:40:44 PM (7 months ago)

Author:

Laurent Fairhead

Message:

Reverting to r4065. Updating fortran standard broke too much stuff. Will do it by smaller chunks
AB, LF

Location:

LMDZ6/trunk/libf/dynphy_lonlat/phylmd

Files:

• ce0l.F90 (modified) (1 diff)
• limit_netcdf.F90 (modified) (4 diffs)

LMDZ6/trunk/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,    &
+  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

LMDZ6/trunk/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_NOERR,   NF90_NOWRITE, NF90_DOUBLE,  NF90_GLOBAL,       &
                   NF90_CLOBBER, NF90_ENDDEF,  NF90_UNLIMITED, NF90_FLOAT,      &
-                  NF90_64BIT_OFFSET, NF90_FORMAT
+                  NF90_64BIT_OFFSET
   USE inter_barxy_m,      ONLY: inter_barxy
   USE netcdf95,           ONLY: nf95_def_var, nf95_put_att, nf95_put_var
@@ -107 +107 @@
   INTEGER :: id_tim,  id_SST,  id_BILS, id_RUG, id_ALB
   INTEGER :: id_FOCE, id_FSIC, id_FTER, id_FLIC, varid_longitude, varid_latitude
+  INTEGER :: NF90_FORMAT
   INTEGER :: ndays                   !--- Depending on the output calendar
   CHARACTER(LEN=ns) :: str
 
 !--- INITIALIZATIONS -----------------------------------------------------------
+#ifdef NC_DOUBLE
+  NF90_FORMAT=NF90_DOUBLE
+#else
+  NF90_FORMAT=NF90_FLOAT
+#endif
   CALL inigeom
 
@@ -321 +327 @@
 !     2) Dimensional variables have the same names as corresponding dimensions.
 !-----------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY: NF90_OPEN, NF90_INQ_VARID, NF90_INQUIRE_VARIABLE, &
+  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
@@ -740 +746 @@
 ! Purpose: NetCDF errors handling.
 !-------------------------------------------------------------------------------
-  USE lmdz_netcdf, ONLY : NF90_NOERR, NF90_STRERROR
+  USE netcdf, ONLY : NF90_NOERR, NF90_STRERROR
   IMPLICIT NONE
 !-------------------------------------------------------------------------------