tpetra: #9799 removed use of deprecated Tpetra::StaticProfile

trilinos · Oct 27, 2021 · 0a65290 · 0a65290
1 parent 7ad498f
commit 0a65290
Show file tree

Hide file tree

Showing 42 changed files with 82 additions and 89 deletions.
diff --git a/packages/amesos2/test/adapters/Tpetra_CrsMatrix_Adapter_UnitTests.cpp b/packages/amesos2/test/adapters/Tpetra_CrsMatrix_Adapter_UnitTests.cpp
@@ -197,7 +197,7 @@ namespace {
  // create a Map
  const size_t numLocal = 10;
  RCP<Map<LO,GO,Node> > map = rcp( new Map<LO,GO,Node>(INVALID,numLocal,0,comm) );
- RCP<MAT> eye = rcp( new MAT(map,1,Tpetra::StaticProfile) );
+ RCP<MAT> eye = rcp( new MAT(map,1) );
  GO base = numLocal*rank;
  for( size_t i = 0; i < numLocal; ++i ){
  eye->insertGlobalValues(base+i,tuple<GO>(base+i),tuple<Scalar>(ST::one()));
@@ -230,7 +230,7 @@ namespace {
  // create a Map
  const size_t numLocal = 10;
  RCP<Map<LO,GO,Node> > map = rcp( new Map<LO,GO,Node>(INVALID,numLocal,0,comm) );
- RCP<MAT> eye = rcp( new MAT(map,1,Tpetra::StaticProfile) );
+ RCP<MAT> eye = rcp( new MAT(map,1) );
  GO base = numLocal*rank;
  for( size_t i = 0; i < numLocal; ++i ){
  eye->insertGlobalValues(base+i,tuple<GO>(base+i),tuple<Scalar>(ST::one()));

diff --git a/packages/amesos2/test/solvers/SolverFactory.cpp b/packages/amesos2/test/solvers/SolverFactory.cpp
@@ -124,7 +124,7 @@ namespace {
  const size_t maxNumEntPerRow = 3;
  const SC two = static_cast<SC> (2.0);
  const SC minusOne = static_cast<SC> (-1.0);
- RCP<MAT> A (new MAT (rowMap, maxNumEntPerRow, Tpetra::StaticProfile));
+ RCP<MAT> A (new MAT (rowMap, maxNumEntPerRow));
 
  if (rowMap->getNodeNumElements () != 0) {
  for (LO lclRow = rowMap->getMinLocalIndex ();

diff --git a/packages/anasazi/tpetra/test/BlockDavidson/cxx_main_lap.cpp b/packages/anasazi/tpetra/test/BlockDavidson/cxx_main_lap.cpp
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
 
  // create map
  RCP<const Map<> > map = rcp (new Map<> (dim,0,comm));
- RCP<CrsMatrix<ST> > K = rcp (new CrsMatrix<ST> (map, 4, Tpetra::StaticProfile));
+ RCP<CrsMatrix<ST> > K = rcp (new CrsMatrix<ST> (map, 4));
  int base = MyPID*ROWS_PER_PROC;
  if (MyPID != NumImages-1) {
  for (int i=0; i<ROWS_PER_PROC; ++i) {

diff --git a/packages/anasazi/tpetra/test/BlockKrylovSchur/cxx_main_lap.cpp b/packages/anasazi/tpetra/test/BlockKrylovSchur/cxx_main_lap.cpp
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 
  // create map
  RCP<const Map<> > map = rcp (new Map<> (dim,0,comm));
- RCP<CrsMatrix<ST> > K = rcp (new CrsMatrix<ST> (map, 4, Tpetra::StaticProfile));
+ RCP<CrsMatrix<ST> > K = rcp (new CrsMatrix<ST> (map, 4));
  int base = MyPID*ROWS_PER_PROC;
  if (MyPID != NumImages-1) {
  for (int i=0; i<ROWS_PER_PROC; ++i) {

diff --git a/packages/anasazi/tpetra/test/IRTR/cxx_main_lap.cpp b/packages/anasazi/tpetra/test/IRTR/cxx_main_lap.cpp
@@ -120,7 +120,7 @@ int main(int argc, char *argv[])
 
  // create map
  RCP<const Map<> > map = rcp (new Map<> (dim, 0, comm));
- RCP<CrsMatrix<ST> > K = rcp(new CrsMatrix<ST>(map,4,Tpetra::StaticProfile));
+ RCP<CrsMatrix<ST> > K = rcp(new CrsMatrix<ST>(map,4));
  int base = MyPID*ROWS_PER_PROC;
  if (MyPID != NumImages-1) {
  for (int i=0; i<ROWS_PER_PROC; ++i) {

diff --git a/packages/anasazi/tpetra/test/MVOPTester/cxx_main.cpp b/packages/anasazi/tpetra/test/MVOPTester/cxx_main.cpp
@@ -102,7 +102,7 @@ namespace { // (anonymous)
  template<class Scalar, class O1, class O2>
  RCP<CrsMatrix<Scalar,O1,O2,Node> > constructDiagMatrix(const RCP<const Map<O1,O2,Node> > &map)
  {
- RCP<CrsMatrix<Scalar,O1,O2,Node> > op = rcp( new CrsMatrix<Scalar,O1,O2,Node>(map,1,Tpetra::StaticProfile) );
+ RCP<CrsMatrix<Scalar,O1,O2,Node> > op = rcp( new CrsMatrix<Scalar,O1,O2,Node>(map,1) );
  for (size_t i=0; i<map->getNodeNumElements(); ++i) {
  op->insertGlobalValues(map->getGlobalElement(i),tuple(map->getGlobalElement(i)), tuple(ScalarTraits<Scalar>::one()));
  }

diff --git a/packages/belos/tpetra/test/FixedPoint/test_fp_hb.cpp b/packages/belos/tpetra/test/FixedPoint/test_fp_hb.cpp
@@ -217,7 +217,7 @@ int main(int argc, char *argv[]) {
  int NumMyElements = diagonal.getMap()->getNodeNumElements();
  auto MyGlobalElements = diagonal.getMap()->getNodeElementList();
  Teuchos::ArrayRCP<ST> dd=diagonal.getDataNonConst();
- RCP<CrsMatrix<ST> > invDiagMatrix = Teuchos::rcp(new CrsMatrix<ST>(A->getRowMap(), 1, Tpetra::StaticProfile));
+ RCP<CrsMatrix<ST> > invDiagMatrix = Teuchos::rcp(new CrsMatrix<ST>(A->getRowMap(), 1));
 
  for (Teuchos_Ordinal i=0; i<NumMyElements; ++i) {
  invDiagMatrix->insertGlobalValues(MyGlobalElements[i],

diff --git a/packages/belos/tpetra/test/LinearSolverFactory/LinearSolverFactory.cpp b/packages/belos/tpetra/test/LinearSolverFactory/LinearSolverFactory.cpp
@@ -112,7 +112,7 @@ createTestMatrix (Teuchos::FancyOStream& out,
  // lets us use local indices.
  RCP<const map_type> colMap = rowMap;
  const size_t maxNumEntPerRow = 1;
- RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow, Tpetra::StaticProfile));
+ RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow));
 
  if (rowMap->getNodeNumElements () != 0) {
  Teuchos::Array<SC> vals (1);

diff --git a/packages/belos/tpetra/test/LinearSolverFactory/SolverFactory.cpp b/packages/belos/tpetra/test/LinearSolverFactory/SolverFactory.cpp
@@ -86,7 +86,7 @@ createTestMatrix (Teuchos::FancyOStream& out,
  // lets us use local indices.
  RCP<const map_type> colMap = rowMap;
  const size_t maxNumEntPerRow = 1;
- RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow, Tpetra::StaticProfile));
+ RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow));
 
  if (rowMap->getNodeNumElements () != 0) {
  Teuchos::Array<SC> vals (1);

diff --git a/packages/belos/tpetra/test/MVOPTester/cxx_main_complex.cpp b/packages/belos/tpetra/test/MVOPTester/cxx_main_complex.cpp
@@ -105,7 +105,7 @@ namespace {
  template<class Scalar, class O1, class O2>
  RCP<CrsMatrix<Scalar,O1,O2,Node> > constructDiagMatrix(const RCP<const Map<O1,O2,Node> > &map)
  {
- RCP<CrsMatrix<Scalar,O1,O2,Node> > op = rcp( new CrsMatrix<Scalar,O1,O2,Node>(map,1,Tpetra::StaticProfile) );
+ RCP<CrsMatrix<Scalar,O1,O2,Node> > op = rcp( new CrsMatrix<Scalar,O1,O2,Node>(map,1) );
  for (size_t i=0; i<map->getNodeNumElements(); ++i) {
  op->insertGlobalValues(map->getGlobalElement(i),tuple(map->getGlobalElement(i)), tuple(ScalarTraits<Scalar>::one()));
  }

diff --git a/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp b/packages/belos/tpetra/test/Native/nonsymm_matrix.cpp
@@ -97,7 +97,7 @@ createNonsymmTridiagMatrix (const Teuchos::RCP<const Tpetra::Map<> >& rowMap,
  LO (rowMap->getNodeNumElements ());
  const GO gblMinGblInd = rowMap->getMinAllGlobalIndex ();
  const GO gblMaxGblInd = rowMap->getMaxAllGlobalIndex ();
- auto A = rcp (new crs_matrix_type (rowMap, 3, Tpetra::StaticProfile));
+ auto A = rcp (new crs_matrix_type (rowMap, 3));
 
  const SC ONE = STS::one ();
  const SC TWO = ONE + ONE;

diff --git a/packages/ifpack2/example/RelaxationWithEquilibration.cpp b/packages/ifpack2/example/RelaxationWithEquilibration.cpp
@@ -880,8 +880,7 @@ gatherCrsMatrixAndMultiVector (LO& errCode,
  export_type exp (A.getRowMap (), rowMap_gathered);
  auto A_gathered =
  Teuchos::rcp (new crs_matrix_type (rowMap_gathered,
- A.getGlobalMaxNumRowEntries (),
- Tpetra::StaticProfile));
+ A.getGlobalMaxNumRowEntries ()));
  A_gathered->doExport (A, exp, Tpetra::INSERT);
  auto domainMap_gathered = computeGatherMap (A.getDomainMap (), Teuchos::null);
  auto rangeMap_gathered = computeGatherMap (A.getRangeMap (), Teuchos::null);

diff --git a/packages/ifpack2/src/Ifpack2_ILUT_def.hpp b/packages/ifpack2/src/Ifpack2_ILUT_def.hpp
@@ -716,7 +716,7 @@ void ILUT<MatrixType>::compute ()
  }
 
  L_ = rcp (new crs_matrix_type (A_local_->getRowMap(), A_local_->getColMap(),
- nnzPerRow(), Tpetra::StaticProfile));
+ nnzPerRow()));
 
  for (local_ordinal_type row_i = 0 ; row_i < myNumRows ; ++row_i) {
  L_->insertLocalValues (row_i, L_tmp_idx[row_i](), L_tmpv[row_i]());
@@ -729,7 +729,7 @@ void ILUT<MatrixType>::compute ()
  }
 
  U_ = rcp (new crs_matrix_type (A_local_->getRowMap(), A_local_->getColMap(),
- nnzPerRow(), Tpetra::StaticProfile));
+ nnzPerRow()));
 
  for (local_ordinal_type row_i = 0 ; row_i < myNumRows ; ++row_i) {
  U_->insertLocalValues (row_i, U_tmp_idx[row_i](), U_tmpv[row_i]());

diff --git a/packages/ifpack2/src/Ifpack2_SparseContainer_def.hpp b/packages/ifpack2/src/Ifpack2_SparseContainer_def.hpp
@@ -553,7 +553,7 @@ extract ()
  }
  //now that row sizes are known, can allocate the diagonal matrix
  RCP<InverseMap> tempMap(new InverseMap(blockPointSize, 0, this->localComm_));
- diagBlocks_[i] = rcp(new InverseCrs(tempMap, rowEntryCounts, Tpetra::StaticProfile));
+ diagBlocks_[i] = rcp(new InverseCrs(tempMap, rowEntryCounts));
  Inverses_[i] = rcp(new InverseType(diagBlocks_[i]));
  //insert the actual entries, one row at a time
  for(LO blockRow = 0; blockRow < blockSize; blockRow++)
@@ -617,7 +617,7 @@ extract ()
  rowEntryCounts[j] = this->getInputRowView(this->blockRows_[blockStart + j]).size();
  }
  RCP<InverseMap> tempMap(new InverseMap(blockSize, 0, this->localComm_));
- diagBlocks_[i] = rcp(new InverseCrs(tempMap, rowEntryCounts, Tpetra::StaticProfile));
+ diagBlocks_[i] = rcp(new InverseCrs(tempMap, rowEntryCounts));
  Inverses_[i] = rcp(new InverseType(diagBlocks_[i]));
  for(LO blockRow = 0; blockRow < blockSize; blockRow++)
  {

diff --git a/packages/ifpack2/src/Ifpack2_Utilities.hpp b/packages/ifpack2/src/Ifpack2_Utilities.hpp
@@ -79,7 +79,7 @@ namespace Details {
  // make sure that we are using the correct diagonal column
  // indices, so it probably wouldn't help much.
  Teuchos::RCP<graph_type> diagonalGraph;
- diagonalGraph = Teuchos::rcp(new crs_graph_type(graph.getRowMap(), maxDiagEntPerRow, Tpetra::StaticProfile));
+ diagonalGraph = Teuchos::rcp(new crs_graph_type(graph.getRowMap(), maxDiagEntPerRow));
  const map_type& meshRowMap = *(graph.getRowMap());
 
  Teuchos::Array<GO> diagGblColInds(maxDiagEntPerRow);

diff --git a/packages/ifpack2/src/supportgraph/Ifpack2_SupportGraph_def.hpp b/packages/ifpack2/src/supportgraph/Ifpack2_SupportGraph_def.hpp
@@ -473,7 +473,7 @@ SupportGraph<MatrixType>::findSupport ()
  // Create the CrsMatrix for the support graph
  Support_ = rcp (new crs_matrix_type (A_local_->getRowMap(),
  A_local_->getColMap(),
- localnumnz, Tpetra::StaticProfile));
+ localnumnz));
 
  // Fill in the matrix with the stl vectors for each row
  for (size_t row = 0; row < num_verts; ++row) {

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_SolverFactory.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_SolverFactory.cpp
@@ -73,7 +73,7 @@ namespace {
  // lets us use local indices.
  RCP<const map_type> colMap = rowMap;
  const size_t maxNumEntPerRow = 1;
- RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow, Tpetra::StaticProfile));
+ RCP<MAT> A (new MAT (rowMap, colMap, maxNumEntPerRow));
 
  if (rowMap->getNodeNumElements () != 0) {
  Teuchos::Array<SC> vals (1);

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTest234.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTest234.cpp
@@ -119,8 +119,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_1_DECL(Chebyshev, Issue234, SC)
  // For a diagonal matrix, we can use the row Map as the column Map.
  const size_t maxNumEntPerRow = 1;
  RCP<crs_matrix_type> A =
- rcp (new crs_matrix_type (rowMap, colMap, maxNumEntPerRow,
- Tpetra::StaticProfile));
+ rcp (new crs_matrix_type (rowMap, colMap, maxNumEntPerRow));
  for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) {
  A->insertLocalValues (lclRow, tuple (lclRow), tuple (ONE));
  }

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestChebyshev2.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestChebyshev2.cpp
@@ -379,7 +379,7 @@ TEUCHOS_UNIT_TEST(Ifpack2Chebyshev, Convergence)
  RCP<const map_type> domainMap = rowMap;
 
  // Create the matrix, with static profile.
- RCP<crs_matrix_type> A (new crs_matrix_type (rowMap, 3, Tpetra::StaticProfile));
+ RCP<crs_matrix_type> A (new crs_matrix_type (rowMap, 3));
 
  // Fill the matrix.
  Array<GO> cols (3);

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestContainerFactory.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestContainerFactory.cpp
@@ -105,7 +105,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(ContainerFactory, TestTypesAndInput, SC, LO, G
 
  // For a diagonal matrix, we can use the row Map as the column Map.
  const size_t maxNumEntPerRow = 1;
- RCP<crs_matrix_type> A = rcp (new crs_matrix_type (rowMap, colMap, maxNumEntPerRow, Tpetra::StaticProfile));
+ RCP<crs_matrix_type> A = rcp (new crs_matrix_type (rowMap, colMap, maxNumEntPerRow));
  for (LO lclRow = 0; lclRow < lclNumRows; ++lclRow) {
  A->insertLocalValues (lclRow, tuple (lclRow), tuple (ONE));
  }

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestHelpers.hpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestHelpers.hpp
@@ -100,7 +100,7 @@ create_tridiag_graph (const LocalOrdinal num_rows_per_proc)
  rcp (new map_type (INVALID, num_rows_per_proc, indexBase, comm));
 
  RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph =
- rcp (new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> (rowmap, 3, Tpetra::StaticProfile));
+ rcp (new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> (rowmap, 3));
 
  Teuchos::Array<GlobalOrdinal> cols;
  const LocalOrdinal lclNumRows =
@@ -143,7 +143,7 @@ create_test_graph (const LocalOrdinal num_rows_per_proc)
  Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> > rowmap = Teuchos::rcp(new Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node>(INVALID, num_rows_per_proc, indexBase, comm));
 
  size_t global_size = rowmap->getGlobalNumElements();
- Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, global_size, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, global_size));
 
  Teuchos::Array<GlobalOrdinal> cols;
  for(LocalOrdinal l_row = 0; (size_t) l_row<rowmap->getNodeNumElements(); l_row++) {
@@ -180,7 +180,7 @@ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > create_banded_g
  Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> > rowmap = Teuchos::rcp(new Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node>(INVALID, num_rows_per_proc, indexBase, comm));
 
  const size_t maxNumEntPerRow = 5;
- Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow));
 
  // Fill the graph with only diagonal entries
  Teuchos::Array<GlobalOrdinal> gblColInds (maxNumEntPerRow);
@@ -219,7 +219,7 @@ template<class LocalOrdinal,class GlobalOrdinal,class Node>
 Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > create_diagonal_graph(Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> > rowmap) 
 {
  const size_t maxNumEntPerRow = 1;
- Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow));
 
  // Fill the graph with only diagonal entries
  Teuchos::Array<GlobalOrdinal> gblColInds (maxNumEntPerRow);
@@ -325,7 +325,7 @@ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > create_dense_lo
  Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> > rowmap = Teuchos::rcp(new Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node>(INVALID, num_rows_per_proc, indexBase, comm));
 
  const size_t maxNumEntPerRow = num_rows_per_proc;
- Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node> > crsgraph = Teuchos::rcp(new Tpetra::CrsGraph<LocalOrdinal,GlobalOrdinal,Node>(rowmap, maxNumEntPerRow));
 
  // Fill the graph with only diagonal entries
  Teuchos::Array<GlobalOrdinal> gblColInds (maxNumEntPerRow);
@@ -353,8 +353,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
 {
  Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix =
  Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap,
- 3/*tri-diagonal matrix*/,
- Tpetra::StaticProfile));
+ 3/*tri-diagonal matrix*/));
 
  Teuchos::Array<GlobalOrdinal> col(3);
  Teuchos::Array<Scalar> coef(3);
@@ -403,7 +402,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
 template<class Scalar,class LocalOrdinal,class GlobalOrdinal,class Node>
 Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > create_test_matrix2(const Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >& rowmap)
 {
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 3/*tri-diagonal matrix*/, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 3/*tri-diagonal matrix*/));
 
  Teuchos::Array<GlobalOrdinal> col(1);
  Teuchos::Array<Scalar> coef(1);
@@ -458,7 +457,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
 template<class Scalar,class LocalOrdinal,class GlobalOrdinal,class Node>
 Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > create_test_matrix3(const Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >& rowmap)
 {
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 3/*tri-diagonal matrix*/, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 3/*tri-diagonal matrix*/));
 
  /*
  NOTE: this utility creates a matrix whose column map is equal to its row map. At processor boundaries,
@@ -520,7 +519,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
 template<class Scalar,class LocalOrdinal,class GlobalOrdinal,class Node>
 Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > create_banded_matrix(const Teuchos::RCP<const Tpetra::Map<LocalOrdinal,GlobalOrdinal,Node> >& rowmap, const GlobalOrdinal bw)
 {
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5));
 
  Teuchos::Array<GlobalOrdinal> col(1);
  Teuchos::Array<Scalar> coef(1);
@@ -794,7 +793,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
  //
  // Beyond this the matrix is diagonal. We also explicitly stick in some hard zeros for the line partitioning test
 
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 4, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 4));
 
  Teuchos::Array<GlobalOrdinal> indices(4);
  Teuchos::Array<Scalar> values(4);
@@ -850,7 +849,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
  //
  // Beyond this the matrix is diagonal.
 
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5));
 
  Teuchos::Array<GlobalOrdinal> indices(5);
  Teuchos::Array<Scalar> values(5);
@@ -906,7 +905,7 @@ Teuchos::RCP<const Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > c
  //
  // Beyond this the matrix is diagonal. We also explicitly stick in some hard zeros for the line partitioning test
 
- Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5, Tpetra::StaticProfile));
+ Teuchos::RCP<Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node> > crsmatrix = Teuchos::rcp(new Tpetra::CrsMatrix<Scalar,LocalOrdinal,GlobalOrdinal,Node>(rowmap, 5));
 
  Teuchos::Array<GlobalOrdinal> indices(5);
  Teuchos::Array<Scalar> values(5);

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestLocalSparseTriangularSolver.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestLocalSparseTriangularSolver.cpp
@@ -264,8 +264,7 @@ void testCompareToLocalSolve (bool& success, Teuchos::FancyOStream& out,
  out << "Construct the test matrix A" << endl;
  RCP<crs_matrix_type> A =
  rcp (new crs_matrix_type (rowMap, colMap,
- static_cast<std::size_t> (maxNumEntPerRow),
- Tpetra::StaticProfile));
+ static_cast<std::size_t> (maxNumEntPerRow)));
 
  out << "Fill the test matrix A" << endl;
  // Pick the entries of the matrix so that triangular solves are

diff --git a/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestRelaxation.cpp b/packages/ifpack2/test/unit_tests/Ifpack2_UnitTestRelaxation.cpp
@@ -504,7 +504,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL(Ifpack2Relaxation, SGS_mult_sweeps, Scalar, Lo
  RCP<const map_type> domainMap = rowMap;
  RCP<const map_type> rangeMap = rowMap;
  RCP<crs_matrix_type> A =
- rcp (new crs_matrix_type (rowMap, 6, Tpetra::StaticProfile));
+ rcp (new crs_matrix_type (rowMap, 6));
 
  {
  const size_t lclNumRows = rowMap->getNodeNumElements ();