re-enable range checking

rrsettgast · rrsettgast · commit e3122a09fa6f · 2020-08-28T14:35:12.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,6 +31,8 @@ if( NOT is_submodule )
     include( cmake/blt/SetupBLT.cmake )
     include( cmake/CMakeBasics.cmake )
     include( cmake/SetupTPL.cmake )
+else()
+    include( cmake/CMakeBasics.cmake )
 endif()
 
 include(cmake/Macros.cmake)
diff --git a/cmake/CMakeBasics.cmake b/cmake/CMakeBasics.cmake
@@ -1,10 +1,12 @@
 set(CMAKE_ENABLE_EXPORTS ON)
 
-message( "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )
 if( CMAKE_BUILD_TYPE MATCHES "Debug" )
-  set(ENABLE_ARRAY_BOUNDS_CHECK "ON" CACHE BOOL "")
+  message( "Bounds Checking Enabled" )
+  option( LVARRAY_BOUNDS_CHECK "" ON )
+else()
+  option( LVARRAY_BOUNDS_CHECK "" OFF )
 endif()
-option( ENABLE_ARRAY_BOUNDS_CHECK "" OFF )
+
 
 option( ENABLE_TOTALVIEW_OUTPUT "" OFF )
 
@@ -34,3 +36,4 @@ blt_append_custom_compiler_flag(FLAGS_VAR GEOSX_NINJA_FLAGS
 if( ${CMAKE_MAKE_PROGRAM} STREQUAL "ninja" OR ${CMAKE_MAKE_PROGRAM} MATCHES ".*/ninja$" )
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GEOSX_NINJA_FLAGS}")
 endif()
+
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
@@ -1,6 +1,5 @@
 #
-set( PREPROCESSOR_DEFINES ARRAY_BOUNDS_CHECK
-                          CHAI
+set( PREPROCESSOR_DEFINES CHAI
                           CUDA
                           MPI
                           TOTALVIEW_OUTPUT
diff --git a/docs/doxygen/LvArrayConfig.hpp b/docs/doxygen/LvArrayConfig.hpp
@@ -12,7 +12,7 @@
 
 #pragma once
 
-/* #undef LVARRAY_BOUNDS_CHECK */
+#define LVARRAY_BOUNDS_CHECK
 
 #define LVARRAY_USE_CHAI
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`#`
`2`		`-set( PREPROCESSOR_DEFINES ARRAY_BOUNDS_CHECK`
`3`		`- CHAI`
	`2`	`+set( PREPROCESSOR_DEFINES CHAI`
`4`	`3`	`CUDA`
`5`	`4`	`MPI`
`6`	`5`	`TOTALVIEW_OUTPUT`