Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
dumux-repositories
dumux
Commits
15b4b32b
Commit
15b4b32b
authored
Mar 24, 2021
by
Timo Koch
Browse files
[md][newton] Fixup conflict in solutionChanged between
!2291
and
!2527
parent
5c552e80
Changes
1
Hide whitespace changes
Inline
Side-by-side
dumux/multidomain/newtonsolver.hh
View file @
15b4b32b
...
...
@@ -157,10 +157,10 @@ protected:
/*!
* \brief Update solution-depended quantities like grid variables after the solution has changed.
*/
void
solutionChanged_
(
const
SolutionVector
&
uCurrentIter
)
override
void
solutionChanged_
(
Variables
&
vars
,
const
SolutionVector
&
uCurrentIter
)
override
{
couplingManager_
->
updateSolution
(
uCurrentIter
);
this
->
assembler
().
updateGridVariables
(
uCurrentIter
);
ParentType
::
solutionChanged_
(
vars
,
uCurrentIter
);
}
private:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment