Protect CMake '-O2 -> -O3' conversion; fix NVTX

src/CMakeLists.txt

@@ -34,8 +34,12 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   ## Some CMake versions use -O2 for release; replace with -O3
-  string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-  string(REPLACE "-O2" "-O3" CMAKE_CUDA_FLAGS_RELEASE ${CMAKE_CUDA_FLAGS_RELEASE})
+  if(CMAKE_CXX_FLAGS_RELEASE)
+    string(REPLACE "-O2" "-O3" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+  endif()
+  if(CMAKE_CUDA_FLAGS_RELEASE)
+    string(REPLACE "-O2" "-O3" CMAKE_CUDA_FLAGS_RELEASE ${CMAKE_CUDA_FLAGS_RELEASE})
+  endif()
 endif()
 
 

src/GrandBrownTown.cu

@@ -746,7 +746,7 @@ void GrandBrownTown::run()
 
         }//if step == 1
 
-	PUSH_NVTX("Clear particle force data",1)
+	PUSH_NVTX("Clear particle energy data",1)
 	internal->clear_energy();
 	gpuman.sync();
 	POP_NVTX
@@ -1171,6 +1171,7 @@ void GrandBrownTown::run()
                 wkf_timer_start(timerS);
 		POP_NVTX
          } // s % outputEnergyPeriod
+     POP_NVTX
      } // done with all Brownian dynamics steps
 
      if (imd_on and clientsock)