]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
new preconditioners and new libraries
authorguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 Jul 2000 15:14:58 +0000 (15:14 +0000)
committerguido <guido@0785d39b-7218-0410-832d-ea1e28bc413d>
Mon, 3 Jul 2000 15:14:58 +0000 (15:14 +0000)
git-svn-id: https://svn.dealii.org/trunk@3124 0785d39b-7218-0410-832d-ea1e28bc413d

14 files changed:
deal.II/examples/step-1/Makefile
deal.II/examples/step-2/Makefile
deal.II/examples/step-3/Makefile
deal.II/examples/step-4/Makefile
deal.II/examples/step-5/Makefile
deal.II/examples/step-5/step-5.cc
deal.II/examples/step-6/Makefile
deal.II/examples/step-6/step-6.cc
deal.II/examples/step-7/Makefile
deal.II/examples/step-7/step-7.cc
deal.II/examples/step-8/Makefile
deal.II/examples/step-8/step-8.cc
deal.II/examples/step-9/Makefile
deal.II/examples/step-9/step-9.cc

index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index 2cb2fb48216a45a7c0ddf7d31f6582dc11c000c7..9fc71a38a04c15c9b2e0986ba6671a4a5ad4e484 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index 17634e57dd3917cc7a5fbc1d231f53d0c392c3b7..56b00989a567db3695ab290a29b43d0fa2205355 100644 (file)
@@ -96,7 +96,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index 326afd4e09224d42af07a1db20eeeaf05b2fd34a..f816291b52901c9544160c49888cf741ef11c2cf 100644 (file)
@@ -600,10 +600,8 @@ void LaplaceProblem<dim>::solve ()
                                   // inverted) and the relaxation
                                   // factor into one object. This can
                                   // be done like this:
-  PreconditionRelaxation<>
-    preconditioner(system_matrix,
-                  &SparseMatrix<double>::template precondition_SSOR<double>,
-                  1.2);
+  PreconditionSSOR<> preconditioner;
+  preconditioner.initialize(system_matrix, 1.2);
                                   // The default template parameters
                                   // of the PreconditionRelaxation
                                   // class are the matrix and the
index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index b4b3b8635a3b920bea0e03713eb8a1fce786c86b..26f74bccfbcdb131e49cddb2d1b00bf0257a060a 100644 (file)
@@ -575,10 +575,8 @@ void LaplaceProblem<dim>::solve ()
   PrimitiveVectorMemory<> vector_memory;
   SolverCG<>              cg (solver_control, vector_memory);
 
-  PreconditionRelaxation<>
-    preconditioner(system_matrix,
-                  &SparseMatrix<double>::template precondition_SSOR<double>,
-                  1.2);
+  PreconditionSSOR<> preconditioner;
+  preconditioner.initialize(system_matrix, 1.2);
 
   cg.solve (system_matrix, solution, system_rhs,
            preconditioner);
index 15aca89fad9d5f8078ed6b63a1bd87a86d7aa6eb..f0fa14d3ff6a467494de05fc9ca9c073db48b15a 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index 7ca5cee26b0040068fe2b3ae03956bd0b8f8f3bf..2d7ab36dbd14aa4cc696dd8245b2b9655929fa98 100644 (file)
@@ -1027,10 +1027,8 @@ void LaplaceProblem<dim>::solve ()
   PrimitiveVectorMemory<> vector_memory;
   SolverCG<>              cg (solver_control, vector_memory);
 
-  PreconditionRelaxation<>
-    preconditioner(system_matrix,
-                  &SparseMatrix<double>::template precondition_SSOR<double>,
-                  1.2);
+  PreconditionSSOR<> preconditioner;
+  preconditioner.initialize(system_matrix, 1.2);
 
   cg.solve (system_matrix, solution, system_rhs,
            preconditioner);
index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index bbd6d87c4c7e525e5631d2cdc0a030a94ba6cbc0..f98660de165443cdd75034660a38384dc98cbf9e 100644 (file)
@@ -757,10 +757,8 @@ void ElasticProblem<dim>::solve ()
   PrimitiveVectorMemory<> vector_memory;
   SolverCG<>              cg (solver_control, vector_memory);
 
-  PreconditionRelaxation<>
-    preconditioner(system_matrix,
-                  &SparseMatrix<double>::template precondition_SSOR<double>,
-                  1.2);
+  PreconditionSSOR<> preconditioner;
+  preconditioner.initialize(system_matrix, 1.2);
 
   cg.solve (system_matrix, solution, system_rhs,
            preconditioner);
index e24b9541e77bc01290ec76edbc568e87e38f7466..94838e216ec05aa85038c62222aba66884716a90 100644 (file)
@@ -94,7 +94,7 @@ endif
 # if you call it without arguments.
 $(target) : $(libraries)
        @echo ============================ Linking $@
-       @$(CXX) $(flags) -o $@ $^
+       @$(CXX) $(LDFLAGS) -o $@ $^ $(LIBS)
 
 
 # To make running the application somewhat independent of the actual
index 12b95372cdd1e09a6f07b89f635bd32d42ffde58..c54d30f79a14c2f03a7a83cc8a18aee2e67e6390 100644 (file)
@@ -452,10 +452,8 @@ void AdvectionProblem<dim>::solve ()
   PrimitiveVectorMemory<> vector_memory;
   SolverBicgstab<>        bicgstab (solver_control, vector_memory);
 
-  PreconditionRelaxation<>
-    preconditioner(system_matrix,
-                  &SparseMatrix<double>::template precondition_Jacobi<double>,
-                  1.0);
+  PreconditionJacobi<> preconditioner;
+  preconditioner.initialize(system_matrix, 1.0);
 
   bicgstab.solve (system_matrix, solution, system_rhs,
                  preconditioner);

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.