Errors

include/micm/Util.hpp

@@ -5,10 +5,9 @@
 
 #include <micm/util/constants.hpp>
 #include <micm/util/error.hpp>
-#include <micm/util/internal_error.hpp>
+#include <micm/util/micm_exception.hpp>
 #include <micm/util/jacobian.hpp>
 #include <micm/util/matrix.hpp>
-#include <micm/util/matrix_error.hpp>
 #include <micm/util/property_keys.hpp>
 #include <micm/util/random_string.hpp>
 #include <micm/util/sparse_matrix.hpp>

include/micm/constraint/constraint_set.hpp

@@ -3,7 +3,7 @@
 #pragma once
 
 #include <micm/constraint/constraint.hpp>
-#include <micm/constraint/constraint_error.hpp>
+#include <micm/util/micm_exception.hpp>
 #include <micm/util/matrix.hpp>
 #include <micm/util/sparse_matrix.hpp>
 
@@ -12,8 +12,6 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <stdexcept>
-#include <system_error>
 #include <utility>
 #include <vector>
 
@@ -135,15 +133,20 @@ namespace micm
       auto row_it = variable_map.find(algebraic_species);
       if (row_it == variable_map.end())
       {
-        throw std::system_error(
-            make_error_code(MicmConstraintErrc::UnknownSpecies),
+        throw MicmException(
+            MicmSeverity::Error,
+            MICM_ERROR_CATEGORY_CONSTRAINT,
+            MICM_CONSTRAINT_ERROR_CODE_UNKNOWN_SPECIES,
             "Constraint '" + constraint.GetName() + "' targets unknown algebraic species '" + algebraic_species + "'");
       }
       info.constraint_row_ = row_it->second;
 
       if (!algebraic_variable_ids_.insert(info.constraint_row_).second)
       {
-        throw std::runtime_error(
+        throw MicmException(
+            MicmSeverity::Error,
+            MICM_ERROR_CATEGORY_CONSTRAINT,
+            MICM_CONSTRAINT_ERROR_CODE_INVALID_STOICHIOMETRY,
             "Multiple constraints map to the same algebraic species row '" + algebraic_species + "'");
       }
 
@@ -163,8 +166,10 @@ namespace micm
         auto it = variable_map.find(species_name);
         if (it == variable_map.end())
         {
-          throw std::system_error(
-              make_error_code(MicmConstraintErrc::UnknownSpecies),
+          throw MicmException(
+              MicmSeverity::Error,
+              MICM_ERROR_CATEGORY_CONSTRAINT,
+              MICM_CONSTRAINT_ERROR_CODE_UNKNOWN_SPECIES,
               "Constraint '" + constraint.GetName() + "' depends on unknown species '" + species_name + "'");
         }
         dependency_ids_.push_back(it->second);

include/micm/constraint/equilibrium_constraint.hpp

@@ -2,13 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <micm/constraint/constraint_error.hpp>
+#include <micm/constraint/constraint.hpp>
 #include <micm/system/stoich_species.hpp>
 
 #include <cmath>
 #include <cstddef>
 #include <string>
-#include <system_error>
 #include <vector>
 
 namespace micm
@@ -69,28 +68,28 @@ namespace micm
     {
       if (reactants_.empty())
       {
-        throw std::system_error(make_error_code(MicmConstraintErrc::EmptyReactants));
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_EMPTY_REACTANTS, "Equilibrium constraint requires at least one reactant");
       }
       if (products_.empty())
       {
-        throw std::system_error(make_error_code(MicmConstraintErrc::EmptyProducts));
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_EMPTY_PRODUCTS, "Equilibrium constraint requires at least one product");
       }
       if (equilibrium_constant_ <= 0)
       {
-        throw std::system_error(make_error_code(MicmConstraintErrc::InvalidEquilibriumConstant));
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_INVALID_EQUILIBRIUM_CONSTANT, "Equilibrium constant must be positive");
       }
       for (const auto& r : reactants_)
       {
         if (r.coefficient_ <= 0)
         {
-          throw std::system_error(make_error_code(MicmConstraintErrc::InvalidStoichiometry));
+          throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_INVALID_STOICHIOMETRY, "Stoichiometric coefficients must be positive");
         }
       }
       for (const auto& p : products_)
       {
         if (p.coefficient_ <= 0)
         {
-          throw std::system_error(make_error_code(MicmConstraintErrc::InvalidStoichiometry));
+          throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_INVALID_STOICHIOMETRY, "Stoichiometric coefficients must be positive");
         }
       }
 

include/micm/constraint/linear_constraint.hpp

@@ -2,12 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <micm/constraint/constraint_error.hpp>
+#include <micm/util/micm_exception.hpp>
 #include <micm/system/stoich_species.hpp>
 
 #include <cstddef>
 #include <string>
-#include <system_error>
 #include <vector>
 
 namespace micm
@@ -51,7 +50,7 @@ namespace micm
     {
       if (terms_.empty())
       {
-        throw std::system_error(make_error_code(MicmConstraintErrc::EmptyReactants));
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_CONSTRAINT, MICM_CONSTRAINT_ERROR_CODE_EMPTY_REACTANTS, "");
       }
       for (const auto& term : terms_)
       {

include/micm/process/chemical_reaction.hpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <micm/process/process_error.hpp>
 #include <micm/process/rate_constant/rate_constant.hpp>
 #include <micm/solver/lu_decomposition.hpp>
 #include <micm/solver/state.hpp>
@@ -58,8 +57,7 @@ namespace micm
       if (this != &other)
       {
         if (!other.rate_constant_)
-          throw std::system_error(
-              make_error_code(MicmProcessErrc::RateConstantIsNotSet),
+          throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_RATE_CONSTANT_IS_NOT_SET,
               "Cannot copy from a ChemicalReaction with null rate constant");
 
         reactants_ = other.reactants_;
@@ -101,8 +99,7 @@ namespace micm
     void Validate() const
     {
       if (!rate_constant_)
-        throw std::system_error(
-            make_error_code(MicmProcessErrc::RateConstantIsNotSet), "Rate Constant pointer cannot be null");
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_RATE_CONSTANT_IS_NOT_SET, "Rate Constant pointer cannot be null");
     }
   };
 

