Small follow-up fixes for error report function changes.

Author: oleburghardt

Common/include/basic_types/ad_structure.hpp

@@ -304,14 +304,14 @@ inline void SetTagErrorCallback(struct ErrorReport* report) {}
  * \brief Reset the error counter in an ErrorReport.
  * \param[in] report - the ErrorReport whose error counter is resetted.
  */
-inline void ResetErrorCounter(struct ErrorReport* report) {}
+inline void ResetErrorCounter(struct ErrorReport& report) {}
 
 /*!
- * \brief Get a pointer to the error counter of an ErrorReport.
+ * \brief Get the error count of an ErrorReport.
  * \param[in] report - the ErrorReport whose pointer to its error counter is returned.
- * \return Pointer to the error counter.
+ * \return Value of the error counter.
  */
-inline unsigned long* GetErrorCount(struct ErrorReport* report) { return NULL; }
+inline unsigned long GetErrorCount(ErrorReport& report) { return 0; }
 
 /*!
  * \brief Pushes back the current tape position to the tape position's vector.
@@ -721,7 +721,7 @@ FORCEINLINE void ResumePreaccumulation(bool wasActive) {
 
 struct ErrorReport {
   unsigned long ErrorCounter = 0;
-  std::ofstream* out = &std::cout;
+  std::ofstream* out = nullptr;
 };
 
 FORCEINLINE void ResetErrorCounter(ErrorReport& report) { report.ErrorCounter = 0; }
@@ -730,7 +730,7 @@ FORCEINLINE void SetDebugReportFile(struct ErrorReport* report, std::ofstream* o
   report->out = output_file;
 }
 
-FORCEINLINE unsigned long& GetErrorCount(ErrorReport& report) { return report->ErrorCounter; }
+FORCEINLINE unsigned long GetErrorCount(ErrorReport& report) { return report.ErrorCounter; }
 
 #ifdef CODI_TAG_TAPE
 

SU2_CFD/src/drivers/CDiscAdjMultizoneDriver.cpp

@@ -240,7 +240,7 @@ void CDiscAdjMultizoneDriver::DebugRun() {
   std::ofstream out1("run1_process" + to_string(rank) + ".out");
   std::ofstream out2("run2_process" + to_string(rank) + ".out");
 
-  AD::ResetErrorCounter(&error_report);
+  AD::ResetErrorCounter(error_report);
   AD::SetDebugReportFile(&error_report, &out1);
 
   /*--- This recording will assign the initial (same) tag to each registered variable.
@@ -268,7 +268,7 @@ void CDiscAdjMultizoneDriver::DebugRun() {
   }
   DebugRun_ScreenOutput(error_report);
 
-  AD::ResetErrorCounter(&error_report);
+  AD::ResetErrorCounter(error_report);
   AD::SetDebugReportFile(&error_report, &out2);
 
   /*--- This recording repeats the initial recording with a different tag.
@@ -298,11 +298,11 @@ void CDiscAdjMultizoneDriver::DebugRun() {
 
 void CDiscAdjMultizoneDriver::DebugRun_ScreenOutput(struct AD::ErrorReport& error_report) {
 
+  int num_errors = AD::GetErrorCount(error_report);
   int total_errors = 0;
   std::vector<int> process_error(size);
-
-  SU2_MPI::Allreduce(AD::GetErrorCount(&error_report), &total_errors, 1, MPI_INT, MPI_SUM, SU2_MPI::GetComm());
-  SU2_MPI::Gather(AD::GetErrorCount(&error_report), 1, MPI_INT, process_error.data(), 1, MPI_INT, 0, SU2_MPI::GetComm());
+  SU2_MPI::Allreduce(&num_errors, &total_errors, 1, MPI_INT, MPI_SUM, SU2_MPI::GetComm());
+  SU2_MPI::Gather(&num_errors, 1, MPI_INT, process_error.data(), 1, MPI_INT, 0, SU2_MPI::GetComm());
 
   if (rank == MASTER_NODE) {
     std::cout << "\nTotal number of detected tape inconsistencies: " << total_errors << std::endl;