Merge pull request #503 from GregorySchwing/bugfix

comment out clang tidy and ensure src has subvolume before exiting on…
GOMC-WSU · Sep 6, 2023 · ead59f2 · ead59f2
2 parents fc56ad1 + 1b98c93
commit ead59f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(src/GPU)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # clang-tidy
-set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,mpi-*,openmp-*)
+#set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,mpi-*,openmp-*)
 
 #Versioning
 set (GOMC_VERSION_MAJOR 2)

diff --git a/src/moves/TargetedSwap.h b/src/moves/TargetedSwap.h
@@ -421,7 +421,7 @@ inline uint TargetedSwap::GetBoxPairAndMol(const double subDraw,
   state = PickMolInSubVolume();
 
 #if ENSEMBLE == GCMC
-  if (state == mv::fail_state::NO_MOL_OF_KIND_IN_BOX && sourceBox == mv::BOX1) {
+  if (state == mv::fail_state::NO_MOL_OF_KIND_IN_BOX && sourceBox == mv::BOX1 && hasSubVolume[sourceBox]) {
     std::cout << "Error: There are no molecules of kind "
               << molRef.kinds[kindIndex].name << " left in reservoir.\n";
     exit(EXIT_FAILURE);