Changeset 5073 for LMDZ6/trunk/libf/misc/lmdz_netcdf.F90

Timestamp:

Jul 18, 2024, 4:57:05 PM (4 months ago)

Author:

abarral

Message:

Remove all NC_DOUBLE uses outside of lmdz_netcdf.F90 (except in obsolete/, which I hope we'll ditch soon...)
Note: make sure to check convergence at some point, it's possible that we've messed up some when replacing nf_* by nf90_* calls
(lint) replace obsolete logical operators along the way

File:

• LMDZ6/trunk/libf/misc/lmdz_netcdf.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/misc/lmdz_netcdf.F90

@@ -3 +3 @@
 ! It serves two primary functions:
 !  1) Turn netcdf into a "real" fortran module, without the INCLUDE call
-!  2) Handle the NC_DOUBLE CPP key. Ideally, this key should ONLY appear here (WIP). TODO
+!  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
 ! ---------------------------------------------
-! TODO check that none of the wrapped functions remain elsewhere
 ! TODO check all uses of `use netcdf` + netcdf.inc
 
@@ -15 +14 @@
   ! 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.
-  PRIVATE CPP_NC_DOUBLE
 
   INCLUDE 'netcdf.inc'
 
 #ifdef NC_DOUBLE
-  LOGICAL, PARAMETER :: CPP_NC_DOUBLE = .TRUE.  ! Define a variable to reduce use of preprocessor ahead
   INTEGER, PARAMETER :: NF90_FORMAT = NF90_DOUBLE
-  INTEGER, PARAMETER :: REAL_FORMAT = REAL64
 #else
-  LOGICAL, PARAMETER :: CPP_NC_DOUBLE = .FALSE.
   INTEGER, PARAMETER :: NF90_FORMAT = NF90_FLOAT
-  INTEGER, PARAMETER :: REAL_FORMAT = REAL32
 #endif
-CONTAINS
-
 END MODULE lmdz_netcdf