Update with the latest Development branch patches

src/Main.cpp

@@ -111,15 +111,13 @@ int main(int argc, char *argv[]) {
 #if defined _OPENMP && _OPENMP < 201511
     printf("Warning: OpenMP version < 4.5. GOMC will not run optimally!\n");
 #endif
-    // Print OpenMP version if recognized or OpenMP date code if not recognized.
+    // Print the OpenMP version if recognized or instead the OpenMP date code.
 #ifdef _OPENMP
-    std::unordered_map<unsigned, std::string> omp_map{
-        {200505, "2.5"}, {200805, "3.0"}, {201107, "3.1"},
-        {201307, "4.0"}, {201511, "4.5"}, {201611, "5.0 Preview 1"},
-        {201811, "5.0"}, {202011, "5.1"}, {202111, "5.2"},
-        {202411, "6.0"}};
-    std::unordered_map<unsigned, std::string>::const_iterator match =
-        omp_map.find(_OPENMP);
+    std::unordered_map<int, std::string> omp_map{
+        {200505, "2.5"}, {200805, "3.0"}, {201107, "3.1"}, {201307, "4.0"},
+        {201511, "4.5"}, {201611, "5.0 Preview 1"}, {201811, "5.0"},
+        {202011, "5.1"}, {202111, "5.2"}, {202411, "6.0"}};
+    auto match = omp_map.find(_OPENMP);
     if (match == omp_map.end())
       printf("%-40s %u\n", "Info: Compiled with OpenMP Version", _OPENMP);
     else

src/Simulation.cpp

@@ -75,6 +75,14 @@ Simulation::~Simulation() {
 void Simulation::RunSimulation(void) {
   GOMC_EVENT_START(1, GomcProfileEvent::MC_RUN);
   double startEnergy = system->potential.totalEnergy.total;
+  if (!std::isfinite(startEnergy)) {
+    std::cout
+        << "Initial system has non-finite energy. This is usually caused"
+           " by two or more atoms in the initial configuration having "
+           "identical coordinates. Please correct your input file and rerun.\n";
+
+    exit(EXIT_FAILURE);
+  }
   if (totalSteps == 0) {
     for (int i = 0; i < (int)frameSteps.size(); i++) {
       if (i == 0) {