Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trilinos Couplings: Fix for #5754 #5755

Merged
merged 1 commit into from
Aug 20, 2019
Merged

Trilinos Couplings: Fix for #5754 #5755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ...inoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
//
typedef Tpetra::Map<LO, GO, Node> map_type;
typedef Tpetra::Export<LO, GO, Node> export_type;
//typedef Tpetra::Import<LO, GO, Node> import_type; // unused
//typedef Tpetra::Import<LO, GO, Node> import_type; // unused
typedef Tpetra::CrsGraph<LO, GO, Node> sparse_graph_type;

// Number of independent variables fixed at 3
Expand Down Expand Up @@ -615,7 +615,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
int oidx = 0;
for (int i = 0; i < numNodes; ++i) {
if (nodeIsOwned[i]) {
ownedGIDs[oidx] = as<int> (globalNodeIds[i]);
ownedGIDs[oidx] = as<GO> (globalNodeIds[i]);

coordXArray[oidx] = nodeCoord(i,0);
coordYArray[oidx] = nodeCoord(i,1);
Expand Down Expand Up @@ -708,9 +708,9 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
// relative to the cell DoF numbering
for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
int localCol = elemToNode (cell, cellCol);
GO globalCol = globalNodeIds[localCol];
GO globalCol = as<GO> (globalNodeIds[localCol]);
//create ArrayView globalCol object for Tpetra
ArrayView<const GO> globalColAV = arrayView (&globalCol, 1);
ArrayView<GO> globalColAV = arrayView (&globalCol, 1);

//Update Tpetra overlap Graph
overlappedGraph->insertGlobalIndices (globalRowT, globalColAV);
Expand Down
6 changes: 3 additions & 3 deletions ...inoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ namespace TpetraIntrepidPoissonExample {
// besides the default.
//
typedef double ST;
typedef int LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;
typedef Tpetra::Map<>::local_ordinal_type LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;

//
// mfh 19 Apr 2012: If you want to change the template parameters of
Expand Down
4 changes: 2 additions & 2 deletions ...inoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
int oidx = 0;
for (int i = 0; i < numNodes; ++i) {
if (nodeIsOwned[i]) {
ownedGIDs[oidx] = as<int> (globalNodeIds[i]);
ownedGIDs[oidx] = as<GO> (globalNodeIds[i]);

coordXArray[oidx] = nodeCoord(i,0);
coordYArray[oidx] = nodeCoord(i,1);
Expand Down Expand Up @@ -710,7 +710,7 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
// relative to the cell DoF numbering
for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
int localCol = elemToNode (cell, cellCol);
GO globalCol = globalNodeIds[localCol];
GO globalCol = as<GO> (globalNodeIds[localCol]);
//create ArrayView globalCol object for Tpetra
ArrayView<GO> globalColAV = arrayView (&globalCol, 1);

Expand Down
8 changes: 4 additions & 4 deletions ...inoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ namespace TpetraIntrepidPoissonExample {
// double and LO,GO = int, but it probably works for other Node types
// besides the default.
//
typedef double ST;
typedef int LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;
typedef double ST;
typedef Tpetra::Map<>::local_ordinal_type LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;

//
// mfh 19 Apr 2012: If you want to change the template parameters of
Expand Down
4 changes: 2 additions & 2 deletions ...oscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,9 +702,9 @@ makeMatrixAndRightHandSide (Teuchos::RCP<sparse_matrix_type>& A,
// relative to the cell DoF numbering
for (int cellCol = 0; cellCol < numFieldsG; ++cellCol) {
int localCol = elemToNode (cell, cellCol);
GO globalCol = globalNodeIds[localCol];
GO globalCol = as<GO> (globalNodeIds[localCol]);
//create ArrayView globalCol object for Tpetra
ArrayView<const GO> globalColAV = arrayView (&globalCol, 1);
ArrayView<GO> globalColAV = arrayView (&globalCol, 1);

//Update Tpetra overlap Graph
overlappedGraph->insertGlobalIndices (globalRowT, globalColAV);
Expand Down
8 changes: 4 additions & 4 deletions ...oscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ namespace TpetraIntrepidPoissonExample {
// double and LO,GO = int, but it probably works for other Node types
// besides the default.
//
typedef double ST;
typedef int LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;
typedef double ST;
typedef Tpetra::Map<>::local_ordinal_type LO;
typedef Tpetra::Map<>::global_ordinal_type GO;
typedef Tpetra::Map<>::node_type Node;
typedef Teuchos::ScalarTraits<ST> STS;
typedef STS::magnitudeType MT;

Expand Down