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

…s:develop' (01f20ae). * trilinos-develop: Revert "MueLu RefMaxwell: Change default behavior for applying BCs to A_nodal" TrilinosCouplings: Skip QR in Maxwell example
tcad-charon · Jul 7, 2021 · 938e73e · 938e73e
2 parents 01f20ae + e06fadb
commit 938e73e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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",   false);
+    applyBCsToAnodal_          = list.get("refmaxwell: apply BCs to Anodal",   true);
     applyBCsToH_               = list.get("refmaxwell: apply BCs to H",        true);
     applyBCsTo22_              = list.get("refmaxwell: apply BCs to 22",       true);
 

diff --git a/packages/trilinoscouplings/examples/scaling/Maxwell.xml b/packages/trilinoscouplings/examples/scaling/Maxwell.xml
@@ -57,6 +57,7 @@
       <Parameter name="number of equations" type="int" value="3"/>
       <Parameter name="aggregation: type" type="string" value="uncoupled"/>
       <Parameter name="aggregation: drop tol" type="double" value="0.01"/>
+      <Parameter name="tentative: calculate qr" type="bool" value="false"/>
       <Parameter name="coarse: max size" type="int" value="128"/>
       <Parameter name="coarse: type" type="string" value="Klu"/>
       <Parameter name="smoother: type" type="string" value="CHEBYSHEV"/>