From: Denis Davydov Date: Tue, 10 Nov 2015 14:30:57 +0000 (+0100) Subject: minor renaming of data members and variables in SLEPc solver X-Git-Tag: v8.4.0-rc2~233^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd645383cb9a6516a0d20b7b3a51bfe376c0d8fa;p=dealii.git minor renaming of data members and variables in SLEPc solver --- diff --git a/include/deal.II/lac/slepc_solver.h b/include/deal.II/lac/slepc_solver.h index 3228cdd8f4..67326cabc3 100644 --- a/include/deal.II/lac/slepc_solver.h +++ b/include/deal.II/lac/slepc_solver.h @@ -194,7 +194,7 @@ namespace SLEPcWrappers template void set_initial_space - (const std::vector &initial_vectors); + (const std::vector &initial_space); /** * Set the spectral transformation to be used. @@ -371,7 +371,7 @@ namespace SLEPcWrappers /** * An initial vector space used in SLEPc solvers. */ - std::vector initial_vectors; + std::vector initial_space; /** * Pointer to an an object that describes transformations that can be @@ -874,12 +874,12 @@ namespace SLEPcWrappers template void - SolverBase::set_initial_space(const std::vector &vectors) + SolverBase::set_initial_space(const std::vector &this_initial_space) { - initial_vectors.resize(vectors.size()); - for (unsigned int i = 0; i < initial_vectors.size(); i++) + initial_space.resize(this_initial_space.size()); + for (unsigned int i = 0; i < initial_space.size(); i++) { - initial_vectors[i] = vectors[i]; + initial_space[i] = this_initial_space[i]; } } diff --git a/source/lac/slepc_solver.cc b/source/lac/slepc_solver.cc index a94af05590..6e1e387a76 100644 --- a/source/lac/slepc_solver.cc +++ b/source/lac/slepc_solver.cc @@ -79,8 +79,8 @@ namespace SLEPcWrappers void SolverBase::set_initial_vector (const PETScWrappers::VectorBase &this_initial_vector) { - initial_vectors.resize(1); - initial_vectors[0] = this_initial_vector; + initial_space.resize(1); + initial_space[0] = this_initial_vector; } void @@ -140,13 +140,13 @@ namespace SLEPcWrappers AssertThrow (ierr == 0, ExcSLEPcError(ierr)); // set the initial vector(s) if any - if (initial_vectors.size() != 0) + if (initial_space.size() != 0) { #if DEAL_II_PETSC_VERSION_LT(3,1,0) - ierr = EPSSetInitialVector (solver_data->eps, &initial_vectors[0]); + ierr = EPSSetInitialVector (solver_data->eps, &initial_space[0]); #else - ierr = EPSSetInitialSpace (solver_data->eps, initial_vectors.size(), &initial_vectors[0]); + ierr = EPSSetInitialSpace (solver_data->eps, initial_space.size(), &initial_space[0]); #endif AssertThrow (ierr == 0, ExcSLEPcError(ierr));