]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Fix Tpetra types for older Trilinos 17257/head
authorJan Philipp Thiele <thiele@wias-berlin.de>
Thu, 11 Jul 2024 13:54:16 +0000 (15:54 +0200)
committerJan Philipp Thiele <thiele@wias-berlin.de>
Thu, 11 Jul 2024 14:51:58 +0000 (16:51 +0200)
include/deal.II/lac/trilinos_tpetra_sparse_matrix.templates.h
source/lac/trilinos_tpetra_sparsity_pattern.cc

index be980905b26c48f1c1d741e508b3719f45d126ce..560b3b98b39d608901252173543fe4a81207d791 100644 (file)
@@ -1315,8 +1315,8 @@ namespace LinearAlgebra
         TpetraTypes::MatrixType<Number, MemorySpace>>(*source.matrix,
                                                       Teuchos::Copy);
 #  else
-      matrix = source.matrix->clone(
-        Utilities::Trilinos::internal::make_rcp<NodeType>());
+      matrix = source.matrix->clone(Utilities::Trilinos::internal::make_rcp<
+                                    TpetraTypes::NodeType<MemorySpace>>());
 #  endif
       column_space_map =
         Teuchos::rcp_const_cast<TpetraTypes::MapType<MemorySpace>>(
index 91ccd3234a67af619b97a3141f64e37a7d1022bd..0337c3e65b1de96d33bd4ec339546eb70ae7802a 100644 (file)
@@ -420,13 +420,13 @@ namespace LinearAlgebra
                                                  n_entries_per_row);
 #  else
         if (row_map->getComm()->getSize() > 1)
-          graph =
-            Utilities::Trilinos::internal::make_rcp<GraphType<MemorySpace>>(
-              row_map, Teuchos::arcpFromArray(n_entries_per_row));
+          graph = Utilities::Trilinos::internal::make_rcp<
+            TpetraTypes::GraphType<MemorySpace>>(
+            row_map, Teuchos::arcpFromArray(n_entries_per_row));
         else
-          graph =
-            Utilities::Trilinos::internal::make_rcp<GraphType<MemorySpace>>(
-              row_map, col_map, Teuchos::arcpFromArray(n_entries_per_row));
+          graph = Utilities::Trilinos::internal::make_rcp<
+            TpetraTypes::GraphType<MemorySpace>>(
+            row_map, col_map, Teuchos::arcpFromArray(n_entries_per_row));
 
 #  endif
 

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.