From f36db86b3c2e4e2f6737e4083a019e8a536ed2d9 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Sat, 5 Feb 2022 18:24:24 +0100
Subject: [PATCH] better debug for gfortran, removing options not needed

---
 CMakeLists.txt                 |  2 +-
 cmake/Compiler-GNU.cmake       | 12 +++++-------
 cmake/Compiler-Intel.cmake     |  7 +++++--
 cmake/Compiler-IntelLLVM.cmake |  5 ++++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c7b129f0..b4c405319 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,7 @@ string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE)
 if(CMAKE_BUILD_TYPE STREQUAL "DEBUG" OR CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
     set(DEBUG_FLAGS "${DEBUG_FLAGS} -DDEBUG")
     set(PARALLEL "OFF")
-    set(OPTI "OFF")
+    set(OPTI "DEBUG")
 elseif(CMAKE_BUILD_TYPE STREQUAL "RELEASE")
     set(PARALLEL "ON")
     set(OPTI "DEFENSIVE")
diff --git a/cmake/Compiler-GNU.cmake b/cmake/Compiler-GNU.cmake
index a06db2c4e..c204d1af2 100644
--- a/cmake/Compiler-GNU.cmake
+++ b/cmake/Compiler-GNU.cmake
@@ -9,26 +9,24 @@ if (OPENMP)
   set (OPENMP_FLAGS "-fopenmp")
 endif ()
 
-if (OPTIMIZATION STREQUAL "OFF")
+if (OPTIMIZATION STREQUAL "DEBUG")
+  set (OPTIMIZATION_FLAGS "-Og")
+elseif (OPTIMIZATION STREQUAL "OFF")
   set (OPTIMIZATION_FLAGS "-O0")
 elseif (OPTIMIZATION STREQUAL "DEFENSIVE")
-  set (OPTIMIZATION_FLAGS "-O2 -mtune=native -flto")
+  set (OPTIMIZATION_FLAGS "-O2 -mtune=native")
 elseif (OPTIMIZATION STREQUAL "AGGRESSIVE")
   set (OPTIMIZATION_FLAGS "-O3 -march=native -funroll-loops -ftree-vectorize -flto")
 endif ()
 
 set (STANDARD_CHECK "-std=f2018 -pedantic-errors" )
-set (LINKER_FLAGS  "${LINKER_FLAGS} -Wl")
-# options parsed directly to the linker
-set (LINKER_FLAGS  "${LINKER_FLAGS},-undefined,dynamic_lookup" )
-#   ensure to link against dynamic libraries
 
 #------------------------------------------------------------------------------------------------
 # Fine tuning compilation options
 set (COMPILE_FLAGS "${COMPILE_FLAGS} -cpp")
 # preprocessor
 
-set (COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC -fPIE")
+set (COMPILE_FLAGS "${COMPILE_FLAGS} -fPIE")
 # position independent code
 
 set (COMPILE_FLAGS "${COMPILE_FLAGS} -ffree-line-length-132")
diff --git a/cmake/Compiler-Intel.cmake b/cmake/Compiler-Intel.cmake
index 3afffd2be..7f34e4a13 100644
--- a/cmake/Compiler-Intel.cmake
+++ b/cmake/Compiler-Intel.cmake
@@ -9,12 +9,12 @@ if (OPENMP)
   set (OPENMP_FLAGS "-qopenmp -parallel")
 endif ()
 
-if (OPTIMIZATION STREQUAL "OFF")
+if (OPTIMIZATION STREQUAL "OFF" OR OPTIMIZATION STREQUAL "DEBUG")
   set (OPTIMIZATION_FLAGS    "-O0 -no-ip")
 elseif (OPTIMIZATION STREQUAL "DEFENSIVE")
   set (OPTIMIZATION_FLAGS    "-O2")
 elseif (OPTIMIZATION STREQUAL "AGGRESSIVE")
-  set (OPTIMIZATION_FLAGS    "-ipo -O3 -no-prec-div -fp-model fast=2 -xHost")
+  set (OPTIMIZATION_FLAGS    "-ipo -O3 -fp-model fast=2 -xHost")
   # -fast = -ipo, -O3, -no-prec-div, -static, -fp-model fast=2, and -xHost"
 endif ()
 
@@ -110,6 +110,9 @@ set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0")
 # generate debug information for parameters
 # Disabled due to ICE when compiling phase_damage.f90 (not understandable, there is no parameter in there)
 
+set (DEBUG_FLAGS "${DEBUG_FLAGS} -debug all")
+# generate complete debugging information
+
 # Additional options
 # -heap-arrays:            Should not be done for OpenMP, but set "ulimit -s unlimited" on shell. Probably it helps also to unlimit other limits
 # -check:                  Checks at runtime, where
diff --git a/cmake/Compiler-IntelLLVM.cmake b/cmake/Compiler-IntelLLVM.cmake
index 326cfe319..883873e1c 100644
--- a/cmake/Compiler-IntelLLVM.cmake
+++ b/cmake/Compiler-IntelLLVM.cmake
@@ -9,7 +9,7 @@ if (OPENMP)
   set (OPENMP_FLAGS "-qopenmp")
 endif ()
 
-if (OPTIMIZATION STREQUAL "OFF")
+if (OPTIMIZATION STREQUAL "OFF" OR OPTIMIZATION STREQUAL "DEBUG")
   set (OPTIMIZATION_FLAGS    "-O0")
 elseif (OPTIMIZATION STREQUAL "DEFENSIVE")
   set (OPTIMIZATION_FLAGS    "-O2")
@@ -109,6 +109,9 @@ set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0")
 set (DEBUG_FLAGS "${DEBUG_FLAGS} -debug-parameters all")
 # generate debug information for parameters
 
+set (DEBUG_FLAGS "${DEBUG_FLAGS} -debug all")
+# generate complete debugging information
+
 # Additional options
 # -heap-arrays:            Should not be done for OpenMP, but set "ulimit -s unlimited" on shell. Probably it helps also to unlimit other limits
 # -check:                  Checks at runtime, where