Syscheck: Run a system check before running MFC

Author: henryleberre

CMakeLists.txt

@@ -22,6 +22,7 @@ option(MFC_OpenACC       "Build with OpenACC"  OFF)
 option(MFC_PRE_PROCESS   "Build pre_process"   OFF)
 option(MFC_SIMULATION    "Build simulation"    OFF)
 option(MFC_POST_PROCESS  "Build post_process"  OFF)
+option(MFC_SYSCHECK      "Build syscheck"      OFF)
 option(MFC_DOCUMENTATION "Build documentation" OFF)
 option(MFC_ALL           "Build everything"    OFF)
 
@@ -94,7 +95,8 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
 
     if (CMAKE_BUILD_TYPE STREQUAL "Debug")
         add_compile_options(
-            -fcheck=all     -fbacktrace
+            -fcheck=all,no-array-temps 
+            -fbacktrace
             -fimplicit-none
         )
     endif()
@@ -220,25 +222,36 @@ endif()
 # and generate documentation. Instead, we can simply include the list of .f90
 # files that will eventually be used to compile <target>.
 
-macro(HANDLE_SOURCES target)
+macro(HANDLE_SOURCES target useCommon)
     set(${target}_DIR "${CMAKE_SOURCE_DIR}/src/${target}")
     set(common_DIR    "${CMAKE_SOURCE_DIR}/src/common")
 
     # Gather src/[<target>,common]/*.f90
     file(GLOB ${target}_F90s CONFIGURE_DEPENDS "${${target}_DIR}/*.f90")
-    file(GLOB    common_F90s CONFIGURE_DEPENDS    "${common_DIR}/*.f90")
-    set(${target}_SRCs ${${target}_F90s} ${common_F90s})
+    set(${target}_SRCs ${${target}_F90s})
+    if (${useCommon})
+        file(GLOB common_F90s CONFIGURE_DEPENDS "${common_DIR}/*.f90")
+        list(APPEND ${target}_SRCs ${common_F90s})
+    endif()
 
     # src/[<target>,common]/*.fpp -> src/<target>/autogen/*.f90
     file(GLOB ${target}_FPPs CONFIGURE_DEPENDS "${${target}_DIR}/*.fpp")
-    file(GLOB    common_FPPs CONFIGURE_DEPENDS    "${common_DIR}/*.fpp")
+    if (${useCommon})
+        file(GLOB common_FPPs CONFIGURE_DEPENDS "${common_DIR}/*.fpp")
+        list(APPEND ${target}_FPPs ${common_FPPs})
+    endif()
 
     # Locate src/[<target>,common]/include/*.fpp
-    file(GLOB ${target}_incs CONFIGURE_DEPENDS "${${target}_DIR}/include/*.fpp")
-    file(GLOB    common_incs CONFIGURE_DEPENDS    "${common_DIR}/include/*.fpp")
+    if (EXISTS "${${target}_DIR}/include")
+        file(GLOB ${target}_incs CONFIGURE_DEPENDS "${${target}_DIR}/include/*.fpp")
+    endif()
+    if (${useCommon})
+        file(GLOB common_incs CONFIGURE_DEPENDS "${common_DIR}/include/*.fpp")
+        list(APPEND ${target}_incs ${common_incs})
+    endif()
 
     file(MAKE_DIRECTORY "${${target}_DIR}/autogen")
-    foreach(fpp ${${target}_FPPs} ${common_FPPs})
+    foreach(fpp ${${target}_FPPs})
         cmake_path(GET fpp FILENAME fpp_filename)
         set(f90 "${${target}_DIR}/autogen/${fpp_filename}.f90")
 
@@ -253,7 +266,7 @@ macro(HANDLE_SOURCES target)
                                  --line-numbering
                                  --no-folding
                                  "${fpp}" "${f90}"
-            DEPENDS  "${fpp};${${target}_incs};${common_incs}"
+            DEPENDS  "${fpp};${${target}_incs}"
             COMMENT  "Preprocessing (Fypp) ${fpp_filename}"
             VERBATIM
         )
@@ -263,9 +276,10 @@ macro(HANDLE_SOURCES target)
 endmacro()
 
 
-HANDLE_SOURCES(pre_process)
-HANDLE_SOURCES(simulation)
-HANDLE_SOURCES(post_process)
+HANDLE_SOURCES(pre_process ON)
+HANDLE_SOURCES(simulation ON)
+HANDLE_SOURCES(post_process ON)
+HANDLE_SOURCES(syscheck OFF)
 
 
 # MFC_SETUP_TARGET: Given a target (herein <target>), this macro creates a new
