Skip to content
Snippets Groups Projects
Commit 57dd8236 authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

Make SolverCategory non-const

* setSolverCategory is not allowed to alter a const value
* Adjust type of setSolverCategory's set
* Properly document deprecation of get/setSolverCategory
parent ab623995
No related branches found
No related tags found
1 merge request!344Feature/non const solver category
...@@ -47,6 +47,12 @@ ...@@ -47,6 +47,12 @@
- `SeqILU` can now be used with SIMD data types. - `SeqILU` can now be used with SIMD data types.
- The method `setSolverCategory` of `OwnerOverlapCopyCommunication` is deprecated and
will be removed after Dune 2.7. The solver category can only be set in the constructor.
- The method `getSolverCategory` of `OwnerOverlapCopyCommunication` is deprecated and
will be removed after Dune 2.7. Use `category()` instead.
# Release 2.6 # Release 2.6
- `BDMatrix` objects can now be constructed and assigned from `std::initializer_list`. - `BDMatrix` objects can now be constructed and assigned from `std::initializer_list`.
......
...@@ -289,13 +289,13 @@ namespace Dune { ...@@ -289,13 +289,13 @@ namespace Dune {
* @brief Set right Solver Category (default is overlapping). * @brief Set right Solver Category (default is overlapping).
*/ */
void void
DUNE_DEPRECATED_MSG("the solver category can only be set in the constructor") DUNE_DEPRECATED_MSG("The solver category can only be set in the constructor. This method is deprecated and will be removed after Dune 2.7")
setSolverCategory (SolverCategory set) { setSolverCategory (SolverCategory::Category set) {
category_ = set; category_ = set;
} }
SolverCategory::Category SolverCategory::Category
DUNE_DEPRECATED_MSG("use category()") DUNE_DEPRECATED_MSG("This method is deprecated and will be removed after Dune 2.7, use category() instead.")
getSolverCategory () const { getSolverCategory () const {
return category_; return category_;
} }
...@@ -701,7 +701,8 @@ namespace Dune { ...@@ -701,7 +701,8 @@ namespace Dune {
mutable std::vector<double> mask; mutable std::vector<double> mask;
int oldseqNo; int oldseqNo;
GlobalLookupIndexSet* globalLookup_; GlobalLookupIndexSet* globalLookup_;
const SolverCategory::Category category_; // re-intruduce const qualifier once deprecated setCategory got removed after Dune 2.7
/* const */ SolverCategory::Category category_;
bool freecomm; bool freecomm;
}; };
......
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