Use error messages instead of error codes

ls1mardyn · Oct 4, 2024 · 12a8e32 · 12a8e32
1 parent de95eaa
commit 12a8e32
Show file tree

Hide file tree

Showing 91 changed files with 1,120 additions and 788 deletions.
diff --git a/src/Domain.cpp b/src/Domain.cpp
@@ -1,6 +1,7 @@
 
 #include <iostream>
 #include <string>
+#include <sstream>
 #include <cmath>
 #include <cstdint>
 
@@ -93,7 +94,9 @@ void Domain::readXML(XMLfileUnits& xmlconfig) {
 				<< _globalLength[2] << std::endl;
 		}
 		else {
-			Log::global_log->error() << "Unsupported volume type " << type << std::endl;
+			std::ostringstream error_message;
+			error_message << "Unsupported volume type " << type << std::endl;
+			MARDYN_EXIT(error_message);
 		}
 		xmlconfig.changecurrentnode("..");
 	}
@@ -552,8 +555,9 @@ void Domain::writeCheckpointHeader(std::string filename,
 							mixingss << "\t";
 						}
 					} else {
-						Log::global_log->error() << "Only LB mixing rule supported" << std::endl;
-						MARDYN_EXIT(123);
+						std::ostringstream error_message;
+						error_message << "Only LB mixing rule supported" << std::endl;
+						MARDYN_EXIT(error_message);
 					}
 				}
 			}
@@ -710,8 +714,9 @@ void Domain::enableComponentwiseThermostat()
 
 void Domain::setComponentThermostat(int cid, int thermostat) {
 	if ((0 > cid) || (0 >= thermostat)) {
-		Log::global_log->error() << "Domain::setComponentThermostat: cid or thermostat id too low" << std::endl;
-		MARDYN_EXIT(787);
+		std::ostringstream error_message;
+		error_message << "Domain::setComponentThermostat: cid or thermostat id too low" << std::endl;
+		MARDYN_EXIT(error_message);
 	}
 	this->_componentToThermostatIdMap[cid] = thermostat;
 	this->_universalThermostatN[thermostat] = 0;

diff --git a/src/MarDyn.cpp b/src/MarDyn.cpp
@@ -192,18 +192,20 @@ int main(int argc, char** argv) {
 
 	auto numArgs = args.size();
 	if(numArgs != 1) {
-		Log::global_log->error() << "Incorrect number of arguments provided." << std::endl;
 		op.print_usage();
-		MARDYN_EXIT(-1);
+		std::ostringstream error_message;
+		error_message << "Incorrect number of arguments provided." << std::endl;
+		MARDYN_EXIT(error_message);
 	}
 	/* First read the given config file if it exists, then overwrite parameters with command line arguments. */
 	std::string configFileName(args[0]);
 	if( fileExists(configFileName.c_str()) ) {
 		Log::global_log->info() << "Config file: " << configFileName << std::endl;
 		simulation.readConfigFile(configFileName);
 	} else {
-		Log::global_log->error() << "Cannot open config file '" << configFileName << "'" << std::endl;
-		MARDYN_EXIT(-2);
+		std::ostringstream error_message;
+		error_message << "Cannot open config file '" << configFileName << "'" << std::endl;
+		MARDYN_EXIT(error_message);
 	}
 
 	/* processing command line arguments */