Cleanups in some hp::DoFHandler functions. #7233
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/run-tests |
|
Would appreciate a quick turn-around on this one. |
drwells
approved these changes
Sep 26, 2018
source/hp/dof_handler.cc
Outdated
| // allocate offsets for all faces, though only the active | ||
| // ones will have a non-invalid value later on | ||
| face_dof_offsets = | ||
| std::vector<unsigned int>(dof_handler.tria->n_raw_faces(), | ||
| (unsigned int)(-1)); | ||
| static_cast<unsigned int>(-1)); |
There was a problem hiding this comment.
Would it be better to use numbers::invalid_unsigned_int here?
| // 1 times dofs_per_face dofs, and one stop index | ||
| n_face_slots += | ||
| 1 + | ||
| dof_handler.get_fe(cell->active_fe_index()) | ||
| .template n_dofs_per_object<dim - 1>() + | ||
| 1; | ||
|
|
||
| // otherwise we do indeed need two sets, i.e. two | ||
| // Otherwise we do indeed need two sets, i.e. two | ||
| // active_fe_indices, two sets of dofs, and one stop | ||
| // index: | ||
| else |
There was a problem hiding this comment.
Would you mind adding the same comments here?
davydden
approved these changes
Sep 26, 2018
| // allocate offsets for all faces, though only the active | ||
| // ones will have a non-invalid value later on | ||
| face_dof_offsets = | ||
| std::vector<unsigned int>(dof_handler.tria->n_raw_faces(), | ||
| (unsigned int)(-1)); |
There was a problem hiding this comment.
Should not we use numbers::invalid_unsigned_int?
|
Also, if you are feeling fancy, we could use instead of using user flags. |
|
On 09/26/2018 03:31 PM, David Wells wrote:
Also, if you are feeling fancy, we could use
|for (const auto &face : triangulation.active_face_iterators() |
instead of using user flags.
Nope, I can't do that because I need to get the two adjacent cells to
find out what elements live there. There is no way to go from faces to
cells :-(
|
|
Aw rats, you're right. |
|
I made the requested changes and also created a small array to hold the two This passes all |
drwells
reviewed
Sep 26, 2018
| // Store the two indices we will have to deal with. | ||
| unsigned int active_fe_indices[2] = { | ||
| cell->active_fe_index(), | ||
| cell->neighbor(face)->active_fe_index()}; |
|
/run-tests |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is in preparation for a patch to resolve #7162 after
@marcfehling explained the bug to me. That patch is coming
next but I thought I'd get the clean-ups out of the way
already given that these cleanups significantly obscure
what the real patch is going to be.
In pursuance of #3511.