Skip to content
Snippets Groups Projects
Commit 34c04646 authored by Ned Coltman's avatar Ned Coltman
Browse files

Merge branch 'cherry-pick-a961d765' into 'releases/3.2'

Merge branch 'fix/compiler-warning-brineair' into 'master'

See merge request dumux-repositories/dumux!2085
parents d03df86a 8ad2688e
No related branches found
No related tags found
2 merge requests!2152WIP add default fluxcache properties,!2085Merge branch 'fix/compiler-warning-brineair' into 'master'
...@@ -124,7 +124,6 @@ private: ...@@ -124,7 +124,6 @@ private:
{ {
switch (brineCompIdx) switch (brineCompIdx)
{ {
assert(brineCompIdx == Brine::H2OIdx || brineCompIdx == Brine::NaClIdx);
case Brine::H2OIdx: return H2OIdx; case Brine::H2OIdx: return H2OIdx;
case Brine::NaClIdx: return NaClIdx; case Brine::NaClIdx: return NaClIdx;
default: return 0; // this will never be reached, only needed to suppress compiler warning default: return 0; // this will never be reached, only needed to suppress compiler warning
......
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