static codechecker, MARDYN_EXIT

src/parallel/boundaries/BoundaryHandler.cpp

@@ -14,6 +14,7 @@
 #include "utils/mardyn_assert.h"
 
 #include <algorithm>
+#include <sstream> // for ostringstream
 
 BoundaryUtils::BoundaryType BoundaryHandler::getGlobalWallType(DimensionUtils::DimensionType dimension) const {
 	return _boundaries.at(dimension);
@@ -27,9 +28,9 @@ void BoundaryHandler::setGlobalWallType(DimensionUtils::DimensionType dimension,
 	if (dimension != DimensionUtils::DimensionType::ERROR)
 		_boundaries[dimension] = value;
 	else {
-		Log::global_log->error() << "DimensionType::ERROR received in BoundaryHandler::setGlobalWallType!!"
-								 << std::endl;
-		mardyn_exit(1);
+		std::ostringstream error_message;
+		error_message << "DimensionType::ERROR received in BoundaryHandler::setGlobalWallType!!" << std::endl;
+		MARDYN_EXIT(error_message.str());
 	}
 }
 
@@ -130,10 +131,9 @@ void BoundaryHandler::processGlobalWallLeavingParticles(ParticleContainer *molec
 				break;
 			}
 			default:
-				Log::global_log->error()
-					<< "BoundaryType::ERROR received in BoundaryHandler::processGlobalWallLeavingParticles!"
-					<< std::endl;
-				mardyn_exit(1);
+				std::ostringstream error_message;
+				error_message << "BoundaryType::ERROR received in BoundaryHandler::processGlobalWallLeavingParticles!" << std::endl;
+				MARDYN_EXIT(error_message.str());
 		}
 	}
 }
@@ -169,9 +169,9 @@ void BoundaryHandler::removeNonPeriodicHalos(ParticleContainer *moleculeContaine
 				break;
 			}
 			default:
-				Log::global_log->error() << "BoundaryType::ERROR received in BoundaryHandler::removeNonPeriodicHalos!"
-										 << std::endl;
-				mardyn_exit(1);
+				std::ostringstream error_message;
+				error_message << "BoundaryType::ERROR received in BoundaryHandler::removeNonPeriodicHalos!" << std::endl;
+				MARDYN_EXIT(error_message.str());
 		}
 	}
 }

src/parallel/boundaries/BoundaryUtils.cpp

@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <cctype>
 #include <string>
+#include <sstream> // for ostringstream
 
 BoundaryUtils::BoundaryType BoundaryUtils::convertStringToBoundary(const std::string &boundary) {
 	std::string boundaryLowercase(boundary);
@@ -24,10 +25,9 @@ BoundaryUtils::BoundaryType BoundaryUtils::convertStringToBoundary(const std::st
 		return BoundaryType::REFLECTING;
 	if (boundaryLowercase.find("out") != std::string::npos)
 		return BoundaryType::OUTFLOW;
-	Log::global_log->error() << "Invalid boundary type passed to "
-								"BoundaryUtils::convertStringToBoundary. Check your input file!"
-							 << std::endl;
-	mardyn_exit(1);
+	std::ostringstream error_message;
+	error_message << "Invalid boundary type passed to BoundaryUtils::convertStringToBoundary. Check your input file!" << std::endl;
+	MARDYN_EXIT(error_message.str());
 	return BoundaryType::ERROR; // warning suppression
 }
 
@@ -40,9 +40,9 @@ std::string BoundaryUtils::convertBoundaryToString(BoundaryType boundary) {
 		case BoundaryType::OUTFLOW:
 			return "outflow";
 		default:
-			Log::global_log->error() << "BoundaryType::ERROR received in BoundaryUtils::convertBoundaryToString!"
-									 << std::endl;
-			mardyn_exit(1);
+			std::ostringstream error_message;
+			error_message << "BoundaryType::ERROR received in BoundaryUtils::convertBoundaryToString!" << std::endl;
+			MARDYN_EXIT(error_message.str());
 	}
 	return "error"; // warning suppression
 }

src/parallel/boundaries/DimensionUtils.cpp

@@ -7,7 +7,9 @@
 
 #include "DimensionUtils.h"
 #include "utils/Logger.h"
