Changeset 5088 for LMDZ6/branches/Amaury_dev/libf/misc

Timestamp:

Jul 20, 2024, 4:30:31 PM (2 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/misc

Files:

• lmdz_netcdf_format.F90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/lmdz_netcdf.F90) (1 diff)
• write_field.F90 (modified) (3 diffs)
• wxios.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_netcdf_format.F90

@@ -7 +7 @@
 ! ---------------------------------------------
 
-MODULE lmdz_netcdf
+MODULE lmdz_netcdf_format
   USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : REAL64, REAL32
-  USE netcdf
-  IMPLICIT NONE
-  ! Note: as we want to expose netcdf through this module, we don't make all PRIVATE by default as usual
-  ! Instead, explicitely make PRIVATE the relevant items.
-
-  INCLUDE 'netcdf.inc'
+  USE netcdf, ONLY: nf90_float, nf90_double
+  IMPLICIT NONE; PRIVATE
+  PUBLIC nf90_format
 
 #ifdef NC_DOUBLE
-  INTEGER, PARAMETER :: NF90_FORMAT = NF90_DOUBLE
+  INTEGER, PARAMETER :: nf90_format = nf90_double
 #else
-  INTEGER, PARAMETER :: NF90_FORMAT = NF90_FLOAT
+  INTEGER, PARAMETER :: nf90_format = nf90_float
 #endif
-END MODULE lmdz_netcdf
+END MODULE lmdz_netcdf_format

LMDZ6/branches/Amaury_dev/libf/misc/write_field.F90

@@ -1 +1 @@
 module write_field
-  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
+  USE netcdf, ONLY: nf90_sync, nf90_put_var, nf90_enddef, nf90_def_dim, nf90_unlimited, &
+      nf90_clobber, nf90_create, nf90_def_var
+  USE lmdz_netcdf_format, ONLY: nf90_format
 
   implicit none
@@ -102 +103 @@
 
       status = nf90_put_var(FieldId(Index),FieldVarId(Index),Field,start,count)
-      status = NF_SYNC(FieldId(Index))
+      status = nf90_sync(FieldId(Index))
       
     end subroutine WriteField_gen
@@ -119 +120 @@
       
       
-      status = NF_CREATE(TRIM(ADJUSTL(name))//'.nc', NF_CLOBBER, FieldId(NbField))
-      status = NF_DEF_DIM(FieldId(NbField),'X',dimx,TabDim(1))
-      status = NF_DEF_DIM(FieldId(NbField),'Y',dimy,TabDim(2))
-      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),NF90_FORMAT,4,TabDim,FieldVarId(NbField))
-      status = NF_ENDDEF(FieldId(NbField))
+      status = nf90_create(TRIM(ADJUSTL(name))//'.nc', nf90_clobber, FieldId(NbField))
+      status = nf90_def_dim(FieldId(NbField),'X',dimx,TabDim(1))
+      status = nf90_def_dim(FieldId(NbField),'Y',dimy,TabDim(2))
+      status = nf90_def_dim(FieldId(NbField),'Z',dimz,TabDim(3))
+      status = nf90_def_dim(FieldId(NbField),'iter',nf90_unlimited,TabDim(4))
+      status = nf90_def_var(FieldId(NbField),FieldName(NbField),nf90_format,TabDim,FieldVarId(NbField))
+      status = nf90_enddef(FieldId(NbField))
 
     end subroutine CreateNewField

LMDZ6/branches/Amaury_dev/libf/misc/wxios.F90

@@ -604 +604 @@
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     SUBROUTINE wxios_add_field(fieldname, fieldgroup, fieldlongname, fieldunit)
-        USE lmdz_netcdf, only: nf90_fill_real
+        USE netcdf, only: nf90_fill_real
 
         IMPLICIT NONE