]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fixed whattodo in constraint_matrix; had to do with instantiation and TemporaryData...
authordenis.davydov <denis.davydov@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 27 Mar 2014 11:01:56 +0000 (11:01 +0000)
committerdenis.davydov <denis.davydov@0785d39b-7218-0410-832d-ea1e28bc413d>
Thu, 27 Mar 2014 11:01:56 +0000 (11:01 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_petscscalar_complex@32703 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/include/deal.II/lac/block_matrix_base.h
deal.II/include/deal.II/lac/constraint_matrix.templates.h
deal.II/source/lac/constraint_matrix.cc

index cabac54324f028bd00c6d616b36e5cd820940ea4..ff6c9cf246b5bcc628629bc65f6220f541bdbcf1 100644 (file)
@@ -1282,7 +1282,7 @@ private:
      * reordered when writing local to
      * global).
      */
-    std::vector<std::vector<double> > column_values;
+    std::vector<std::vector<value_type> > column_values;
 
     /**
      * A mutex variable used to guard access to the member
@@ -2069,9 +2069,9 @@ BlockMatrixBase<MatrixType>::set (const size_type  row,
   // comes from an element matrix).
   for (size_type j=0; j<n_cols; ++j)
     {
-      double value = values[j];
+      number value = values[j];
 
-      if (value == 0 && elide_zero_values == true)
+      if (value == number(0) && elide_zero_values == true)
         continue;
 
       const std::pair<unsigned int, size_type>
@@ -2316,9 +2316,9 @@ BlockMatrixBase<MatrixType>::add (const size_type  row,
   // it comes from an element matrix).
   for (size_type j=0; j<n_cols; ++j)
     {
-      double value = values[j];
+         number value = values[j];
 
-      if (value == 0 && elide_zero_values == true)
+      if (value == number(0) && elide_zero_values == true)
         continue;
 
       const std::pair<unsigned int, size_type>
index 0b5a3bb027ccbfef0fd5778591a7c3aca4d6aa6c..51e1657a04905c86af3f6b88297f741eeb949197 100644 (file)
@@ -2637,11 +2637,7 @@ ConstraintMatrix::distribute_local_to_global (
                                      local_matrix, col_ptr, val_ptr);
       const size_type n_values = col_ptr - &cols[0];
       if (n_values > 0)
-       {
-         /* @whattodo Note, this is a tricky one! */
-         /* global_matrix.add(row, n_values, &cols[0], &vals[0], false, true); */
-         Assert ((false), ExcMessage ("This function is corrupt: @whattodo"));
-       }
+             global_matrix.add(row, n_values, &cols[0], &vals[0], false, true);
     }
 }
 
index a64de0f95c522cc208966d323f46a7616edf758a..17c879a6ee66bf5669a00c3ab0d15b45191601f0 100644 (file)
@@ -1975,10 +1975,10 @@ ONLY_MATRIX_FUNCTIONS(TrilinosWrappers::BlockSparseMatrix);
 #endif
 
 #ifdef DEAL_II_WITH_PETSC
-ONLY_MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix);
-ONLY_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix);
-ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix);
-ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix);
+COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::SparseMatrix);
+COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::BlockSparseMatrix);
+COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::SparseMatrix);
+COMPLEX_ONLY_MATRIX_FUNCTIONS(PETScWrappers::MPI::BlockSparseMatrix);
 #endif
 
 #include "constraint_matrix.inst"

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.