Skip to content
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.

Sign up for GitHub

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
wants to merge 12 commits into
base: next
Choose a base branch
from
Open

Add isFci for fields #2887

Show file tree
Hide file tree
Changes from 4 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 Mar 19, 2024
ca59edb
Improve isFci
dschwoerer Nov 3, 2023
8b1fbba
Apply clang-format changes
dschwoerer Mar 19, 2024
23d309f
Make isFci a member function and add missing func
dschwoerer Mar 20, 2024
18fca62
Make it explicit that this is a pointer
dschwoerer Apr 12, 2024
44084cc
Add isFci also to mesh
dschwoerer Jul 2, 2024
cd288e9
Add const version for getCoordinates
dschwoerer Aug 9, 2024
061b82f
Apply clang-format changes
dschwoerer Oct 22, 2024
0a5e3da
Merge branch 'next' into add-is-fci
dschwoerer Oct 22, 2024
5ef1268
Merge branch 'add-is-fci' into is-fci-mesh
dschwoerer Oct 22, 2024
a4b8abf
Merge pull request #3001 from boutproject/is-fci-mesh
bendudson Oct 28, 2024
ececfb8
Apply suggestions from clang-tidy
dschwoerer Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions include/bout/coordinates.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ public:
transform = std::move(pt);
}

bool hasParallelTransform() const { return transform != nullptr; }
/// Return the parallel transform
ParallelTransform& getParallelTransform() {
ASSERT1(transform != nullptr);
ParallelTransform& getParallelTransform() const {
ASSERT1(hasParallelTransform());
return *transform;
}

Expand Down
2 changes: 2 additions & 0 deletions include/bout/field.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public:

std::string name;

bool isFci() const;

#if CHECK > 0
// Routines to test guard/boundary cells set

Expand Down
11 changes: 11 additions & 0 deletions src/field/field.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,14 @@ int Field::getNx() const { return getMesh()->LocalNx; }
int Field::getNy() const { return getMesh()->LocalNy; }

int Field::getNz() const { return getMesh()->LocalNz; }

bool Field::isFci() const {
const auto coords = this->getCoordinates();
dschwoerer marked this conversation as resolved.
Show resolved Hide resolved
if (coords == nullptr) {
return false;
}
if (not coords->hasParallelTransform()) {
return false;
}
return not coords->getParallelTransform().canToFromFieldAligned();
}
Loading