@@ -293,8 +307,12 @@ function(MFC_SETUP_TARGET)
     target_include_directories(${ARGS_TARGET} PRIVATE 
         "${CMAKE_SOURCE_DIR}/src/common"
         "${CMAKE_SOURCE_DIR}/src/common/include"
-        "${CMAKE_SOURCE_DIR}/src/${ARGS_TARGET}"
-        "${CMAKE_SOURCE_DIR}/src/${ARGS_TARGET}/include")
+        "${CMAKE_SOURCE_DIR}/src/${ARGS_TARGET}")
+    
+    if (EXISTS "${CMAKE_SOURCE_DIR}/src/${ARGS_TARGET}/include")
+        target_include_directories(${ARGS_TARGET} PRIVATE
+            "${CMAKE_SOURCE_DIR}/src/${ARGS_TARGET}/include")
+    endif()
 
     string(TOUPPER "${ARGS_TARGET}" ARGS_TARGET_UPPER)
     target_compile_definitions(
@@ -338,6 +356,7 @@ function(MFC_SETUP_TARGET)
         endif()
 
         target_link_libraries(${ARGS_TARGET} PRIVATE OpenACC::OpenACC_Fortran)
+        target_compile_definitions(${ARGS_TARGET} PRIVATE MFC_OpenACC)
 
         if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
             # FIXME: This should work with other cards than gfx90a ones.
@@ -401,6 +420,11 @@ if (MFC_POST_PROCESS)
     target_compile_options(post_process PRIVATE -O0)
 endif()
 
+if (MFC_SYSCHECK)
+    MFC_SETUP_TARGET(TARGET  syscheck
+                     SOURCES "${syscheck_SRCs}"
+                     MPI OpenACC)
+endif()
 
 if (MFC_DOCUMENTATION)
     # GEN_DOCS: Given a target name (herein <target>), this macro sets up a

src/simulation/m_checker.fpp

@@ -29,7 +29,7 @@ contains
         bub_fac = 0
         if (bubbles .and. (num_fluids == 1)) bub_fac = 1
 
-#if !(defined(_OPENACC) && defined(__PGI))
+#if !(defined(MFC_OpenACC) && defined(__PGI))
         if (cu_mpi) then
             call s_mpi_abort('Unsupported value of cu_mpi. Exiting ...')
         end if

src/simulation/m_fftw.fpp

@@ -16,7 +16,7 @@ module m_fftw
 
     use m_mpi_proxy            !< Message passing interface (MPI) module proxy
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
     use cufft
 #endif
     ! ==========================================================================
@@ -27,7 +27,7 @@ module m_fftw
  s_apply_fourier_filter, &
  s_finalize_fftw_module
 
-#if !(defined(_OPENACC) && defined(__PGI))
+#if !(defined(MFC_OpenACC) && defined(__PGI))
     include 'fftw3.f03'
 #endif
 
@@ -43,7 +43,7 @@ module m_fftw
     complex(c_double_complex), pointer :: data_fltr_cmplx(:) !<
     !! Filtered complex data in Fourier space
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
     !$acc declare create(real_size, cmplx_size, x_size, batch_size)
 
     real(kind(0d0)),    allocatable :: data_real_gpu(:)
@@ -65,7 +65,7 @@ contains
         !!      applying the Fourier filter in the azimuthal direction.
     subroutine s_initialize_fftw_module() ! ----------------------------------
 
-#if defined(_OPENACC) && !defined(__PGI)
+#if defined(MFC_OpenACC) && !defined(__PGI)
 
         print *, "The FFTW module is not supported when using OpenACC with a compiler other than NVHPC/PGI."
         stop 1
@@ -81,7 +81,7 @@ contains
 
         batch_size = x_size*sys_size
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
         rank = 1; istride = 1; ostride = 1
 
         allocate(cufft_size(1:rank), iembed(1:rank), oembed(1:rank))
@@ -106,7 +106,7 @@ contains
         bwd_plan = fftw_plan_dft_c2r_1d(real_size, data_fltr_cmplx, data_real, FFTW_ESTIMATE)
 #endif
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
         @:ALLOCATE(data_real_gpu(1:real_size*x_size*sys_size))
         @:ALLOCATE(data_cmplx_gpu(1:cmplx_size*x_size*sys_size))
         @:ALLOCATE(data_fltr_cmplx_gpu(1:cmplx_size*x_size*sys_size))
@@ -132,7 +132,7 @@ contains
         ! Restrict filter to processors that have cells adjacent to axis
         if (bc_y%beg >= 0) return
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
 
 !$acc parallel loop collapse(3) gang vector default(present)
         do k = 1, sys_size
@@ -270,7 +270,7 @@ contains
         !!      applying the Fourier filter in the azimuthal direction.
     subroutine s_finalize_fftw_module() ! ------------------------------------
 
-#if defined(_OPENACC) && defined(__PGI)
+#if defined(MFC_OpenACC) && defined(__PGI)
         @:DEALLOCATE(data_real_gpu, data_fltr_cmplx_gpu, data_cmplx_gpu)
         ierr = cufftDestroy(fwd_plan_gpu)
         ierr = cufftDestroy(bwd_plan_gpu)

src/simulation/m_global_parameters.fpp

@@ -20,7 +20,7 @@ module m_global_parameters
 
     use m_derived_types        !< Definitions of the derived types
 
-#ifdef _OPENACC
+#ifdef MFC_OpenACC
     use openacc
 #endif