-#include "utils/mardyn_assert.h" // for mardyn_exit()
+#include "utils/mardyn_assert.h" // for MARDYN_EXIT()
+
+#include <sstream> // for ostringstream
 
 bool DimensionUtils::isDimensionNumericPermissible(int dim) {
 	// permissible dimensions are {-1, -2, -3, 1, 2, 3}
@@ -16,9 +18,10 @@ bool DimensionUtils::isDimensionNumericPermissible(int dim) {
 
 DimensionUtils::DimensionType DimensionUtils::convertNumericToDimension(int dim) {
 	if (!isDimensionNumericPermissible(dim)) {
-		Log::global_log->error() << "Invalid dimension passed for enum conversion. Received value: " << dim
+		std::ostringstream error_message;
+		error_message << "Invalid dimension passed for enum conversion. Received value: " << dim
 								 << std::endl;
-		mardyn_exit(1);
+		MARDYN_EXIT(error_message.str());
 		return DimensionType::ERROR;
 	}
 	switch (dim) {
@@ -66,9 +69,10 @@ std::string DimensionUtils::convertDimensionToString(DimensionType dimension) {
 		case DimensionType::NEGZ:
 			return "-z";
 		default: // ERROR
-			Log::global_log->error() << "DimesionType::ERROR received in DimensionUtils::convertDimensionToString!"
+			std::ostringstream error_message;
+			error_message << "DimesionType::ERROR received in DimensionUtils::convertDimensionToString!"
 									 << std::endl;
-			mardyn_exit(1);
+			MARDYN_EXIT(error_message.str());
 			return "error";
 	}
 }
@@ -92,9 +96,10 @@ int DimensionUtils::convertDimensionToNumeric(DimensionType dimension) {
 		case DimensionType::NEGZ:
 			return -3;
 		default:
-			Log::global_log->error() << "DimesionType::ERROR received in DimensionUtils::convertDimensionToNumeric!"
+			std::ostringstream error_message;
+			error_message << "DimesionType::ERROR received in DimensionUtils::convertDimensionToNumeric!"
 									 << std::endl;
-			mardyn_exit(1);
+			MARDYN_EXIT(error_message.str());
 			return 0;
 	}
 }
@@ -105,4 +110,4 @@ int DimensionUtils::convertDimensionToNumericAbs(DimensionType dimension) {
 
 int DimensionUtils::convertEnumToLS1DimIndex(DimensionType dimension) {
 	return convertDimensionToNumericAbs(dimension) - 1;
-}
+}

src/parallel/boundaries/DimensionUtils.h

@@ -120,4 +120,4 @@ int convertEnumToLS1DimIndex(DimensionType dimension);
  */
 inline int findSign(DimensionType dimension) { return ::findSign(convertDimensionToNumeric(dimension)); }
 
-} // namespace DimensionUtils
+} // namespace DimensionUtils

src/parallel/boundaries/RegionUtils.cpp

@@ -6,7 +6,9 @@
  */
 
 #include "RegionUtils.h"
-#include "utils/mardyn_assert.h" //for mardyn_exit()
+#include "utils/mardyn_assert.h" //for MARDYN_EXIT()
+
+#include <sstream> // for ostringstream
 
 std::tuple<std::array<double, 3>, std::array<double, 3>> RegionUtils::getInnerRegionSlab(
 	const std::array<double, 3> &givenRegionBegin, const std::array<double, 3> &givenRegionEnd,
@@ -39,8 +41,9 @@ std::tuple<std::array<double, 3>, std::array<double, 3>> RegionUtils::getInnerRe
 			break;
 
 		default:
-			Log::global_log->error() << "DimensionType::ERROR received in RegionUtils::getInnerRegionSlab" << std::endl;
-			mardyn_exit(1);
+			std::ostringstream error_message;
+			error_message << "DimensionType::ERROR received in RegionUtils::getInnerRegionSlab" << std::endl;
+			MARDYN_EXIT(error_message.str());
 	}
 	return {returnRegionBegin, returnRegionEnd};
 }
@@ -106,8 +109,9 @@ std::tuple<std::array<double, 3>, std::array<double, 3>> RegionUtils::getOuterRe
 			break;
 
 		default:
-			Log::global_log->error() << "DimensionType::ERROR received in RegionUtils::getOuterRegionSlab" << std::endl;
-			mardyn_exit(1);
+			std::ostringstream error_message;
+			error_message << "DimensionType::ERROR received in RegionUtils::getOuterRegionSlab" << std::endl;
+			MARDYN_EXIT(error_message.str());
 	}
 	return std::make_tuple(returnRegionBegin, returnRegionEnd);
 }

src/parallel/boundaries/RegionUtils.h

@@ -96,4 +96,4 @@ std::tuple<std::array<double, 3>, std::array<double, 3>> getOuterRegionSlab(
 	const std::array<double, 3> &givenRegionBegin, const std::array<double, 3> &givenRegionEnd,
 	DimensionUtils::DimensionType dimension, const std::array<double, 3> &regionWidth);
 
-} // namespace RegionUtils
+} // namespace RegionUtils