Fix multiple linear/nonlinear solves #241
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The change variables were hard coded so that only the first
TIME_INDEPENDENT
equation would have its change variable (for Newton-Picard iteration). This prevented the addition of multipleTIME_INDEPENDENT
(#166) equations. To fix this, I switched theFEEvaluation
vectors to unordered maps instead.This way, we can assign the
FEEvaluation
to the global variable index rather than the index of variable type (e.g. phi might be the 4th explicit variable and the 5th global variable. In the prior scheme we would index based on the 4th explicit). Doing so also reduced the convolutedness ofloadVariableAttributes.cc
andvariableContainer.cc
.Some minor optimizations were also made in regard to dereferencing over and over. Before we had this
Instead, I stored the pointer in a local variable.
Since these are called for every cell and every step, the performance improvement should be rather significant.