include/micm/process/chemical_reaction_builder.hpp

@@ -4,7 +4,6 @@
 
 #include <micm/process/chemical_reaction.hpp>
 #include <micm/process/process.hpp>
-#include <micm/process/process_error.hpp>
 #include <micm/system/phase.hpp>
 #include <micm/system/species.hpp>
 #include <micm/system/stoich_species.hpp>
@@ -65,8 +64,7 @@ namespace micm
     Process Build()
     {
       if (!rate_constant_)
-        throw std::system_error(
-            make_error_code(MicmProcessErrc::RateConstantIsNotSet), "Rate Constant pointer cannot be null.");
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_RATE_CONSTANT_IS_NOT_SET, "Rate Constant pointer cannot be null.");
 
       ChemicalReaction reaction(std::move(reactants_), std::move(products_), std::move(rate_constant_), phase_);
       return Process(std::move(reaction));

include/micm/process/phase_transfer_process.hpp

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 #pragma once
 
-#include <micm/process/process_error.hpp>
 #include <micm/process/transfer_coefficient/transfer_coefficient.hpp>
 #include <micm/system/phase.hpp>
 #include <micm/system/species.hpp>
@@ -67,8 +66,7 @@ namespace micm
       if (this != &other)
       {
         if (!other.coefficient_)
-          throw std::system_error(
-              make_error_code(MicmProcessErrc::TransferCoefficientIsNotSet),
+          throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_TRANSFER_COEFFICIENT_IS_NOT_SET,
               "Cannot copy from a PhaseTransferProcess with null coefficient");
 
         gas_phase_ = other.gas_phase_;
@@ -87,8 +85,7 @@ namespace micm
     void Validate() const
     {
       if (!coefficient_)
-        throw std::system_error(
-            make_error_code(MicmProcessErrc::TransferCoefficientIsNotSet),
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_TRANSFER_COEFFICIENT_IS_NOT_SET,
             "Phase Transfer Coefficient pointer cannot be null");
     }
   };

include/micm/process/phase_transfer_process_builder.hpp

@@ -77,8 +77,7 @@ namespace micm
     Process Build()
     {
       if (!coefficient_)
-        throw std::system_error(
-            make_error_code(MicmProcessErrc::TransferCoefficientIsNotSet),
+        throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_TRANSFER_COEFFICIENT_IS_NOT_SET,
             "Phase Transfer Coefficient pointer cannot be null");
 
       PhaseTransferProcess process(

include/micm/process/process_set.hpp

@@ -4,7 +4,6 @@
 
 #include <micm/external_model.hpp>
 #include <micm/process/process.hpp>
-#include <micm/process/process_error.hpp>
 #include <micm/solver/state.hpp>
 #include <micm/util/error.hpp>
 #include <micm/util/sparse_matrix.hpp>
@@ -171,7 +170,7 @@ namespace micm
           if (reactant.IsParameterized())
             continue;  // Skip reactants that are parameterizations
           if (variable_map.count(reactant.name_) < 1)
-            throw std::system_error(make_error_code(MicmProcessErrc::ReactantDoesNotExist), reactant.name_);
+            throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_REACTANT_DOES_NOT_EXIST, reactant.name_);
           reactant_ids_.push_back(variable_map.at(reactant.name_));
           ++number_of_reactants;
         }
@@ -181,7 +180,7 @@ namespace micm
           if (product.species_.IsParameterized())
             continue;  // Skip products that are parameterizations
           if (variable_map.count(product.species_.name_) < 1)
-            throw std::system_error(make_error_code(MicmProcessErrc::ProductDoesNotExist), product.species_.name_);
+            throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_PRODUCT_DOES_NOT_EXIST, product.species_.name_);
           product_ids_.push_back(variable_map.at(product.species_.name_));
           yields_.push_back(product.coefficient_);
           ++number_of_products;
@@ -223,7 +222,7 @@ namespace micm
               if (reactant.IsParameterized())
                 continue;  // Skip reactants that are parameterizations
               if (variable_map.count(reactant.name_) < 1)
-                throw std::system_error(make_error_code(MicmProcessErrc::ReactantDoesNotExist), reactant.name_);
+                throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_REACTANT_DOES_NOT_EXIST, reactant.name_);
               if (variable_map.at(reactant.name_) == independent_variable.second && !found)
               {
                 found = true;
@@ -237,7 +236,7 @@ namespace micm
               if (product.species_.IsParameterized())
                 continue;  // Skip products that are parameterizations
               if (variable_map.count(product.species_.name_) < 1)
-                throw std::system_error(make_error_code(MicmProcessErrc::ProductDoesNotExist), product.species_.name_);
+                throw MicmException(MicmSeverity::Error, MICM_ERROR_CATEGORY_PROCESS, MICM_PROCESS_ERROR_CODE_PRODUCT_DOES_NOT_EXIST, product.species_.name_);
               jacobian_product_ids_.push_back(variable_map.at(product.species_.name_));
               jacobian_yields_.push_back(product.coefficient_);
               ++info.number_of_products_;