Fixed looking-up bogus environment variables (#915)

- Correctly stringize the macro argument instead of relying on wrong behavior.
- The parameter_name argument is expanded inside of quotes (GNU toolchain).
- Disabled fprettify for macro-definition.

Author: hfp

src/base/dbcsr_base_uses.f90

@@ -49,6 +49,15 @@
 #define TO_VERSION3(MAJOR, MINOR, UPDATE) (TO_VERSION2(MAJOR, MINOR) + (UPDATE))
 #define TO_VERSION TO_VERSION2
 
+! Rely on incorrect expansion inside of quotes to avoid issue of handling hash-character.
+!&<
+#if defined(__GNUC__)
+#define DBCSR_STRINGIZE(A) "A"
+#else
+#define DBCSR_STRINGIZE(A) #A
+#endif
+!&>
+
 ! LIBXSMM has a FORTRAN-suitable header with macro/version definitions (since v1.8.2).
 ! Allows macro-toggles (in addition to parameters).
 #if defined(__LIBXSMM)

src/core/dbcsr_config.F

@@ -146,38 +146,37 @@ MODULE dbcsr_config
    END TYPE CONF_PAR_REAL
 
 ! Convenient macro to define a configuration parameter
-#define SET_PARAMETER_DEFAULT(parameter_name, parameter_type, default_val) \
-   TYPE(parameter_type) :: parameter_name = parameter_type(name="parameter_name", val=default_val, defval=default_val)
+#define DBCSR_PARAMETER(N, T, V) TYPE(T) :: N = T(name=DBCSR_STRINGIZE(N), val=V, defval=V)
 
    TYPE dbcsr_config_type
       TYPE(CONF_PAR_MM_DRIVER) :: MM_DRIVER = &
                                   CONF_PAR_MM_DRIVER(name="MM_DRIVER", val=mm_default_driver, defval=mm_default_driver)
       TYPE(CONF_PAR_INT) :: MM_STACK_SIZE = &
                             CONF_PAR_INT(name="MM_STACK_SIZE", val=mm_stack_default_size, defval=mm_stack_default_size)
-      SET_PARAMETER_DEFAULT(AVG_ELEMENTS_IMAGES, CONF_PAR_INT, 0)
-      SET_PARAMETER_DEFAULT(NUM_MULT_IMAGES, CONF_PAR_INT, 1)
-      SET_PARAMETER_DEFAULT(N_STACKS, CONF_PAR_INT, 3)
-      SET_PARAMETER_DEFAULT(USE_MPI_RMA, CONF_PAR_LOGICAL, .FALSE.)
-      SET_PARAMETER_DEFAULT(NUM_LAYERS_3D, CONF_PAR_INT, 1)
-      SET_PARAMETER_DEFAULT(USE_COMM_THREAD, CONF_PAR_LOGICAL, .TRUE.)
-      SET_PARAMETER_DEFAULT(COMM_THREAD_LOAD, CONF_PAR_INT, 100)
-      SET_PARAMETER_DEFAULT(MM_DENSE, CONF_PAR_LOGICAL, mm_dense_default)
-      SET_PARAMETER_DEFAULT(MULTREC_LIMIT, CONF_PAR_INT, 512)
-      SET_PARAMETER_DEFAULT(RUN_ON_GPU, CONF_PAR_LOGICAL, .TRUE.)
-      SET_PARAMETER_DEFAULT(ACCDRV_THREAD_BUFFERS, CONF_PAR_INT, 8)
+      DBCSR_PARAMETER(AVG_ELEMENTS_IMAGES, CONF_PAR_INT, 0)
+      DBCSR_PARAMETER(NUM_MULT_IMAGES, CONF_PAR_INT, 1)
+      DBCSR_PARAMETER(N_STACKS, CONF_PAR_INT, 3)
+      DBCSR_PARAMETER(USE_MPI_RMA, CONF_PAR_LOGICAL, .FALSE.)
+      DBCSR_PARAMETER(NUM_LAYERS_3D, CONF_PAR_INT, 1)
+      DBCSR_PARAMETER(USE_COMM_THREAD, CONF_PAR_LOGICAL, .TRUE.)
+      DBCSR_PARAMETER(COMM_THREAD_LOAD, CONF_PAR_INT, 100)
+      DBCSR_PARAMETER(MM_DENSE, CONF_PAR_LOGICAL, mm_dense_default)
+      DBCSR_PARAMETER(MULTREC_LIMIT, CONF_PAR_INT, 512)
+      DBCSR_PARAMETER(RUN_ON_GPU, CONF_PAR_LOGICAL, .TRUE.)
+      DBCSR_PARAMETER(ACCDRV_THREAD_BUFFERS, CONF_PAR_INT, 8)
       TYPE(CONF_PAR_LOGICAL) :: ACCDRV_AVOID_AFTER_BUSY = &
                                 CONF_PAR_LOGICAL(name="ACCDRV_AVOID_AFTER_BUSY", val=.FALSE., defval=.FALSE.)
-      SET_PARAMETER_DEFAULT(ACCDRV_MIN_FLOP_PROCESS, CONF_PAR_INT, 0)
-      SET_PARAMETER_DEFAULT(ACCDRV_STACK_SORT, CONF_PAR_LOGICAL, .TRUE.)
-      SET_PARAMETER_DEFAULT(ACCDRV_MIN_FLOP_SORT, CONF_PAR_INT, 4000)
+      DBCSR_PARAMETER(ACCDRV_MIN_FLOP_PROCESS, CONF_PAR_INT, 0)
+      DBCSR_PARAMETER(ACCDRV_STACK_SORT, CONF_PAR_LOGICAL, .TRUE.)
+      DBCSR_PARAMETER(ACCDRV_MIN_FLOP_SORT, CONF_PAR_INT, 4000)
       TYPE(CONF_PAR_LOGICAL) :: ACCDRV_DO_INHOMOGENOUS = &
                                 CONF_PAR_LOGICAL(name="ACCDRV_DO_INHOMOGENOUS", val=.TRUE., defval=.TRUE.)
-      SET_PARAMETER_DEFAULT(ACCDRV_BINNING_NBINS, CONF_PAR_INT, 4096)
-      SET_PARAMETER_DEFAULT(ACCDRV_BINNING_BINSIZE, CONF_PAR_INT, 16)
-      SET_PARAMETER_DEFAULT(USE_MEMPOOLS_CPU, CONF_PAR_LOGICAL, .FALSE.)
-      SET_PARAMETER_DEFAULT(USE_MPI_ALLOCATOR, CONF_PAR_LOGICAL, .FALSE.)
-      SET_PARAMETER_DEFAULT(TAS_SPLIT_FACTOR, CONF_PAR_REAL, 1.0_real_8)
-      SET_PARAMETER_DEFAULT(USE_ACC_G2G, CONF_PAR_LOGICAL, .FALSE.)
+      DBCSR_PARAMETER(ACCDRV_BINNING_NBINS, CONF_PAR_INT, 4096)
+      DBCSR_PARAMETER(ACCDRV_BINNING_BINSIZE, CONF_PAR_INT, 16)
+      DBCSR_PARAMETER(USE_MEMPOOLS_CPU, CONF_PAR_LOGICAL, .FALSE.)
+      DBCSR_PARAMETER(USE_MPI_ALLOCATOR, CONF_PAR_LOGICAL, .FALSE.)
+      DBCSR_PARAMETER(TAS_SPLIT_FACTOR, CONF_PAR_REAL, 1.0_real_8)
+      DBCSR_PARAMETER(USE_ACC_G2G, CONF_PAR_LOGICAL, .FALSE.)
    END TYPE dbcsr_config_type
 
    TYPE(dbcsr_config_type), PROTECTED, SAVE :: dbcsr_cfg = dbcsr_config_type() ! defaults