Put the log into the err message so the CI actually shows it......

openPMD · May 8, 2024 · cdd2c28 · cdd2c28
1 parent e18d608
commit cdd2c28
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/include/openPMD/IO/ADIOS/ADIOS2Auxiliary.hpp b/include/openPMD/IO/ADIOS/ADIOS2Auxiliary.hpp
@@ -24,6 +24,7 @@
 #include "openPMD/Error.hpp"
 #include "openPMD/IO/ADIOS/macros.hpp"
 #include "openPMD/config.hpp"
+#include <sstream>
 
 #if openPMD_HAVE_ADIOS2
 #include "openPMD/Dataset.hpp"
@@ -40,6 +41,9 @@
 
 namespace openPMD
 {
+
+extern std::stringstream debugging_log;
+
 enum class GroupOrDataset
 {
     GROUP,

diff --git a/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp b/include/openPMD/IO/ADIOS/ADIOS2IOHandler.hpp
@@ -411,7 +411,9 @@ class ADIOS2IOHandlerImpl
                 errorMessage << "Trying to access a dataset with wrong type "
                                 "(trying to access dataset with type '"
                              << requiredType << "', but has type '"
-                             << actualType << "')";
+                             << actualType << "')\nLOG IS:\n"
+                             << debugging_log.str();
+                debugging_log.clear();
                 throw error::ReadError(
                     error::AffectedObject::Dataset,
                     error::Reason::UnexpectedContent,

diff --git a/src/IO/ADIOS/ADIOS2Auxiliary.cpp b/src/IO/ADIOS/ADIOS2Auxiliary.cpp
@@ -21,6 +21,7 @@
 
 #include "openPMD/auxiliary/TypeTraits.hpp"
 #include "openPMD/config.hpp"
+#include <sstream>
 #if openPMD_HAVE_ADIOS2
 #include "openPMD/Datatype.hpp"
 #include "openPMD/DatatypeHelpers.hpp"
@@ -271,9 +272,15 @@ normalizingVariableType(const adios2::IO &IO, const std::string &name)
     auto const &unsanitized_result = IO.VariableType(name);
     auto openpmd_type = fromADIOS2Type(unsanitized_result);
     auto res = switchAdios2VariableType<ToDatatype>(openpmd_type);
-    std::cout << "[normalizingVariableType] for '" << name << "' " << res
-              << " (non-normalized: " << unsanitized_result << ")" << std::endl;
+    debugging_log << "[normalizingVariableType] for '" << name << "' " << res
+                  << " (non-normalized: " << unsanitized_result << ")"
+                  << std::endl;
     return res;
 }
+
 } // namespace openPMD::detail
+namespace openPMD
+{
+std::stringstream debugging_log;
+}
 #endif
diff --git a/src/IO/ADIOS/ADIOS2IOHandler.cpp b/src/IO/ADIOS/ADIOS2IOHandler.cpp
@@ -965,8 +965,8 @@ void ADIOS2IOHandlerImpl::openDataset(
     auto &fileData = getFileData(file, IfFileNotOpen::ThrowError);
     *parameters.dtype = detail::fromADIOS2Type(
         detail::normalizingVariableType(fileData.m_IO, varName));
-    std::cout << "[openDataset] opened '" << varName << "'as "
-              << *parameters.dtype << std::endl;
+    debugging_log << "[openDataset] opened '" << varName << "'as "
+                  << *parameters.dtype << std::endl;
     switchAdios2VariableType<detail::DatasetOpener>(
         *parameters.dtype, this, file, varName, parameters);
     writable->written = true;