From: Timo Heister Date: Tue, 8 Sep 2015 12:20:13 +0000 (-0400) Subject: remove warnings in trilinos_precondition*cc X-Git-Tag: v8.4.0-rc2~460^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad0d75cde20f499e2c1186ba159240dda56d658;p=dealii.git remove warnings in trilinos_precondition*cc --- diff --git a/source/lac/trilinos_precondition.cc b/source/lac/trilinos_precondition.cc index 9c644c439a..09457ef9ab 100644 --- a/source/lac/trilinos_precondition.cc +++ b/source/lac/trilinos_precondition.cc @@ -33,40 +33,6 @@ DEAL_II_NAMESPACE_OPEN namespace TrilinosWrappers { - namespace - { -#ifndef DEAL_II_WITH_64BIT_INDICES - int n_global_rows (const Epetra_RowMatrix &matrix) - { - return matrix.NumGlobalRows(); - } - - int global_length (const Epetra_MultiVector &vector) - { - return vector.GlobalLength(); - } - - int gid(const Epetra_Map &map, unsigned int i) - { - return map.GID(i); - } -#else - long long int n_global_rows (const Epetra_RowMatrix &matrix) - { - return matrix.NumGlobalRows64(); - } - - long long int global_length (const Epetra_MultiVector &vector) - { - return vector.GlobalLength64(); - } - - long long int gid(const Epetra_Map &map, dealii::types::global_dof_index i) - { - return map.GID64(i); - } -#endif - } PreconditionBase::PreconditionBase() #ifdef DEAL_II_WITH_MPI diff --git a/source/lac/trilinos_precondition_muelu.cc b/source/lac/trilinos_precondition_muelu.cc index d23be4a75b..61288362c2 100644 --- a/source/lac/trilinos_precondition_muelu.cc +++ b/source/lac/trilinos_precondition_muelu.cc @@ -15,7 +15,7 @@ #include -#ifdef DEAL_II_WITH_TRILINOS +#if defined(DEAL_II_WITH_TRILINOS) && DEAL_II_TRILINOS_VERSION_GTE(11,14,0) # include # include @@ -28,11 +28,9 @@ DEAL_II_DISABLE_EXTRA_DIAGNOSTICS # include # include -#if DEAL_II_TRILINOS_VERSION_GTE(11,14,0) # include # include # include -#endif DEAL_II_ENABLE_EXTRA_DIAGNOSTICS DEAL_II_NAMESPACE_OPEN @@ -76,11 +74,6 @@ namespace TrilinosWrappers - - -#if DEAL_II_TRILINOS_VERSION_GTE(11,14,0) - /* -------------------------- PreconditionAMGMueLu --------------------- */ - PreconditionAMGMueLu::AdditionalData:: AdditionalData (const bool elliptic, const unsigned int n_cycles, @@ -327,9 +320,6 @@ namespace TrilinosWrappers template void PreconditionAMGMueLu::initialize (const ::dealii::SparseMatrix &, const AdditionalData &, const double, const ::dealii::SparsityPattern *); -#endif - - }