Changeset 5075 for LMDZ6/trunk/libf/dyn3d

Timestamp:

Jul 19, 2024, 10:05:57 AM (6 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/libf/dyn3d

Files:

• dynetat0.F90 (modified) (1 diff)
• dynredem.F90 (modified) (2 diffs)
• dynredem_mod.F90 (modified) (1 diff)
• guide_mod.F90 (modified) (1 diff)
• iniacademic.F90 (modified) (3 diffs)

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