-
Notifications
You must be signed in to change notification settings - Fork 95
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
Fix Field3D::setBoundaryTo for FCI methods #3030
Merged
+26
−3
Merged
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
70726f3
Fix Field3D::setBoundaryTo for FCI methods
bendudson c64d439
Copy BCs in x-direction also for FCI
dschwoerer 2d64a0d
Use consistently first order interpolation
dschwoerer d59517e
Disable broken test-laplace-petsc3d by default
dschwoerer a65b1d8
Fix unit test for FCI
dschwoerer b71e978
Update to new grid with parallel metrics
dschwoerer 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
Original file line number | Diff line number | Diff line change | ||
---|---|---|---|---|
|
@@ -491,7 +491,25 @@ void Field3D::setBoundaryTo(const Field3D& f3d) { | |||
|
||||
allocate(); // Make sure data allocated | ||||
|
||||
/// Loop over boundary regions | ||||
if (isFci()) { | ||||
// Set yup/ydown using midpoint values from f3d | ||||
ASSERT1(f3d.hasParallelSlices()); | ||||
ASSERT1(hasParallelSlices()); | ||||
|
||||
for (auto& region : fieldmesh->getBoundariesPar()) { | ||||
for (const auto& pnt : *region) { | ||||
// Interpolate midpoint value in f3d | ||||
const BoutReal val = pnt.interpolate_sheath_o1(f3d); | ||||
// Set the same boundary value in this field | ||||
pnt.dirichlet_o2(*this, val); | ||||
} | ||||
} | ||||
return; | ||||
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. For hermes that might work, but should we not also copy the x-boundary conditions with FCI?
Suggested change
|
||||
} | ||||
|
||||
// Non-FCI. | ||||
// Transform to field-aligned coordinates? | ||||
// Loop over boundary regions | ||||
for (const auto& reg : fieldmesh->getBoundaries()) { | ||||
/// Loop within each region | ||||
for (reg->first(); !reg->isDone(); reg->next()) { | ||||
|
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.
We should either take o2 twice, or o1 twice:
I think
o1
should be sufficient, asf3d
and*this
should be close. But I am not sure what is more stable ...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.
The FA code also uses first order, so I have pushed a fixed based on that ...