Merge pull request #317 from xcompact3d/pbartholomew08-patch-1

Add DEBG macro to DEBUG builds
xcompact3d · Nov 19, 2024 · 1bfe7e5 · 1bfe7e5
2 parents afdf902 + bb2a111
commit 1bfe7e5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 31 deletions.
diff --git a/cmake/X3D_Compilers.cmake b/cmake/X3D_Compilers.cmake
@@ -5,7 +5,35 @@ message(STATUS "COMP ID ${Fortran_COMPILER_NAME}")
 message(STATUS "Fortran compiler name ${Fortran_COMPILER_NAME}")
 message(STATUS "Fortran compiler version ${CMAKE_Fortran_COMPILER_VERSION}")
 
+set(CMAKE_Fortran_PREPROCESS ON)
+if (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+  add_definitions("-DDEBUG -DDEBG")
+endif (CMAKE_BUILD_TYPE MATCHES "DEBUG")
+
+if (CMAKE_BUILD_TYPE MATCHES "DEV")
+  message(FATAL_ERROR "The code is not ready for DEV builds")
+endif (CMAKE_BUILD_TYPE MATCHES "DEV")
+
+if (ENABLE_INPLACE)
+  add_definitions("-DOVERWRITE")
+endif ()
+
+execute_process(
+  COMMAND git describe --tag --long --always
+  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+  OUTPUT_VARIABLE GIT_VERSION
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+add_definitions("-DVERSION=\"${GIT_VERSION}\"")
+option(DOUBLE_PRECISION "Build Xcompact with double precision" ON)
+if (DOUBLE_PRECISION)
+  add_definitions("-DDOUBLE_PREC")
+endif()
 
+option(SINGLE_PRECISION_OUTPUT "Build XCompact with output in single precision" OFF)
+if (SINGLE_PRECISION_OUTPUT)
+  add_definitions("-DSAVE_SINGLE")
+endif()
 
 if (Fortran_COMPILER_NAME MATCHES "GNU")
   # gfortran
@@ -44,36 +72,6 @@ if (NOT FLAGS_SET)
   set(FLAGS_SET 1 CACHE INTERNAL "Flags are set")
 endif()
 
-if (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-  add_definitions("-DDEBUG")
-endif (CMAKE_BUILD_TYPE MATCHES "DEBUG")
-
-if (CMAKE_BUILD_TYPE MATCHES "DEV")
-  message(FATAL_ERROR "The code is not ready for DEV builds")
-endif (CMAKE_BUILD_TYPE MATCHES "DEV")
-
-if (ENABLE_INPLACE)
-  add_definitions("-DOVERWRITE")
-endif ()
-
-execute_process(
-  COMMAND git describe --tag --long --always
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_VERSION
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-add_definitions("-DVERSION=\"${GIT_VERSION}\"")
-option(DOUBLE_PRECISION "Build Xcompact with double precision" ON)
-if (DOUBLE_PRECISION)
-  add_definitions("-DDOUBLE_PREC")
-endif()
-
-option(SINGLE_PRECISION_OUTPUT "Build XCompact with output in single precision" OFF)
-if (SINGLE_PRECISION_OUTPUT)
-  add_definitions("-DSAVE_SINGLE")
-endif()
-
-
 if (IO_BACKEND MATCHES "mpi")
   message(STATUS "Using mpi (default) IO backend")
 elseif (IO_BACKEND MATCHES "adios2")

diff --git a/cmake/compilers/X3D_flags_gnu.cmake b/cmake/compilers/X3D_flags_gnu.cmake
@@ -10,7 +10,7 @@ else (CMAKE_Fortran_COMPILER_VERSION GREATER_EQUAL "10")
 endif (CMAKE_Fortran_COMPILER_VERSION GREATER_EQUAL "10")
 # Flags extracted from the Makefile
 set(X3D_FFLAGS_RELEASE "-O3 -funroll-loops -floop-optimize -g") #"-O3 -funroll-loops -floop-optimize -march=native")
-set(X3D_FFLAGS_DEBUG "-g3 -Og -ffpe-trap=invalid,zero -fcheck=bounds -fimplicit-none") #"-DDEBUG -g3 -Og -ffpe-trap=invalid,zero -fcheck=all -fimplicit-none")
+set(X3D_FFLAGS_DEBUG "-g -Og -ffpe-trap=invalid,zero -fcheck=bounds -fimplicit-none") #"-DDEBUG -g3 -Og -ffpe-trap=invalid,zero -fcheck=all -fimplicit-none")
 # Dev flag below is new and not working yet
 if (FIND_MPICH AND X3D_GNU10)
   set(X3D_FFLAGS_DEV     "${X3D_FFLAGS_DEBUG} -Wall -Wno-unused-function -Wno-integer-division")

diff --git a/src/poisson.f90 b/src/poisson.f90
@@ -8,6 +8,7 @@ module decomp_2d_poisson
   use decomp_2d_constants
   use decomp_2d
   use decomp_2d_fft
+  use decomp_2d_mpi, only: nrank
 
   use mod_stret, only : alpha, beta
   use param