[PL] Separate matrix output for M,K,b and J,b

A little code duplication in favor not to deal with pointers.
ufz · Jul 17, 2024 · 3e9a70c · 3e9a70c
1 parent b0cfd47
commit 3e9a70c
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 22 deletions.
diff --git a/ProcessLib/Assembly/MatrixOutput.cpp b/ProcessLib/Assembly/MatrixOutput.cpp
@@ -286,12 +286,11 @@ LocalMatrixOutput::LocalMatrixOutput()
          outputFilename);
 }
 
-void LocalMatrixOutput::operator()(
-    double const t, int const process_id, std::size_t const element_id,
-    std::vector<double> const* local_M_data,
-    std::vector<double> const* local_K_data,
-    std::vector<double> const& local_b_data,
-    std::vector<double> const* const local_Jac_data)
+void LocalMatrixOutput::operator()(double const t, int const process_id,
+                                   std::size_t const element_id,
+                                   std::vector<double> const& local_M_data,
+                                   std::vector<double> const& local_K_data,
+                                   std::vector<double> const& local_b_data)
 {
     [[likely]] if (!isOutputRequested(element_id))
     {
@@ -307,29 +306,55 @@ void LocalMatrixOutput::operator()(
     fmt::print(fh, "## t = {:.15g}, process id = {}, element id = {}\n\n", t,
                process_id, element_id);
 
-    if (local_M_data && !local_M_data->empty())
+    if (!local_M_data.empty())
     {
         DBUG("... M");
-        fmt::print(fh, "# M\n{}\n\n", toSquareMatrixRowMajor(*local_M_data));
+        fmt::print(fh, "# M\n{}\n\n", toSquareMatrixRowMajor(local_M_data));
     }
 
-    if (local_K_data && !local_K_data->empty())
+    if (!local_K_data.empty())
     {
         DBUG("... K");
-        fmt::print(fh, "# K\n{}\n\n", toSquareMatrixRowMajor(*local_K_data));
+        fmt::print(fh, "# K\n{}\n\n", toSquareMatrixRowMajor(local_K_data));
     }
 
     if (!local_b_data.empty())
     {
         DBUG("... b");
         fmt::print(fh, "# b\n{}\n\n", MathLib::toVector(local_b_data));
     }
+}
+
+void LocalMatrixOutput::operator()(double const t, int const process_id,
+                                   std::size_t const element_id,
+                                   std::vector<double> const& local_b_data,
+                                   std::vector<double> const& local_Jac_data)
+{
+    [[likely]] if (!isOutputRequested(element_id))
+    {
+        return;
+    }
+
+    std::lock_guard lock_guard{mutex_};
+
+    auto& fh = outputFile_;
+
+    DBUG("Writing to local matrix debug output file...");
+
+    fmt::print(fh, "## t = {:.15g}, process id = {}, element id = {}\n\n", t,
+               process_id, element_id);
+
+    if (!local_b_data.empty())
+    {
+        DBUG("... b");
+        fmt::print(fh, "# b\n{}\n\n", MathLib::toVector(local_b_data));
+    }
 
-    if (local_Jac_data && !local_Jac_data->empty())
+    if (!local_Jac_data.empty())
     {
         DBUG("... Jac");
         fmt::print(fh, "# Jac\n{}\n\n\n",
-                   toSquareMatrixRowMajor(*local_Jac_data));
+                   toSquareMatrixRowMajor(local_Jac_data));
     }
 }
 

diff --git a/ProcessLib/Assembly/MatrixOutput.h b/ProcessLib/Assembly/MatrixOutput.h
@@ -45,10 +45,14 @@ struct LocalMatrixOutput
 
     void operator()(double const t, int const process_id,
                     std::size_t const element_id,
-                    std::vector<double> const* local_M_data,
-                    std::vector<double> const* local_K_data,
+                    std::vector<double> const& local_M_data,
+                    std::vector<double> const& local_K_data,
+                    std::vector<double> const& local_b_data);
+
+    void operator()(double const t, int const process_id,
+                    std::size_t const element_id,
                     std::vector<double> const& local_b_data,
-                    std::vector<double> const* const local_Jac_data = nullptr);
+                    std::vector<double> const& local_Jac_data);
 
     ~LocalMatrixOutput();
 

diff --git a/ProcessLib/Assembly/ParallelVectorMatrixAssembler.cpp b/ProcessLib/Assembly/ParallelVectorMatrixAssembler.cpp
@@ -205,8 +205,8 @@ void ParallelVectorMatrixAssembler::assembleWithJacobian(
                     continue;
                 }
 
-                local_matrix_output_(t, process_id, element_id, nullptr,
-                                     nullptr, local_b_data, &local_Jac_data);
+                local_matrix_output_(t, process_id, element_id, local_b_data,
+                                     local_Jac_data);
             }
         }
         else
@@ -241,8 +241,8 @@ void ParallelVectorMatrixAssembler::assembleWithJacobian(
                     continue;
                 }
 
-                local_matrix_output_(t, process_id, element_id, nullptr,
-                                     nullptr, local_b_data, &local_Jac_data);
+                local_matrix_output_(t, process_id, element_id, local_b_data,
+                                     local_Jac_data);
             }
         }
     }  // OpenMP parallel section

diff --git a/ProcessLib/VectorMatrixAssembler.cpp b/ProcessLib/VectorMatrixAssembler.cpp
@@ -99,7 +99,7 @@ void VectorMatrixAssembler::assemble(
         b->add(indices, _local_b_data);
     }
 
-    _local_output(t, process_id, mesh_item_id, &_local_M_data, &_local_K_data,
+    _local_output(t, process_id, mesh_item_id, _local_M_data, _local_K_data,
                   _local_b_data);
 }
 
@@ -169,8 +169,7 @@ void VectorMatrixAssembler::assembleWithJacobian(
             "errors in the local assembler of the current process.");
     }
 
-    _local_output(t, process_id, mesh_item_id, nullptr, nullptr, _local_b_data,
-                  &_local_Jac_data);
+    _local_output(t, process_id, mesh_item_id, _local_b_data, _local_Jac_data);
 }
 
 }  // namespace ProcessLib