Adding error messages

njoy · Apr 25, 2024 · e744184 · e744184
1 parent 7733b42
commit e744184
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 12 deletions.
diff --git a/src/NDItk/MultigroupTable.hpp b/src/NDItk/MultigroupTable.hpp
@@ -4,6 +4,7 @@
 // system includes
 
 // other includes
+#include "tools/Log.hpp"
 #include "NDItk/multigroup/Metadata.hpp"
 #include "NDItk/multigroup/Structure.hpp"
 #include "NDItk/multigroup/FluxWeights.hpp"

diff --git a/src/NDItk/MultigroupTable/src/read.hpp b/src/NDItk/MultigroupTable/src/read.hpp
@@ -19,11 +19,14 @@ void read( Iterator& iter, const Iterator& end ) {
 
       if ( this->metadata_.numberGroups().has_value() ) {
 
-        readRecord( this->structure_, iter, end, this->metadata_.numberGroups().value() + 1 );
+        readRecord( this->structure_, iter, end,
+                    this->metadata_.numberGroups().value() + 1 );
       }
       else {
 
-        throw std::runtime_error( "Required metadata is missing: number of groups in the primary group structure" );
+        Log::error( "Metadata required for the \'\' record was not found", keyword );
+        Log::info( "Required metadata is missing: number of groups in the primary group structure" );
+        throw std::exception();
       }
     }
     else if ( keyword == this->weights_.keyword() ) {
@@ -34,7 +37,9 @@ void read( Iterator& iter, const Iterator& end ) {
       }
       else {
 
-        throw std::runtime_error( "Required metadata is missing: number of groups in the primary group structure" );
+        Log::error( "Metadata required for the \'\' record was not found", keyword );
+        Log::info( "Required metadata is missing: number of groups in the primary group structure" );
+        throw std::exception();
       }
     }
     else if ( keyword == this->xs_.keyword() ) {
@@ -45,16 +50,24 @@ void read( Iterator& iter, const Iterator& end ) {
       }
       else {
 
-        throw std::runtime_error( "Required metadata is missing:\n"
-                                  "  - number of groups in the primary group structure\n"
-                                  "  - number of reactions defined in the table" );
+        Log::error( "Metadata required for the \'\' record was not found", keyword );
+        if ( ! this->metadata_.numberGroups().has_value() ) {
+
+          Log::info( "Required metadata is missing: number of groups in the primary group structure" );
+        }
+        if ( ! this->metadata_.numberReactions().has_value() ) {
+
+          Log::info( "Required metadata is missing: number of reactions" );
+        }
+        throw std::exception();
       }
     }
     else {
 
       if ( keyword != "end" ) {
 
-        throw std::runtime_error( std::string( "Unknown keyword: " ) + keyword );
+        Log::error( "Unknown keyword found: \'{}\'", keyword );
+        throw std::exception();
       }
     }
 

diff --git a/src/NDItk/MultigroupTable/src/readRecord.hpp b/src/NDItk/MultigroupTable/src/readRecord.hpp
@@ -7,7 +7,8 @@ static void readRecord( Record& record, Iterator& iter, const Iterator& end,
 
   if ( ! record.empty() ) {
 
-    throw std::runtime_error( std::string( "Duplicate keyword detected: " ) + record.keyword() );
+    Log::error( "Duplicate keyword found: \'{}\'", record.keyword() );
+    throw std::exception();
   }
   record.read( iter, end, arguments... );
 }
diff --git a/src/NDItk/multigroup/CrossSection/src/generateData.hpp b/src/NDItk/multigroup/CrossSection/src/generateData.hpp
@@ -1,4 +1,12 @@
-static std::vector< double > generateData( int reaction, double qvalue, std::vector< double > values ) {
+/**
+ *  @brief Generate the subrecord's data vector
+ *
+ *  @param[in] reaction    the reaction identifier
+ *  @param[in] qvalue      the reaction Q value
+ *  @param[in] values      the cross section values
+ */
+static std::vector< double >
+generateData( int reaction, double qvalue, std::vector< double > values ) {
 
   std::vector< double > data( std::move( values ) );
   data.insert( data.begin(), qvalue );

diff --git a/src/NDItk/multigroup/Metadata.hpp b/src/NDItk/multigroup/Metadata.hpp
@@ -4,6 +4,7 @@
 // system includes
 
 // other includes
+#include "tools/Log.hpp"
 #include "NDItk/base/SingleIntegerRecord.hpp"
 #include "NDItk/base/SingleRealRecord.hpp"
 #include "NDItk/base/SingleStringRecord.hpp"
@@ -124,7 +125,9 @@ class Metadata {
     else if ( keyword == this->reactions_.keyword() )      { readRecord( this->reactions_, iter, end ); }
     else {
 
-      throw std::runtime_error( "Unknown keyword" );
+      Log::error( "Record with keyword \'{}\' is not part of the "
+                  "multigroup metadata", keyword );
+      throw std::exception();
     }
   };
 

diff --git a/src/NDItk/multigroup/Metadata/src/readRecord.hpp b/src/NDItk/multigroup/Metadata/src/readRecord.hpp
@@ -6,7 +6,8 @@ static void readRecord( Record& record, Iterator& iter, const Iterator& end ) {
 
   if ( ! record.empty() ) {
 
-    throw std::runtime_error( std::string( "Duplicate keyword detected: " ) + record.keyword() );
+    Log::error( "Duplicate keyword found: \'{}\'", record.keyword() );
+    throw std::exception();
   }
   record.read( iter, end );
 }
diff --git a/src/NDItk/multigroup/ReactionCrossSections.hpp b/src/NDItk/multigroup/ReactionCrossSections.hpp
@@ -6,6 +6,7 @@
 #include <iostream>
 
 // other includes
+#include "tools/Log.hpp"
 #include "NDItk/base/RealListRecord.hpp"
 #include "NDItk/multigroup/CrossSection.hpp"
 
@@ -92,7 +93,8 @@ class ReactionCrossSections : protected base::RealListRecord {
     }
     else {
 
-      throw std::runtime_error( "reaction not defined" );
+      Log::error( "Reaction with identifier \'{}\' is not present", reaction );
+      throw std::exception();
     }
   }