add -link_mpi=dbg to debug flags (NOAA-EMC#8)

DeniseWorthen · Sep 22, 2023 · 0c6e263 · 0c6e263
1 parent 337ad49
commit 0c6e263
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/configuration/scripts/machines/Macros.cheyenne_intel b/configuration/scripts/machines/Macros.cheyenne_intel
@@ -12,9 +12,13 @@ FFLAGS     := -fp-model precise -convert big_endian -assume byterecl -ftz -trace
 FFLAGS_NOOPT:= -O0
 
 ifeq ($(ICE_BLDDEBUG), true)
+<<<<<<< HEAD
 #  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
   FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -link_mpi=dbg -stand f08
 #  FFLAGS     += -O0 -g -check all -fpe0 -ftrapuv -fp-model except -check noarg_temp_created -init=snan,arrays -link_mpi=dbg
+=======
+  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -link_mpi=dbg
+>>>>>>> 916c6af3 (add -link_mpi=dbg to debug flags (#8))
 else
   FFLAGS     += -O2
 endif