]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Change step-31 and step-32 according to the change in the reinit function for Trilino...
authorkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 22 Oct 2008 10:21:35 +0000 (10:21 +0000)
committerkronbichler <kronbichler@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 22 Oct 2008 10:21:35 +0000 (10:21 +0000)
git-svn-id: https://svn.dealii.org/trunk@17304 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-31/step-31.cc
deal.II/examples/step-32/step-32.cc

index 2cdf2f6e245754c72626e4f98099196e4bb75be8..b95b43348ffd18cf72b357dedf90175a6c8868d1 100644 (file)
@@ -1111,10 +1111,7 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
     DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp,
                                     stokes_constraints, false);
 
-    BlockSparsityPattern stokes_sparsity_pattern;    
-    stokes_sparsity_pattern.copy_from (csp);
-
-    stokes_matrix.reinit (stokes_sparsity_pattern);
+    stokes_matrix.reinit (csp);
     stokes_matrix.collect_sizes();
   }
 
@@ -1142,11 +1139,8 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
 
     DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp,
                                     stokes_constraints, false);
-    
-    BlockSparsityPattern stokes_preconditioner_sparsity_pattern;
-    stokes_preconditioner_sparsity_pattern.copy_from (csp);
 
-    stokes_preconditioner_matrix.reinit (stokes_preconditioner_sparsity_pattern);
+    stokes_preconditioner_matrix.reinit (csp);
     stokes_preconditioner_matrix.collect_sizes();
   }
 
@@ -1165,12 +1159,9 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
     DoFTools::make_sparsity_pattern (temperature_dof_handler, csp,
                                     temperature_constraints, false);
 
-    SparsityPattern temperature_sparsity_pattern;
-    temperature_sparsity_pattern.copy_from (csp);
-
-    temperature_matrix.reinit (temperature_sparsity_pattern);
-    temperature_mass_matrix.reinit (temperature_sparsity_pattern);
-    temperature_stiffness_matrix.reinit (temperature_sparsity_pattern);
+    temperature_matrix.reinit (csp);
+    temperature_mass_matrix.reinit (csp);
+    temperature_stiffness_matrix.reinit (csp);
   }
 
                                   // As last action in this function,
index b0dd2d33ec8bde24d12b3762680aff559f164c95..0c7e52e46ef0e177d735ac7ea508a6219c6d45df 100644 (file)
@@ -639,8 +639,6 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
   {
     stokes_matrix.clear ();
 
-    BlockSparsityPattern stokes_sparsity_pattern (2,2);
-
     BlockCompressedSetSparsityPattern csp (2,2);
 
     csp.block(0,0).reinit (n_u, n_u);
@@ -662,9 +660,7 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
     DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp,
                                     stokes_constraints, false);
 
-    stokes_sparsity_pattern.copy_from (csp);
-
-    stokes_matrix.reinit (stokes_partitioner, stokes_sparsity_pattern);
+    stokes_matrix.reinit (stokes_partitioner, csp);
   }
 
   {
@@ -672,8 +668,6 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
     Mp_preconditioner.reset ();
     stokes_preconditioner_matrix.clear ();
 
-    BlockSparsityPattern stokes_preconditioner_sparsity_pattern (2,2);
-    
     BlockCompressedSetSparsityPattern csp (2,2);
 
     csp.block(0,0).reinit (n_u, n_u);
@@ -693,13 +687,8 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
 
     DoFTools::make_sparsity_pattern (stokes_dof_handler, coupling, csp,
                                     stokes_constraints, false);
-    stokes_constraints.condense (csp);
-
-    stokes_preconditioner_sparsity_pattern.copy_from (csp);
-
-    stokes_preconditioner_matrix.reinit (stokes_partitioner,
-                                        stokes_preconditioner_sparsity_pattern);
 
+    stokes_preconditioner_matrix.reinit (stokes_partitioner, csp);
   }
 
   temperature_partitioner
@@ -714,21 +703,13 @@ void BoussinesqFlowProblem<dim>::setup_dofs ()
     temperature_stiffness_matrix.clear ();
     temperature_matrix.clear ();
 
-    SparsityPattern temperature_sparsity_pattern;
-
     CompressedSetSparsityPattern csp (n_T, n_T);
     DoFTools::make_sparsity_pattern (temperature_dof_handler, csp,
                                     temperature_constraints, false);
-    temperature_constraints.condense (csp);
-
-    temperature_sparsity_pattern.copy_from (csp);
 
-    temperature_matrix.reinit (temperature_partitioner,
-                              temperature_sparsity_pattern);
-    temperature_mass_matrix.reinit (temperature_partitioner,
-                                   temperature_sparsity_pattern);
-    temperature_stiffness_matrix.reinit (temperature_partitioner,
-                                        temperature_sparsity_pattern);
+    temperature_matrix.reinit (temperature_partitioner, csp);
+    temperature_mass_matrix.reinit (temperature_partitioner, csp);
+    temperature_stiffness_matrix.reinit (temperature_partitioner, csp);
   }
 
   stokes_solution.reinit (stokes_partitioner);

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.