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

…s:develop' (7f2dc83).

* trilinos-develop:
  TrilinosCouplings: Fixing bug
  TrilinosCouplings: Minor mods to Maxwell example

packages/trilinoscouplings/examples/scaling/example_Maxwell.cpp

@@ -428,7 +428,7 @@ int main(int argc, char *argv[]) {
   ny = 10;
   nz = 10;
   xmlInFileName = "Maxwell.xml";
-  solverName = "MueLu";
+  solverName = "default";
   verbose = false;
   debug = false;
   jiggle = false;
@@ -557,6 +557,17 @@ int main(int argc, char *argv[]) {
     "end                          \n";
   meshInput = inputList.get("meshInput", meshInput);
 
+  // Get the solver name from input deck or command line
+  if(solverName == "default") {
+    if(inputList.isParameter("Preconditioner")) 
+      solverName=inputList.get("Preconditioner","MueLu");
+    else
+      solverName="MueLu";
+  }  
+
+
+
+
 
   /**********************************************************************************/
   /***************************** GET CELL TOPOLOGY **********************************/