]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix a bug in trilinos_sparsity_pattern.
authorturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 20 Mar 2013 20:43:49 +0000 (20:43 +0000)
committerturcksin <turcksin@0785d39b-7218-0410-832d-ea1e28bc413d>
Wed, 20 Mar 2013 20:43:49 +0000 (20:43 +0000)
git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28962 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/source/lac/trilinos_sparsity_pattern.cc
tests/mpi/p4est_2d_dofhandler_03.cc
tests/mpi/p4est_2d_dofhandler_04.cc
tests/mpi/petsc_01.cc

index b6826e4fa62cf4b0d3c287d11d40b2f3d5a120de..3a43219d582e64ca113c617fcb2eb17173087741 100644 (file)
@@ -531,8 +531,8 @@ namespace TrilinosWrappers
         graph->ExtractMyRowView(i, num_entries, indices);
         for (size_type j=0; j<(size_type)num_entries; ++j)
           {
-            if (static_cast<size_type>(std::abs(static_cast<size_type>(i-indices[j]))) > local_b)
-              local_b = std::abs(static_cast<size_type>(i-indices[j]));
+            if (static_cast<size_type>(std::abs(static_cast<TrilinosWrapper::types::int_type>(i-indices[j]))) > local_b)
+              local_b = std::abs(static_cast<TrilinosWrapper::types::int_type>(i-indices[j]));
           }
       }
     graph->Comm().MaxAll((TrilinosWrapper::types::int_type *)&local_b, &global_b, 1);
index c11b4da7637c3611740ed42d0f87e82bf1ebe2d6..27b3675fe32b015bbd0fd62b54317522a91407b5 100644 (file)
@@ -103,7 +103,7 @@ void test()
            std::sort(local_dof_indices.begin(), local_dof_indices.end());
 
                                             //macros are evil...
-           unsigned int invalid_dofindex = DoFHandler<dim,dim>::invalid_dof_index;
+      types::global_dof_index invalid_dofindex = DoFHandler<dim,dim>::invalid_dof_index;
            Assert((*local_dof_indices.rbegin())!=invalid_dofindex, ExcInternalError());
 
          }
index ed764c2ae802ec9aa46fea0e14719682f688e8cd..1bd028cd35c48e761923417274c7b04f78ddd83a 100644 (file)
@@ -106,7 +106,7 @@ void test()
           cell->get_dof_indices (local_dof_indices);
           for (std::vector<types::global_dof_index>::iterator it=local_dof_indices.begin(); it!= local_dof_indices.end(); ++it)
             {
-              unsigned int invalid_dofindex = DoFHandler<dim,dim>::invalid_dof_index;
+         types::global_dof_index invalid_dofindex = DoFHandler<dim,dim>::invalid_dof_index;
               Assert(*it!=invalid_dofindex, ExcInternalError());
               control_dof_set.insert(*it);
             }
index 6aa1515365f8ab918bf30ae8e27279883cebd4d1..e517a6f371bcbd4bec144e6b86f83746b93ebebd 100644 (file)
@@ -55,7 +55,7 @@ void test()
   
   mat.compress();
 
-  std::vector<unsigned int> rows(1,1);
+  std::vector<types::global_dof_index> rows(1,1);
   mat.clear_rows(rows);
   
 //    mat.write_ascii();

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.