Changeset 5075 for LMDZ6/trunk/libf/misc

Timestamp:

Jul 19, 2024, 10:05:57 AM (12 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/misc

Files:

• lmdz_netcdf.F90 (modified) (1 diff)
• write_field.F90 (modified) (6 diffs)
• wxios.F90 (modified) (6 diffs)

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