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

Timestamp:

Jul 20, 2024, 6:08:57 PM (13 months ago)

Author:

abarral

Message:

Move lmdz_netcdf_format.F90 -> lmdz_cppkeys_wrapper.F90 to handle other CPP keys
Replace all (except wrapper) use of CPP_PHYS by fortran logical

Location:

LMDZ6/branches/Amaury_dev/libf/misc

Files:

• lmdz_cppkeys_wrapper.F90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/misc/lmdz_netcdf_format.F90) (2 diffs)
• write_field.F90 (modified) (1 diff)

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

@@ -1 +1 @@
 ! ---------------------------------------------
-! This module serves as a wrapper around netcdf.
-! It serves two primary functions:
-!  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.
-! The "real" netcdf module/headers should ONLY be called here.
+! This file is part of an effort to replace most uses of preprocessor CPP keys by fortran variables,
+! to improve readability, compilation coverage, and linting.
+! CPP keys used here should ONLY be used here,
+! and imported through USE ..., ONLY: ... elsewhere
+! CPP keys supported (key -> fortran variables associated):
+!      NC_DOUBLE -> nf90_format
+!      CPP_PHYS  -> CPPKEY_PHYS
 ! ---------------------------------------------
 
-MODULE lmdz_netcdf_format
+MODULE lmdz_cppkeys_wrapper
   USE, INTRINSIC :: ISO_FORTRAN_ENV, ONLY : REAL64, REAL32
   USE netcdf, ONLY: nf90_float, nf90_double
   IMPLICIT NONE; PRIVATE
-  PUBLIC nf90_format
+  PUBLIC nf90_format, CPPKEY_PHYS
 
 #ifdef NC_DOUBLE
@@ -18 +20 @@
   INTEGER, PARAMETER :: nf90_format = nf90_float
 #endif
-END MODULE lmdz_netcdf_format
+
+#ifdef CPP_PHYS
+  LOGICAL, PARAMETER :: CPPKEY_PHYS = .TRUE.
+#else
+  LOGICAL, PARAMETER :: CPPKEY_PHYS = .FALSE.
+#endif
+
+END MODULE lmdz_cppkeys_wrapper

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

@@ -2 +2 @@
   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
+  USE lmdz_cppkeys_wrapper, ONLY: nf90_format
 
   implicit none