Merge branch 'HmAssemblyMixins' into 'master'

Parallel assembly in HM

See merge request ogs/ogs!5054

BaseLib/ThreadException.h

@@ -14,6 +14,11 @@
 
 /// Initial code from
 /// https://stackoverflow.com/questions/11828539/elegant-exception-handling-in-openmp
+///
+/// The implementation does not guarantee, that while the exception is being
+/// checked for nullptr in the bool-conversion operator, the capture is not
+/// changing the pointer. This might lead to an exception being lost if there
+/// are two exceptions thrown simultaneously.
 class ThreadException
 {
 public:
@@ -31,6 +36,8 @@ class ThreadException
  }
  }
 
+ explicit operator bool() const noexcept { return exception_ != nullptr; }
+
 private:
  std::exception_ptr exception_ = nullptr;
  std::mutex lock_;

ProcessLib/Assembly/MatrixOutput.cpp

@@ -175,10 +175,9 @@ GlobalMatrixOutput::GlobalMatrixOutput()
 }
 
 void GlobalMatrixOutput::operator()(double const t, int const process_id,
- GlobalMatrix const* M,
- GlobalMatrix const* K,
- GlobalVector const& b,
- GlobalMatrix const* const Jac)
+ GlobalMatrix const& M,
+ GlobalMatrix const& K,
+ GlobalVector const& b)
 {
  if (!do_output_)
  {
@@ -188,22 +187,20 @@ void GlobalMatrixOutput::operator()(double const t, int const process_id,
 #ifndef USE_PETSC
  ++counter_;
 
- if (M)
  {
  auto fh = openGlobalMatrixOutputFile(filenamePrefix_, counter_, t,
  process_id, "M", "mat");
 
  fh << "M ";
- outputGlobalMatrix(*M, fh);
+ outputGlobalMatrix(M, fh);
  }
 
- if (K)
  {
  auto fh = openGlobalMatrixOutputFile(filenamePrefix_, counter_, t,
  process_id, "K", "mat");
 
  fh << "K ";
- outputGlobalMatrix(*K, fh);
+ outputGlobalMatrix(K, fh);
  }
 
  {
@@ -213,21 +210,47 @@ void GlobalMatrixOutput::operator()(double const t, int const process_id,
  fh << "b ";
  outputGlobalVector(b, fh);
  }
+#else
+ // do nothing, warning message already printed in the constructor
+ (void)t;
+ (void)process_id;
+ (void)M;
+ (void)K;
+ (void)b;
+#endif
+}
+
+void GlobalMatrixOutput::operator()(double const t, int const process_id,
+ GlobalVector const& b,
+ GlobalMatrix const& Jac)
+{
+ if (!do_output_)
+ {
+ return;
+ }
+
+#ifndef USE_PETSC
+ ++counter_;
+
+ {
+ auto fh = openGlobalMatrixOutputFile(filenamePrefix_, counter_, t,
+ process_id, "b", "vec");
+
+ fh << "b ";
+ outputGlobalVector(b, fh);
+ }
 
- if (Jac)
  {
  auto fh = openGlobalMatrixOutputFile(filenamePrefix_, counter_, t,
  process_id, "Jac", "mat");
 
  fh << "Jac ";
- outputGlobalMatrix(*Jac, fh);
+ outputGlobalMatrix(Jac, fh);
  }
 #else
  // do nothing, warning message already printed in the constructor
  (void)t;
  (void)process_id;
- (void)M;
- (void)K;
  (void)b;
  (void)Jac;
 #endif

ProcessLib/Assembly/MatrixOutput.h

@@ -24,9 +24,11 @@ struct GlobalMatrixOutput
 {
  GlobalMatrixOutput();
 
- void operator()(double const t, int const process_id, GlobalMatrix const* M,
- GlobalMatrix const* K, GlobalVector const& b,
- GlobalMatrix const* const Jac = nullptr);
+ void operator()(double const t, int const process_id, GlobalMatrix const& M,
+ GlobalMatrix const& K, GlobalVector const& b);
+
+ void operator()(double const t, int const process_id, GlobalVector const& b,
+ GlobalMatrix const& Jac);
 
 private:
  std::string filenamePrefix_;