enable compilation with Intel and nvhpc(>23.7 required)

ecmwf-ifs · Nov 9, 2023 · 8c602b2 · 8c602b2
1 parent 50e883c
commit 8c602b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/src/programs/CMakeLists.txt b/src/programs/CMakeLists.txt
@@ -36,6 +36,8 @@ ecbuild_list_add_pattern( LIST driver_src
 			    ectrans-benchmark-data_mod.F90
                           QUIET
                         )
+set(CMAKE_Fortran_PREPROCESS_SOURCE
+  "gcc -cpp <DEFINES> <INCLUDES> -E <SOURCE> -o <PREPROCESSED_SOURCE>")
 foreach( prec sp dp )
   if( HAVE_${prec} )
      if( ${prec} MATCHES "sp" )

diff --git a/src/trans/CMakeLists.txt b/src/trans/CMakeLists.txt
@@ -49,6 +49,9 @@ if( NOT HAVE_FFTW )
   ecbuild_list_exclude_pattern( LIST trans_src REGEX tpm_fftw.F90 )
 endif()
 
+set(CMAKE_Fortran_PREPROCESS_SOURCE
+  "gcc -cpp <DEFINES> <INCLUDES>  -E <SOURCE> -o <PREPROCESSED_SOURCE>")
+
 foreach( prec dp sp )
   if( HAVE_${prec} )
 

diff --git a/src/trans/include/ectrans/renames.inc b/src/trans/include/ectrans/renames.inc
@@ -3,6 +3,10 @@
 #define PASTE2(x,y) x/**/y
 #define EVALUATOR(x,y) PASTE2(PASTE2(x,_),y)
 #define SUFFIXIZE(fun) EVALUATOR(fun,SYMBOLSUFFIX)
+!#define __ATLAS_IO_SPLICE(a, b) __ATLAS_IO_SPLICE_1(a, b)
+!#define __ATLAS_IO_SPLICE_1(a, b) __ATLAS_IO_SPLICE_2(a, b)
+!#define __ATLAS_IO_SPLICE_2(a, b) a##b
+!#define SUFFIXIZE(fun) __ATLAS_IO_SPLICE(fun,SYMBOLSUFFIX)
 #define ABORT_TRANS_MOD  SUFFIXIZE(ABORT_TRANS_MOD)
 #define ASRE1AD_MOD  SUFFIXIZE(ASRE1AD_MOD)
 #define ASRE1BAD_MOD  SUFFIXIZE(ASRE1BAD_MOD)