From: Wolfgang Bangerth <bangerth@colostate.edu>
Date: Fri, 7 Jan 2022 09:49:22 +0000 (-0700)
Subject: Use better variable names in step-43.
X-Git-Tag: v9.4.0-rc1~650^2~1
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b1cf505f1c3b28f5855f204dbefc0c6e5d2f88b;p=dealii.git

Use better variable names in step-43.
---

diff --git a/examples/step-43/step-43.cc b/examples/step-43/step-43.cc
index 32115156ee..1985e21bbf 100644
--- a/examples/step-43/step-43.cc
+++ b/examples/step-43/step-43.cc
@@ -554,8 +554,9 @@ namespace Step43
     const double porosity;
     const double AOS_threshold;
 
-    std::shared_ptr<TrilinosWrappers::PreconditionIC> Amg_preconditioner;
-    std::shared_ptr<TrilinosWrappers::PreconditionIC> Mp_preconditioner;
+    std::shared_ptr<TrilinosWrappers::PreconditionIC> top_left_preconditioner;
+    std::shared_ptr<TrilinosWrappers::PreconditionIC>
+      bottom_right_preconditioner;
 
     bool rebuild_saturation_matrix;
 
@@ -724,8 +725,8 @@ namespace Step43
     }
 
     {
-      Amg_preconditioner.reset();
-      Mp_preconditioner.reset();
+      top_left_preconditioner.reset();
+      bottom_right_preconditioner.reset();
       darcy_preconditioner_matrix.clear();
 
       BlockDynamicSparsityPattern dsp(darcy_dofs_per_block,
@@ -930,11 +931,15 @@ namespace Step43
   {
     assemble_darcy_preconditioner();
 
-    Amg_preconditioner = std::make_shared<TrilinosWrappers::PreconditionIC>();
-    Amg_preconditioner->initialize(darcy_preconditioner_matrix.block(0, 0));
+    top_left_preconditioner =
+      std::make_shared<TrilinosWrappers::PreconditionIC>();
+    top_left_preconditioner->initialize(
+      darcy_preconditioner_matrix.block(0, 0));
 
-    Mp_preconditioner = std::make_shared<TrilinosWrappers::PreconditionIC>();
-    Mp_preconditioner->initialize(darcy_preconditioner_matrix.block(1, 1));
+    bottom_right_preconditioner =
+      std::make_shared<TrilinosWrappers::PreconditionIC>();
+    bottom_right_preconditioner->initialize(
+      darcy_preconditioner_matrix.block(1, 1));
   }
 
 
@@ -1473,12 +1478,12 @@ namespace Step43
           const LinearSolvers::InverseMatrix<TrilinosWrappers::SparseMatrix,
                                              TrilinosWrappers::PreconditionIC>
             mp_inverse(darcy_preconditioner_matrix.block(1, 1),
-                       *Mp_preconditioner);
+                       *bottom_right_preconditioner);
 
           const LinearSolvers::BlockSchurPreconditioner<
             TrilinosWrappers::PreconditionIC,
             TrilinosWrappers::PreconditionIC>
-            preconditioner(darcy_matrix, mp_inverse, *Amg_preconditioner);
+            preconditioner(darcy_matrix, mp_inverse, *top_left_preconditioner);
 
           SolverControl solver_control(darcy_matrix.m(),
                                        1e-16 * darcy_rhs.l2_norm());