]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Remove some branches for now unsupported versions of Trilinos. 17979/head
authorMarc Fehling <mafehling.git@gmail.com>
Fri, 29 Nov 2024 13:03:46 +0000 (14:03 +0100)
committerMarc Fehling <mafehling.git@gmail.com>
Wed, 8 Jan 2025 12:16:36 +0000 (13:16 +0100)
source/lac/trilinos_epetra_vector.cc
source/lac/trilinos_precondition_ml.cc
source/lac/trilinos_vector.cc

index 998ed14981cb5573d50d9585b1d72f83ad3f6f6c..1155fbdfe023ad94d19631ca33ce9e3ecb73e442 100644 (file)
@@ -287,27 +287,12 @@ namespace LinearAlgebra
           Assert(this->size() == V.size(),
                  ExcDimensionMismatch(this->size(), V.size()));
 
-#  if DEAL_II_TRILINOS_VERSION_GTE(11, 11, 0)
           Epetra_Import data_exchange(vector->Map(), V.trilinos_vector().Map());
           const int     ierr = vector->Import(V.trilinos_vector(),
                                           data_exchange,
                                           Epetra_AddLocalAlso);
           Assert(ierr == 0, ExcTrilinosError(ierr));
           (void)ierr;
-#  else
-          // In versions older than 11.11 the Import function is broken for
-          // adding Hence, we provide a workaround in this case
-
-          Epetra_MultiVector dummy(vector->Map(), 1, false);
-          Epetra_Import data_exchange(dummy.Map(), V.trilinos_vector().Map());
-
-          int ierr = dummy.Import(V.trilinos_vector(), data_exchange, Insert);
-          Assert(ierr == 0, ExcTrilinosError(ierr));
-
-          ierr = vector->Update(1.0, dummy, 1.0);
-          Assert(ierr == 0, ExcTrilinosError(ierr));
-          (void)ierr;
-#  endif
         }
 
       return *this;
index af3c801540c3cbb5ff3940402d792575cd234faa..4cd2efca9676d3b0f7ae340cc9bbed8c7503af5f 100644 (file)
@@ -94,10 +94,7 @@ namespace TrilinosWrappers
     parameter_list.set("coarse: type", coarse_type);
 
     // Force re-initialization of the random seed to make ML deterministic
-    // (only supported in trilinos >12.2):
-#  if DEAL_II_TRILINOS_VERSION_GTE(12, 4, 0)
     parameter_list.set("initialize random seed", true);
-#  endif
 
     parameter_list.set("smoother: sweeps", static_cast<int>(smoother_sweeps));
     parameter_list.set("cycle applications", static_cast<int>(n_cycles));
index 1edc195bcfad0dabaf97c95087e693ca1639bff2..8c18173170e71670c5c0cf6a1814a6c943907350 100644 (file)
@@ -733,25 +733,11 @@ namespace TrilinosWrappers
           AssertThrow(size() == v.size(),
                       ExcDimensionMismatch(size(), v.size()));
 
-#  if DEAL_II_TRILINOS_VERSION_GTE(11, 11, 0)
           Epetra_Import data_exchange(vector->Map(), v.vector->Map());
           int           ierr =
             vector->Import(*v.vector, data_exchange, Epetra_AddLocalAlso);
           AssertThrow(ierr == 0, ExcTrilinosError(ierr));
           last_action = Add;
-#  else
-          // In versions older than 11.11 the Import function is broken for
-          // adding Hence, we provide a workaround in this case
-
-          Epetra_MultiVector dummy(vector->Map(), 1, false);
-          Epetra_Import      data_exchange(dummy.Map(), v.vector->Map());
-
-          int ierr = dummy.Import(*v.vector, data_exchange, Insert);
-          AssertThrow(ierr == 0, ExcTrilinosError(ierr));
-
-          ierr = vector->Update(1.0, dummy, 1.0);
-          AssertThrow(ierr == 0, ExcTrilinosError(ierr));
-#  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.