-
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
Add isFci for fields #2887
Open
dschwoerer
wants to merge
12
commits into
next
Choose a base branch
from
add-is-fci
base: next
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add isFci for fields #2887
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
fa357c1
Add isFci to check if a field is a FCI field.
dschwoerer ca59edb
Improve isFci
dschwoerer 8b1fbba
Apply clang-format changes
dschwoerer 23d309f
Make isFci a member function and add missing func
dschwoerer 18fca62
Make it explicit that this is a pointer
dschwoerer 44084cc
Add isFci also to mesh
dschwoerer cd288e9
Add const version for getCoordinates
dschwoerer 061b82f
Apply clang-format changes
dschwoerer 0a5e3da
Merge branch 'next' into add-is-fci
dschwoerer 5ef1268
Merge branch 'add-is-fci' into is-fci-mesh
dschwoerer a4b8abf
Merge pull request #3001 from boutproject/is-fci-mesh
bendudson ececfb8
Apply suggestions from clang-tidy
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
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 | ||||
---|---|---|---|---|---|---|
|
@@ -636,9 +636,22 @@ public: | |||||
return inserted.first->second; | ||||||
} | ||||||
|
||||||
std::shared_ptr<Coordinates> | ||||||
getCoordinatesConst(const CELL_LOC location = CELL_CENTRE) const { | ||||||
ASSERT1(location != CELL_DEFAULT); | ||||||
ASSERT1(location != CELL_VSHIFT); | ||||||
|
||||||
auto found = coords_map.find(location); | ||||||
if (found != coords_map.end()) { | ||||||
// True branch most common, returns immediately | ||||||
return found->second; | ||||||
} | ||||||
throw BoutException("Coordinates not yet set. Use non-const version!"); | ||||||
} | ||||||
|
||||||
/// Returns the non-CELL_CENTRE location | ||||||
/// allowed as a staggered location | ||||||
CELL_LOC getAllowedStaggerLoc(DIRECTION direction) const { | ||||||
static CELL_LOC getAllowedStaggerLoc(DIRECTION direction) { | ||||||
AUTO_TRACE(); | ||||||
switch (direction) { | ||||||
case (DIRECTION::X): | ||||||
|
@@ -828,6 +841,16 @@ public: | |||||
ASSERT1(RegionID.has_value()); | ||||||
return region3D[RegionID.value()]; | ||||||
} | ||||||
bool isFci() const { | ||||||
const auto coords = this->getCoordinatesConst(); | ||||||
if (coords == nullptr) { | ||||||
return false; | ||||||
} | ||||||
if (not coords->hasParallelTransform()) { | ||||||
return false; | ||||||
} | ||||||
return not coords->getParallelTransform().canToFromFieldAligned(); | ||||||
} | ||||||
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. warning: parameter 'location' is const-qualified in the function declaration; const-qualification of parameters only has an effect in function definitions [readability-avoid-const-params-in-decls]
Suggested change
|
||||||
|
||||||
private: | ||||||
/// Allocates default Coordinates objects | ||||||
|
@@ -837,8 +860,7 @@ private: | |||||
/// (useful if CELL_CENTRE Coordinates have been changed, so reading from file | ||||||
/// would not be correct). | ||||||
std::shared_ptr<Coordinates> | ||||||
createDefaultCoordinates(const CELL_LOC location, | ||||||
bool force_interpolate_from_centre = false); | ||||||
createDefaultCoordinates(CELL_LOC location, bool force_interpolate_from_centre = false); | ||||||
|
||||||
//Internal region related information | ||||||
std::map<std::string, size_t> regionMap3D; | ||||||
|
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
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.
warning: method 'getAllowedStaggerLoc' can be made static [readability-convert-member-functions-to-static]