]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed an error in ILU/IC preconditioner.
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 19 Sep 2008 13:54:29 +0000 (13:54 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 19 Sep 2008 13:54:29 +0000 (13:54 +0000)
git-svn-id: https://svn.dealii.org/trunk@16858 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/lac/include/lac/trilinos_precondition.h
deal.II/lac/source/trilinos_precondition.cc

index 280d2f436229f90765f5be5c6896157244dc9026..64414efab779230e0ff97500cb5ec84b7d27fd4d 100755 (executable)
@@ -387,7 +387,7 @@ namespace TrilinosWrappers
                                        * so-called additive Schwarz
                                        * preconditioner.
                                        */
-       AdditionalData (const double       ic_fill = 0.,
+       AdditionalData (const unsigned int ic_fill = 0,
                        const double       ic_atol = 0.,
                        const double       ic_rtol = 1.,
                        const unsigned int overlap = 0);
@@ -395,7 +395,8 @@ namespace TrilinosWrappers
                                        /**
                                        * IC parameters and overlap.
                                        */
-       double ic_fill, ic_atol, ic_rtol;
+       unsigned int ic_fill;
+       double ic_atol, ic_rtol;
        unsigned int overlap;
       };
 
@@ -493,7 +494,7 @@ namespace TrilinosWrappers
                                        * so-called additive Schwarz
                                        * preconditioner.
                                        */
-       AdditionalData (const double       ilu_fill = 0.,
+       AdditionalData (const unsigned int ilu_fill = 0,
                        const double       ilu_atol = 0.,
                        const double       ilu_rtol = 1.,
                        const unsigned int overlap  = 0);
@@ -501,7 +502,8 @@ namespace TrilinosWrappers
                                        /**
                                        * ILU parameters and overlap.
                                        */
-       double ilu_drop, ilu_fill, ilu_atol, ilu_rtol;
+       unsigned int ilu_fill;
+       double ilu_atol, ilu_rtol;
        unsigned int overlap;
       };
 
index 7a96d6bc3a6d17274d6269430104638fea01ecc8..33f50b52b364faa29130b1a4ddbbc5d9a5f909ce 100755 (executable)
@@ -199,7 +199,7 @@ namespace TrilinosWrappers
 
 
   PreconditionIC::AdditionalData::
-  AdditionalData (const double       ic_fill,
+  AdditionalData (const unsigned int ic_fill,
                  const double       ic_atol,
                  const double       ic_rtol,
                  const unsigned int overlap)
@@ -229,7 +229,7 @@ namespace TrilinosWrappers
     int ierr;
 
     Teuchos::ParameterList parameter_list;
-    parameter_list.set ("fact: level-of-fill",additional_data.ic_fill); 
+    parameter_list.set ("fact: level-of-fill",(int)additional_data.ic_fill); 
     parameter_list.set ("fact: absolute threshold",additional_data.ic_atol); 
     parameter_list.set ("fact: relative threshold",additional_data.ic_rtol); 
     parameter_list.set ("schwarz: combine mode", "Add");
@@ -257,7 +257,7 @@ namespace TrilinosWrappers
 
 
   PreconditionILU::AdditionalData::
-  AdditionalData (const double       ilu_fill,
+  AdditionalData (const unsigned int ilu_fill,
                  const double       ilu_atol,
                  const double       ilu_rtol,
                  const unsigned int overlap)
@@ -287,7 +287,7 @@ namespace TrilinosWrappers
     int ierr;
 
     Teuchos::ParameterList parameter_list;
-    parameter_list.set ("fact: level-of-fill",additional_data.ilu_fill); 
+    parameter_list.set ("fact: level-of-fill",(int)additional_data.ilu_fill); 
     parameter_list.set ("fact: absolute threshold",additional_data.ilu_atol); 
     parameter_list.set ("fact: relative threshold",additional_data.ilu_rtol); 
     parameter_list.set ("schwarz: combine mode", "Add");

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.