Repplaced all exit() calls with exception throws

Author: egor-demidov

deps/eigen

@@ -24,6 +24,7 @@
 #include "remove_overlap.h"
 #include "io_common.h"
 #include "random_engine.h"
+#include "exception.h"
 
 // Alias for aggregate mechanics model
 using aggregate_model_t = aggregate<Eigen::Vector3d, double>;
@@ -63,19 +64,15 @@ bool is_monomer_hindered(long monomer, std::vector<Eigen::Vector3d> const & xs,
 
 // Entry point
 int main(int argc, const char ** argv) {
-    if (argc < 2) {
-        std::cerr << "Path to the input file must be provided as an argument" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (argc < 2)
+        throw DemException("Path to the input file must be provided as an argument");
 
     auto parameter_store = load_parameters(argv[1]);
 
     print_header(parameter_store, "afm_necking_fraction");
 
-    if (parameter_store.simulation_type != "afm_necking_fraction") {
-        std::cerr << "Parameter file simulation type must be `afm_necking_fraction`" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (parameter_store.simulation_type != "afm_necking_fraction")
+        throw DemException("Parameter file simulation type must be `afm_necking_fraction`");
 
     /* General simulation parameters */
     // Integration time step
@@ -212,14 +209,10 @@ int main(int argc, const char ** argv) {
     bool has_necks_path = has_path_parameter(parameter_store, "necks_path");
     bool has_break_n_necks = has_integer_parameter(parameter_store, "break_n_necks");
 
-    if (has_frac_necks && has_necks_path) {
-        std::cerr << "Parameters `frac_necks` and `necks_path` are mutually exclusive, but both were provided" << std::endl;
-        exit(EXIT_FAILURE);
-    }
-    if (has_break_n_necks && !has_necks_path) {
-        std::cerr << "Parameter `break_n_necks` can only be used in combination with `necks_path`" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (has_frac_necks && has_necks_path)
+        throw DemException("Parameters `frac_necks` and `necks_path` are mutually exclusive, but both were provided");
+    if (has_break_n_necks && !has_necks_path)
+        throw DemException("Parameter `break_n_necks` can only be used in combination with `necks_path`");
 
     // Substrate vertices
     const std::tuple<Eigen::Vector3d, Eigen::Vector3d, Eigen::Vector3d, Eigen::Vector3d> substrate_vertices {
@@ -249,10 +242,8 @@ int main(int argc, const char ** argv) {
 
     x0 = load_aggregate(parameter_store);
 
-    if (x0.size() == 0) {
-        std::cerr << "Loaded an empty aggregate" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (x0.empty())
+        throw DemException("Loaded an empty aggregate");
     std::cout << "Loaded an aggregate of size " << x0.size() << std::endl;
 
     remove_overlap(x0, r_part, d_crit, n_overlap_iter);
@@ -360,8 +351,7 @@ int main(int argc, const char ** argv) {
         }
 
     } else {
-        std::cerr << "Either `frac_necks` or `necks_path` must be provided for this simulation type" << std::endl;
-        exit(EXIT_FAILURE);
+        throw DemException("Either `frac_necks` or `necks_path` must be provided for this simulation type");
     }
 
     state_printer_t state_printer(system.get_x(), system.get_v(), system.get_theta(), system.get_omega(), mass, inertia, n_dumps);

deps/libgran

@@ -15,6 +15,8 @@
 #include <libgran/surface_force/triangular_facet.h>
 #include <libgran/granular_system/granular_system.h>
 
+#include "exception.h"
+
 template <typename field_value_t, typename real_t>
 struct afm_tip {
 
@@ -106,10 +108,8 @@ struct afm_tip {
 
         std::ofstream ofs(ss.str());
 
-        if (!ofs.good()) {
-            std::cerr << "Unable to create a facet file" << std::endl;
-            exit(EXIT_FAILURE);
-        }
+        if (!ofs.good())
+            throw DemException("Unable to create a facet file");
 
         ofs << "solid facet\n";
 

deps/tinyxml2

@@ -102,27 +102,6 @@ struct aggregate {
     }
 
 private:
-
-    /*void load_mackowski_aggregate(std::string const & path) {
-        std::ifstream ifs(path);
-
-        if (!ifs.good()) {
-            std::cerr << "Unable to read the aggregate file: " << path << std::endl;
-            exit(EXIT_FAILURE);
-        }
-
-        std::string line;
-
-        while (getline(ifs, line)) {
-            if (!line.empty()) {
-                std::istringstream oss(line);
-                double _, x, y, z;
-                oss >> _ >> x >> y >> z;
-                x0.emplace_back(x * r_part, y * r_part, z * r_part);
-            }
-        }
-    }*/
-
     contact_model_t contact_model;
     sinter_model_t sinter_model;
     hamaker_model_t hamaker_model;

src/afm_necking_fraction.cpp

@@ -19,6 +19,7 @@
 #include "energy.h"
 #include "remove_overlap.h"
 #include "io_common.h"
+#include "exception.h"
 
 using aggregate_model_t = aggregate<Eigen::Vector3d, double>;
 using rect_substrate_model_t = rect_substrate<Eigen::Vector3d, double>;
@@ -49,19 +50,15 @@ void center_in_the_xy_plane(std::vector<Eigen::Vector3d> & x) {
 }
 
 int main(int argc, const char ** argv) {
-    if (argc < 2) {
-        std::cerr << "Path to the input file must be provided as an argument" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (argc < 2)
+        throw DemException("Path to the input file must be provided as an argument");
 
     auto parameter_store = load_parameters(argv[1]);
 
     print_header(parameter_store, "aggregate_deposition");
 
-    if (parameter_store.simulation_type != "deposition") {
-        std::cerr << "Parameter file simulation type must be `deposition`" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (parameter_store.simulation_type != "deposition")
+        throw DemException("Parameter file simulation type must be `deposition`");
 
     // General simulation parameters
     const double dt = get_real_parameter(parameter_store, "dt");
@@ -148,10 +145,8 @@ int main(int argc, const char ** argv) {
 
     x0 = load_aggregate(parameter_store);
 
-    if (x0.size() == 0) {
-        std::cerr << "Loaded an empty aggregate" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (x0.empty())
+        throw DemException("Loaded an empty aggregate");
     std::cout << "Loaded an aggregate of size " << x0.size() << std::endl;
 
     remove_overlap(x0, r_part, d_crit, n_overlap_iter);

src/afm_tip.h

@@ -29,6 +29,7 @@
 #include "io_common.h"
 #include "parameter_loader.h"
 #include "random_engine.h"
+#include "exception.h"
 
 using contact_force_model_t = contact_force_functor<Eigen::Vector3d, double>;
 using hamaker_force_model_t = hamaker_functor<Eigen::Vector3d, double>;
@@ -137,19 +138,15 @@ void populate_node_indices(AggregateGraph & graph, std::vector<GraphEdge> const
 }
 
 int main(int argc, char ** argv) {
-    if (argc < 2) {
-        std::cerr << "Path to the input file must be provided as an argument" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (argc < 2)
+        throw DemException("Path to the input file must be provided as an argument");
 
     auto parameter_store = load_parameters(argv[1]);
 
     print_header(parameter_store, "aggregation");
 
-    if (parameter_store.simulation_type != "aggregation") {
-        std::cerr << "Parameter file simulation type must be `aggregation`" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (parameter_store.simulation_type != "aggregation")
+        throw DemException("Parameter file simulation type must be `aggregation`");
 
     // General simulation parameters
     const double dt = get_real_parameter(parameter_store, "dt");

src/aggregate.h

@@ -29,6 +29,7 @@
 #include "parameter_loader.h"
 #include "random_engine.h"
 #include "rect_substrate.h"
+#include "exception.h"
 
 using aggregate_model_t = aggregate<Eigen::Vector3d, double>;
 using coating_model_t = binary_coating_functor<Eigen::Vector3d, double>;
@@ -41,19 +42,15 @@ using granular_system_t = granular_system_neighbor_list<Eigen::Vector3d, double,
     rotational_step_handler, binary_force_container_t, unary_force_container_t>;
 
 int main(int argc, const char ** argv) {
-    if (argc < 2) {
-        std::cerr << "Path to the input file must be provided as an argument" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (argc < 2)
+        throw DemException("Path to the input file must be provided as an argument");
 
     auto parameter_store = load_parameters(argv[1]);
 
     print_header(parameter_store, "anchored_restructuring");
 
-    if (parameter_store.simulation_type != "anchored_restructuring") {
-        std::cerr << "Parameter file simulation type must be `anchored_restructuring`" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (parameter_store.simulation_type != "anchored_restructuring")
+        throw DemException("Parameter file simulation type must be `anchored_restructuring`");
 
     // General simulation parameters
     const double dt = get_real_parameter(parameter_store, "dt");
@@ -146,10 +143,8 @@ int main(int argc, const char ** argv) {
     x0 = load_aggregate(parameter_store);
     remove_overlap(x0, r_part, d_crit, n_overlap_iter);
 
-    if (x0.size() == 0) {
-        std::cerr << "Loaded an empty aggregate" << std::endl;
-        exit(EXIT_FAILURE);
-    }
+    if (x0.empty())
+        throw DemException("Loaded an empty aggregate");
     std::cout << "Loaded an aggregate of size " << x0.size() << std::endl;
 
     // Fill the remaining buffers with zeros

src/aggregate_deposition.cpp

@@ -0,0 +1,23 @@
+//
+// Created by Egor on 8/11/2024.
+//
+
+#ifndef SOOT_AFM_EXCEPTION_H
+#define SOOT_AFM_EXCEPTION_H
+
+#include <string>
+#include <exception>
+
+class DemException : public std::exception {
+public:
+    explicit DemException(std::string const & message) : message{message} {}
+
+    const char * what() const noexcept override {
+        return message.c_str();
+    }
+
+private:
+    const std::string message;
+};
+
+#endif //SOOT_AFM_EXCEPTION_H

src/aggregation.cpp

@@ -8,6 +8,7 @@
 #include "energy.h"
 #include "aggregate_stats.h"
 #include "git.h"
+#include "exception.h"
 
 #include "io_common.h"
 
@@ -45,8 +46,7 @@ std::vector<Eigen::Vector3d> load_aggregate(parameter_store_t const & parameter_
     } else if (aggregate_type == "vtk") {
         x0 = load_vtk_aggregate(aggregate_path, r_part);
     } else {
-        std::cerr << "Unrecognized aggregate type: `" << aggregate_type << "`" << std::endl;
-        exit(EXIT_FAILURE);
+        throw DemException("Unrecognized aggregate type: `" + aggregate_type + "`");
     }
 
     return x0;