-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
107 mixed space adj project #108
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
dc726fe
pass parameters to enriched mesh
acse-ej321 b23f4f1
modify enriched mesh
acse-ej321 c819f31
add update function space method to mesh seq for clarity
acse-ej321 b2373d4
#107: Relabelling
jwallwork23 89995dc
#107: update_function_spaces is now a method
jwallwork23 eb3de5c
Merge branch 'main' into 107_mixed_space_adj_project
jwallwork23 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
""" | ||
Sequences of meshes corresponding to a :class:`~.TimePartition`. | ||
""" | ||
|
||
import firedrake | ||
from firedrake.adjoint import pyadjoint | ||
from firedrake.adjoint_utils.solving import get_solve_blocks | ||
|
@@ -235,8 +236,10 @@ def _function_spaces_consistent(self) -> bool: | |
) | ||
return consistent | ||
|
||
@property | ||
def function_spaces(self) -> list: | ||
def update_function_spaces(self) -> list: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @jwallwork23 - I think your edits here make more sense than my interpretation of your suggestions and it is a better descriptive name of the method you had already implemented. |
||
""" | ||
Update the function space dictionary associated with the :class:`MeshSeq`. | ||
""" | ||
if self._fs is None or not self._function_spaces_consistent: | ||
self._fs = [self.get_function_spaces(mesh) for mesh in self.meshes] | ||
self._fs = AttrDict( | ||
|
@@ -250,6 +253,10 @@ def function_spaces(self) -> list: | |
), "Meshes and function spaces are inconsistent" | ||
return self._fs | ||
|
||
@property | ||
def function_spaces(self): | ||
return self.update_function_spaces() | ||
|
||
@property | ||
def initial_condition(self) -> AttrDict: | ||
ic = OrderedDict(self.get_initial_condition()) | ||
|
@@ -653,7 +660,11 @@ def check_element_count_convergence(self): | |
|
||
@PETSc.Log.EventDecorator() | ||
def fixed_point_iteration( | ||
self, adaptor: Callable, solver_kwargs: dict = {}, adaptor_kwargs: dict = {}, **kwargs | ||
self, | ||
adaptor: Callable, | ||
solver_kwargs: dict = {}, | ||
adaptor_kwargs: dict = {}, | ||
**kwargs, | ||
): | ||
r""" | ||
Apply goal-oriented mesh adaptation using a fixed point iteration loop. | ||
|
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Partially addresses #97.