MueLu RefMaxwell: Add toggle to use as preconditioned or as solver

When used as preconditioned, the initial solution vector is assumed to be zero.
trilinos · Aug 27, 2018 · 5bd0588 · 5bd0588
1 parent 703e7be
commit 5bd0588
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 2 deletions.
diff --git a/packages/muelu/adapters/stratimikos/Thyra_MueLuRefMaxwellPreconditionerFactory_decl.hpp b/packages/muelu/adapters/stratimikos/Thyra_MueLuRefMaxwellPreconditionerFactory_decl.hpp
@@ -552,6 +552,7 @@ namespace Thyra {
         }
 #endif
         // build a new MueLu RefMaxwell preconditioner
+        paramList.set<bool>("refmaxwell: use as preconditioner", true);
         preconditioner = rcp(new MueLu::RefMaxwell<Scalar,LocalOrdinal,GlobalOrdinal,Node>(A, paramList, true));
 
       } else {

diff --git a/packages/muelu/adapters/stratimikos/Thyra_MueLuRefMaxwellPreconditionerFactory_def.hpp b/packages/muelu/adapters/stratimikos/Thyra_MueLuRefMaxwellPreconditionerFactory_def.hpp
@@ -303,6 +303,7 @@ namespace Thyra {
       {
         // build a new MueLu RefMaxwell preconditioner
         Teuchos::TimeMonitor tMbuild(*Teuchos::TimeMonitor::getNewTimer(std::string("ThyraMueLuRefMaxwell::initializePrec build prec")));
+        paramList.set<bool>("refmaxwell: use as preconditioner", true);
         preconditioner = rcp(new MueLu::RefMaxwell<Scalar,LocalOrdinal,GlobalOrdinal,Node>(A, paramList, true));
       }
 

diff --git a/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_decl.hpp b/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_decl.hpp
@@ -100,6 +100,7 @@ namespace MueLu {
                                   Allowed values are: "additive" (default), "121", "212"
     - <tt>refmaxwell: disable addon</tt> - <tt>bool</tt> specifing whether the addon should be built for stabilization.
                                            Default: "true"
+    - <tt>refmaxwell: use as preconditioner</tt> - <tt>bool</tt> specifing whether RefMaxwell is used as a preconditioner or as a solver.
     - <tt>refmaxwell: dump matrices</tt> - <tt>bool</tt> specifing whether the matrices should be dumped.
                                            Default: "false"
     - <tt>refmaxwell: prolongator compute algorithm</tt> - a <tt>string</tt> specifying the algorithm to build the prolongator.
@@ -362,7 +363,7 @@ namespace MueLu {
     //! Parameter lists
     Teuchos::ParameterList parameterList_, precList11_, precList22_, smootherList_;
     //! Some options
-    bool disable_addon_, dump_matrices_,useKokkos_;
+    bool disable_addon_, dump_matrices_,useKokkos_,use_as_preconditioner_;
     std::string mode_;
     //! Temporary memory
     mutable Teuchos::RCP<MultiVector> P11res_, P11x_, D0res_, D0x_, residual_;

diff --git a/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_def.hpp b/packages/muelu/adapters/xpetra/MueLu_RefMaxwell_def.hpp
@@ -113,6 +113,7 @@ namespace MueLu {
     parameterList_    = list;
     disable_addon_    = list.get("refmaxwell: disable addon",true);
     mode_             = list.get("refmaxwell: mode","additive");
+    use_as_preconditioner_ = list.get<bool>("refmaxwell: use as preconditioner");
     dump_matrices_    = list.get("refmaxwell: dump matrices",false);
 
     if(list.isSublist("refmaxwell: 11list"))
@@ -1265,7 +1266,7 @@ namespace MueLu {
     }
     else
 #endif
-      PreSmoother_->Apply(X, RHS, false);
+      PreSmoother_->Apply(X, RHS, use_as_preconditioner_);
 
     // do solve for the 2x2 block system
     if(mode_=="additive")

diff --git a/packages/muelu/test/maxwell/Maxwell.xml b/packages/muelu/test/maxwell/Maxwell.xml
@@ -1,5 +1,6 @@
 <ParameterList name="MueLu">
 
+  <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
   <Parameter name="refmaxwell: mode" type="string" value="additive"/>
   <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
   <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/muelu/test/maxwell/Maxwell_complex.xml b/packages/muelu/test/maxwell/Maxwell_complex.xml
@@ -1,5 +1,6 @@
 <ParameterList name="MueLu">
 
+  <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
   <Parameter name="refmaxwell: mode" type="string" value="additive"/>
   <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
   <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell.xml
@@ -149,6 +149,7 @@
             <ParameterList name="Preconditioner Types">
               <ParameterList name="MueLuRefMaxwell-Tpetra">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
+                <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
                 <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
                 <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell2D.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwell2D.xml
@@ -106,6 +106,7 @@
             <ParameterList name="Preconditioner Types">
               <ParameterList name="MueLuRefMaxwell-Tpetra">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
+                <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
                 <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
                 <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellCuda.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellCuda.xml
@@ -147,6 +147,7 @@
             <ParameterList name="Preconditioner Types">
               <ParameterList name="MueLuRefMaxwell-Tpetra">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
+                <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
                 <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
                 <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellEpetra.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellEpetra.xml
@@ -146,6 +146,7 @@
             <ParameterList name="Preconditioner Types">
               <ParameterList name="MueLuRefMaxwell">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
+                <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
                 <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
                 <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellOpenMP.xml b/packages/panzer/mini-em/example/BlockPrec/solverMueLuRefMaxwellOpenMP.xml
@@ -151,6 +151,7 @@
               <ParameterList name="MueLuRefMaxwell-Tpetra">
                 <Parameter name="parameterlist: syntax" type="string" value="muelu"/>
                 <Parameter name="use kokkos refactor" type="bool" value="true"/>
+                <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
                 <Parameter name="refmaxwell: mode" type="string" value="additive"/>
                 <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
                 <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>

diff --git a/packages/trilinoscouplings/examples/scaling/Maxwell.xml b/packages/trilinoscouplings/examples/scaling/Maxwell.xml
@@ -37,6 +37,7 @@
 
   <ParameterList name="MueLu">
 
+    <Parameter name="refmaxwell: use as preconditioner" type="bool" value="true"/>
     <Parameter name="refmaxwell: mode" type="string" value="additive"/>
     <Parameter name="refmaxwell: disable addon" type="bool" value="false"/>
     <Parameter name="refmaxwell: dump matrices" type="bool" value="false"/>