Merge 'trilinos/Trilinos:develop' (0f5619f) into 'tcad-charon/Trilino…

…s:develop' (9bf0e29). * trilinos-develop: MueLu: Update MueLu_Structured_Region_Linear_Brick3D_Tpetra_MPI_4_regression test gold file to match results on trappist TrilinosCouplings: Compile errors Tpetra: Fixing compile bug MueLu RefMaxwell: Change default behavior for applying BCs to A_nodal Cross merge Cross merge Cross merge TrilinosCouplings: Fixing stuffs TrilinosCouplings: Adding output options Tpetra: Fixing trilinos#9369 Tpetra: Updating unit test TrilinosCouplings: More running-ish TrilinosCouplings: Stuff compiles Ifpack2: Temps Ifpack2: Minor fixes; unit tests
tcad-charon · Jul 3, 2021 · 01f20ae · 01f20ae
2 parents 9bf0e29 + 0f5619f
commit 01f20ae
Show file tree

Hide file tree

Showing 8 changed files with 3,255 additions and 81 deletions.
diff --git a/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp b/packages/ifpack2/src/Ifpack2_BlockRelaxation_def.hpp
@@ -1017,6 +1017,8 @@ description () const
     out << "Block Gauss-Seidel";
   } else if (PrecType_ == Ifpack2::Details::SGS) {
     out << "Block Symmetric Gauss-Seidel";
+  } else if (PrecType_ == Ifpack2::Details::MTSPLITJACOBI) {
+    out << "MT Split Jacobi";
   } else {
     out << "INVALID";
   }

diff --git a/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_def.hpp b/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_def.hpp
@@ -280,7 +280,7 @@ namespace MueLu {
     syncTimers_                = list.get("sync timers",                       false);
     numItersH_                 = list.get("refmaxwell: num iters H",           1);
     numIters22_                = list.get("refmaxwell: num iters 22",          1);
-    applyBCsToAnodal_          = list.get("refmaxwell: apply BCs to Anodal",   true);
+    applyBCsToAnodal_          = list.get("refmaxwell: apply BCs to Anodal",   false);
     applyBCsToH_               = list.get("refmaxwell: apply BCs to H",        true);
     applyBCsTo22_              = list.get("refmaxwell: apply BCs to 22",       true);
 

diff --git a/packages/muelu/research/regionMG/test/structured/gold_files/Brick3D_linear_4.log.gold b/packages/muelu/research/regionMG/test/structured/gold_files/Brick3D_linear_4.log.gold
@@ -1,15 +1,14 @@
 # num procs = 4
-# iteration | res-norm
+# iteration | res-norm (scaled=1)
 #
-0   1.00000000e+00
-1   1.22594245e-02
-2   5.37191675e-04
-3   3.43018250e-05
-4   2.52108388e-06
-5   2.11286753e-07
-6   2.00784747e-08
-7   2.09313983e-09
-8   2.29958642e-10
-9   2.59038556e-11
-10  2.94972356e-12
-11  3.37362651e-13
+0       1.0000000000000000e+00
+1       1.1976107712976247e-02
+2       4.7779054580156298e-04
+3       2.7374196425603819e-05
+4       1.7106050621378183e-06
+5       1.1205077868193360e-07
+6       7.5978598273874418e-09
+7       5.2946697864786102e-10
+8       3.7722999137741617e-11
+9       2.7368093467223590e-12
+10      2.0153190455782186e-13