Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 0ffdce35 authored by gsell's avatar gsell
Browse files

don't treat Tpetra deprecated warning as error

in the MGPoissonSolver deprecated methods are used
parent 59255983
No related branches found
No related tags found
1 merge request!600Resolve "fixes for compilation on macOS"
...@@ -372,8 +372,15 @@ void MGPoissonSolver::computePotential(Field_t &rho, Vector_t hr) { ...@@ -372,8 +372,15 @@ void MGPoissonSolver::computePotential(Field_t &rho, Vector_t hr) {
// build discretization matrix // build discretization matrix
INFOMSG(level3 << "* Building Discretization Matrix..." << endl); INFOMSG(level3 << "* Building Discretization Matrix..." << endl);
IpplTimings::startTimer(FunctionTimer4_m); IpplTimings::startTimer(FunctionTimer4_m);
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic warning "-Wdeprecated-declarations"
#endif
if (Teuchos::is_null(A)) if (Teuchos::is_null(A))
A = rcp(new TpetraCrsMatrix_t(map_p, 7, Tpetra::StaticProfile)); A = rcp(new TpetraCrsMatrix_t(map_p, 7, Tpetra::StaticProfile));
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
ComputeStencil(hr, RHS); ComputeStencil(hr, RHS);
IpplTimings::stopTimer(FunctionTimer4_m); IpplTimings::stopTimer(FunctionTimer4_m);
INFOMSG(level3 << "* Done." << endl); INFOMSG(level3 << "* Done." << endl);
...@@ -521,7 +528,15 @@ void MGPoissonSolver::ComputeStencil(Vector_t /*hr*/, Teuchos::RCP<TpetraVector_ ...@@ -521,7 +528,15 @@ void MGPoissonSolver::ComputeStencil(Vector_t /*hr*/, Teuchos::RCP<TpetraVector_
A->resumeFill(); A->resumeFill();
A->setAllToScalar(0.0); A->setAllToScalar(0.0);
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic warning "-Wdeprecated-declarations"
#endif
int NumMyElements = map_p->getNodeNumElements(); int NumMyElements = map_p->getNodeNumElements();
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
auto MyGlobalElements = map_p->getMyGlobalIndices(); auto MyGlobalElements = map_p->getMyGlobalIndices();
std::vector<TpetraScalar_t> Values(6); std::vector<TpetraScalar_t> Values(6);
...@@ -590,8 +605,16 @@ void MGPoissonSolver::ComputeStencil(Vector_t /*hr*/, Teuchos::RCP<TpetraVector_ ...@@ -590,8 +605,16 @@ void MGPoissonSolver::ComputeStencil(Vector_t /*hr*/, Teuchos::RCP<TpetraVector_
void MGPoissonSolver::printLoadBalanceStats() { void MGPoissonSolver::printLoadBalanceStats() {
//compute some load balance statistics //compute some load balance statistics
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic warning "-Wdeprecated-declarations"
#endif
size_t myNumPart = map_p->getNodeNumElements(); size_t myNumPart = map_p->getNodeNumElements();
size_t NumPart = map_p->getGlobalNumElements() * 1.0 / comm_mp->getSize(); size_t NumPart = map_p->getGlobalNumElements() * 1.0 / comm_mp->getSize();
#if defined(__clang__)
# pragma clang diagnostic pop
#endif
double imbalance = 1.0; double imbalance = 1.0;
if (myNumPart >= NumPart) if (myNumPart >= NumPart)
imbalance += (myNumPart - NumPart) / NumPart; imbalance += (myNumPart - NumPart) / NumPart;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment