Skip to content

valid regions for parallel slices #3309

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

Merged
bendudson merged 7 commits into from
Mar 11, 2026
Merged

valid regions for parallel slices #3309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc4fd33
Set parallel region by default
dschwoerer Aug 9, 2024
e4c7d98
Only set region of parallel fields for FCI
dschwoerer Sep 26, 2024
0cdf3e2
Fix split parallel slices
dschwoerer Jan 20, 2025
343fe34
add resetRegionParallel
dschwoerer Sep 30, 2025
e7592a8
Move parallel region creation to defaultRegions
dschwoerer Nov 10, 2025
0513875
Remove duplicate definition of resetRegion
dschwoerer Mar 4, 2026
7dd7664
Ensure consistency
dschwoerer Mar 11, 2026
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
1 change: 1 addition & 0 deletions include/bout/field3d.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ public:
const Region<Ind3D>& getValidRegionWithDefault(const std::string& region_name) const;
void setRegion(const std::string& region_name) override;
void resetRegion() override { regionID.reset(); };
void resetRegionParallel();
void setRegion(size_t id) override { regionID = id; };
void setRegion(std::optional<size_t> id) override { regionID = id; };
std::optional<size_t> getRegionID() const override { return regionID; };
Expand Down
10 changes: 10 additions & 0 deletions src/field/field3d.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ void Field3D::splitParallelSlices() {
yup_fields.emplace_back(fieldmesh);
ydown_fields.emplace_back(fieldmesh);
}
resetRegionParallel();
}

void Field3D::clearParallelSlices() {
Expand Down Expand Up @@ -841,6 +842,15 @@ void Field3D::setRegion(const std::string& region_name) {
regionID = fieldmesh->getRegionID(region_name);
}

void Field3D::resetRegionParallel() {
if (isFci()) {
for (int i = 0; i < fieldmesh->ystart; ++i) {
yup_fields[i].setRegion(fmt::format("RGN_YPAR_{:+d}", i + 1));
ydown_fields[i].setRegion(fmt::format("RGN_YPAR_{:+d}", -i - 1));
}
}
}

Field3D& Field3D::enableTracking(const std::string& name,
std::weak_ptr<Options> _tracking) {
tracking = std::move(_tracking);
Expand Down
6 changes: 6 additions & 0 deletions src/mesh/mesh.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,12 @@ void Mesh::createDefaultRegions() {
+ getRegion3D("RGN_YGUARDS") + getRegion3D("RGN_ZGUARDS"))
.unique());

for (int offset_ = -ystart; offset_ <= ystart; ++offset_) {
const auto region = fmt::format("RGN_YPAR_{:+d}", offset_);
Copy link
Copy Markdown
Contributor

@github-actions github-actions Bot Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

warning: no header providing "fmt::format" is directly included [misc-include-cleaner]

src/mesh/mesh.cxx:12:

- #include "impls/bout/boutmesh.hxx"
+ #include "fmt/format.h"
+ #include "impls/bout/boutmesh.hxx"

addRegion3D(region, Region<Ind3D>(xstart, xend, ystart + offset_, yend + offset_, 0,
LocalNz - 1, LocalNy, LocalNz));
}

//2D regions
addRegion2D("RGN_ALL", Region<Ind2D>(0, LocalNx - 1, 0, LocalNy - 1, 0, 0, LocalNy, 1,
maxregionblocksize));
Expand Down
10 changes: 0 additions & 10 deletions src/mesh/parallel/fci.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,16 +261,6 @@ FCIMap::FCIMap(Mesh& mesh, [[maybe_unused]] const Coordinates::FieldMetric& dy,
region_no_boundary = region_no_boundary.mask(to_remove);

interp->setRegion(region_no_boundary);

const auto region = fmt::format("RGN_YPAR_{:+d}", offset_);
if (not map_mesh->hasRegion3D(region)) {
// The valid region for this slice
map_mesh->addRegion3D(region, Region<Ind3D>(map_mesh->xstart, map_mesh->xend,
map_mesh->ystart + offset_,
map_mesh->yend + offset_, 0,
map_mesh->LocalNz - 1, map_mesh->LocalNy,
map_mesh->LocalNz));
}
}

Field3D FCIMap::integrate(Field3D& f) const {
Expand Down
Loading