Allow X splitting with FCI by dschwoerer · Pull Request #2651 · boutproject/BOUT-dev

dschwoerer · 2023-02-08T09:32:55Z

Uses PETSc. Currently only implemented for hermitespline.

Might help with performance

Otherwise the regions aren't cached.

Might help with performance

Precalculate the matrix. This hard-codes the DDX and DDZ derivative to C2. Rather than taking derivatives, this first does the matrix-matrix multiplication and then does only a single matrix-vector operation, rather than 4. Retains a switch to go back to the old version.

release leaks the pointer, reset free's the object.

* helped finding the bug for the boundary * rather slow (around 1 minute) * needs internet connectivity

dschwoerer · 2023-02-08T09:49:38Z

Requires #2324

github-actions

clang-tidy made some suggestions

github-actions · 2024-04-29T08:44:13Z

  XZHermiteSpline(const BoutMask& mask, int y_offset = 0, Mesh* mesh = nullptr)
      : XZHermiteSpline(y_offset, mesh) {
-    region = regionFromMask(mask, localmesh);
+    setRegion(regionFromMask(mask, localmesh));


warning: no matching member function for call to 'setRegion' [clang-diagnostic-error]

setRegion(regionFromMask(mask, localmesh)); ^

Additional context

include/bout/interpolation_xz.hxx:77: candidate function not viable: no known conversion from 'XZHermiteSpline' to 'XZInterpolation' for object argument

void setRegion(const std::unique_ptr<Region<Ind3D>> region) { setRegion(*region); } ^

include/bout/interpolation_xz.hxx:74: candidate function not viable: no known conversion from 'XZHermiteSpline' to 'XZInterpolation' for object argument

void setRegion(const std::string& region_name) { ^

include/bout/interpolation_xz.hxx:78: candidate function not viable: no known conversion from 'XZHermiteSpline' to 'XZInterpolation' for object argument

void setRegion(const Region<Ind3D>& region) { ^

github-actions · 2024-04-29T08:44:13Z

  XZLagrange4pt(const BoutMask& mask, int y_offset = 0, Mesh* mesh = nullptr)
      : XZLagrange4pt(y_offset, mesh) {
-    region = regionFromMask(mask, localmesh);
+    setRegion(regionFromMask(mask, localmesh));


warning: no matching member function for call to 'setRegion' [clang-diagnostic-error]

setRegion(regionFromMask(mask, localmesh)); ^

Additional context

include/bout/interpolation_xz.hxx:77: candidate function not viable: no known conversion from 'XZLagrange4pt' to 'XZInterpolation' for object argument

void setRegion(const std::unique_ptr<Region<Ind3D>> region) { setRegion(*region); } ^

include/bout/interpolation_xz.hxx:74: candidate function not viable: no known conversion from 'XZLagrange4pt' to 'XZInterpolation' for object argument

void setRegion(const std::string& region_name) { ^

include/bout/interpolation_xz.hxx:78: candidate function not viable: no known conversion from 'XZLagrange4pt' to 'XZInterpolation' for object argument

void setRegion(const Region<Ind3D>& region) { ^

github-actions · 2024-04-29T08:44:13Z

  XZBilinear(const BoutMask& mask, int y_offset = 0, Mesh* mesh = nullptr)
      : XZBilinear(y_offset, mesh) {
-    region = regionFromMask(mask, localmesh);
+    setRegion(regionFromMask(mask, localmesh));


warning: no matching member function for call to 'setRegion' [clang-diagnostic-error]

setRegion(regionFromMask(mask, localmesh)); ^

Additional context

include/bout/interpolation_xz.hxx:77: candidate function not viable: no known conversion from 'XZBilinear' to 'XZInterpolation' for object argument

void setRegion(const std::unique_ptr<Region<Ind3D>> region) { setRegion(*region); } ^

include/bout/interpolation_xz.hxx:74: candidate function not viable: no known conversion from 'XZBilinear' to 'XZInterpolation' for object argument

void setRegion(const std::string& region_name) { ^

include/bout/interpolation_xz.hxx:78: candidate function not viable: no known conversion from 'XZBilinear' to 'XZInterpolation' for object argument

void setRegion(const Region<Ind3D>& region) { ^

github-actions · 2024-04-29T08:44:13Z

+    return data[i.ind];
+  }

  T& operator[](Ind3D i) {


warning: class member cannot be redeclared [clang-diagnostic-error]

T& operator[](Ind3D i) { ^

Additional context

include/bout/utils.hxx:363: previous definition is here

T& operator[](Ind3D i) { ^

github-actions · 2024-04-29T08:44:13Z

+#ifdef HS_USE_PETSC
+  IndConverter conv{localmesh};
+#endif
+  BOUT_FOR(i, getRegion(region)) {


warning: no matching member function for call to 'getRegion' [clang-diagnostic-error]

BOUT_FOR(i, getRegion(region)) { ^

Additional context

include/bout/region.hxx:135: expanded from macro 'BOUT_FOR'

BOUT_FOR_OMP(index, region, parallel for schedule(BOUT_OPENMP_SCHEDULE)) ^

include/bout/region.hxx:131: expanded from macro 'BOUT_FOR_OMP'

#define BOUT_FOR_OMP(index, region, omp_pragmas) BOUT_FOR_SERIAL(index, region) ^

include/bout/region.hxx:119: expanded from macro 'BOUT_FOR_SERIAL'

for (auto block = region.getBlocks().cbegin(), end = region.getBlocks().cend(); \ ^

include/bout/interpolation_xz.hxx:91: candidate function not viable: no known conversion from 'XZHermiteSpline' to 'const XZInterpolation' for object argument

const Region<Ind3D>& getRegion(const std::string& region) const { ^

include/bout/interpolation_xz.hxx:87: candidate function not viable: requires 0 arguments, but 1 was provided

const Region<Ind3D>& getRegion() const { ^

github-actions · 2024-04-29T08:44:13Z

@@ -59,67 +59,50 @@ Field3D XZMonotonicHermiteSpline::interpolate(const Field3D& f,

  const auto curregion{getRegion(region)};


warning: no matching member function for call to 'getRegion' [clang-diagnostic-error]

const auto curregion{getRegion(region)}; ^

Additional context

include/bout/interpolation_xz.hxx:91: candidate function not viable: no known conversion from 'const XZMonotonicHermiteSpline' to 'const XZInterpolation' for object argument

const Region<Ind3D>& getRegion(const std::string& region) const { ^

include/bout/interpolation_xz.hxx:87: candidate function not viable: requires 0 arguments, but 1 was provided

const Region<Ind3D>& getRegion() const { ^

@dschwoerer

Based on @dschwoerer's implementation in #2651

…ting

dschwoerer · 2025-07-16T10:57:11Z

@ZedThree clang-tidy-review is failing with:

 Removing already posted or extra comments
Traceback (most recent call last):
  File "/usr/local/bin/review", line 8, in <module>
    sys.exit(main())
             ^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/clang_tidy_review/review.py", line 183, in main
    post_review(
  File "/usr/local/lib/python3.12/dist-packages/clang_tidy_review/__init__.py", line 1341, in post_review
    trimmed_review = cull_comments(pull_request, decorated_review, max_comments)
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/clang_tidy_review/__init__.py", line 1243, in cull_comments
    posted_comments = {HashableComment(**c) for c in pull_request.get_pr_comments()}
                      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/github/PaginatedList.py", line 84, in __iter__
    newElements = self._grow()
                  ^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/github/PaginatedList.py", line 95, in _grow
    newElements = self._fetchNextPage()
                  ^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/github/PaginatedList.py", line 324, in _fetchNextPage
    return self._getPage(data, headers)
           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/usr/local/lib/python3.12/dist-packages/github/PaginatedList.py", line 357, in _getPage
    self.__contentClass(self.__requester, headers, self._transformAttributes(element))  # type: ignore
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
TypeError: PullRequest.get_pr_comments.<locals>.get_element() missing 1 required positional argument: 'completed'

Do you know what is going on?

ZedThree · 2025-07-16T14:59:34Z

I thought it might be from an outdated version of clang-tidy-review, but it looks like you just merged in next and I thought it was updated there

dschwoerer and others added 21 commits February 8, 2023 10:05

Switch hermite_spline_xz to index

3583476

Might help with performance

Switch toward regions

4ec74ef

Switch to regions for FCI regions

d096020

Use region_id in interpolation

d2a81bf

Otherwise the regions aren't cached.

Switch hermite_spline_xz to index

ea5640f

Might help with performance

Cleanup

de7d1de

Enable splitting in X using PETSc

8a1c230

Test parallised interpolation if PETSc is found

8234ccf

Fall back to region if not shifted

9525e2c

Split in X only if we have PETSc

b62082c

Add test-interpolate for splitting in X

e147bc5

Cleanup

62d5bbe

Only run in parallel if we split in X

5c32415

Delete object

a4a28c6

release leaks the pointer, reset free's the object.

Create PetscVecs only once

0e28dc1

Be more general about cleaning up before BoutFinialise

66bde04

Run different interpolations in the fci test

adba877

Fix parallel boundary region with x splitting

cbaf894

Add integrated test for FCI X splitting

5673f0c

* helped finding the bug for the boundary * rather slow (around 1 minute) * needs internet connectivity

Apply black changes

9149bf4

dschwoerer changed the title ~~Allow X splitting with FCI~~ [blocked] Allow X splitting with FCI Feb 8, 2023

dschwoerer closed this Feb 8, 2023

Apply clang-format changes

a088700

dschwoerer changed the title ~~[blocked] Allow X splitting with FCI~~ Allow X splitting with FCI Feb 8, 2023

dschwoerer reopened this Feb 8, 2023

dschwoerer marked this pull request as draft February 8, 2023 13:10

dschwoerer added 2 commits February 8, 2023 13:10

Apply clang-format changes

32ea2fd

Apply clang-format changes

faac69c

dschwoerer added 2 commits March 19, 2024 10:03

Merge branch 'origin/next' into fci-splitting

d46efba

Merge branch 'par-bc-improve' into fci-splitting

b7786ff

github-actions Bot reviewed Apr 29, 2024

View reviewed changes

dschwoerer added 2 commits April 29, 2024 10:45

Fix bad merge

e5157ad

Merge branch 'next' into fci-splitting

2a9172e

ZedThree added a commit that referenced this pull request May 24, 2024

Add PetscXZHermiteSpline that can be split in x direction

b9cbb52

Based on @dschwoerer's implementation in #2651

ZedThree mentioned this pull request May 24, 2024

PETSc XZHermiteSpline #2917

Open

dschwoerer added 3 commits May 30, 2024 15:18

Update docs

25667e4

Update test

1c31c29

Merge branch 'next' into fci-splitting

2e872b4

dschwoerer mentioned this pull request Mar 3, 2025

Changes for FCI with hermes-3 #3079

Closed

Merge branch 'next' of github.com:boutproject/BOUT-dev into fci-split…

66b6092

…ting

bendudson approved these changes Oct 12, 2025

View reviewed changes

bendudson merged commit 0400b72 into next Oct 12, 2025
30 of 31 checks passed

bendudson deleted the fci-splitting branch October 12, 2025 20:35

boutproject deleted a comment from github-actions Bot Oct 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow X splitting with FCI#2651

Allow X splitting with FCI#2651
bendudson merged 49 commits into
nextfrom
fci-splitting

dschwoerer commented Feb 8, 2023

Uh oh!

dschwoerer commented Feb 8, 2023

Uh oh!

github-actions Bot left a comment

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

github-actions Bot Apr 29, 2024

Uh oh!

dschwoerer commented Jul 16, 2025

Uh oh!

ZedThree commented Jul 16, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		@@ -59,67 +59,50 @@ Field3D XZMonotonicHermiteSpline::interpolate(const Field3D& f,

		const auto curregion{getRegion(region)};

Conversation

dschwoerer commented Feb 8, 2023

Uh oh!

dschwoerer commented Feb 8, 2023

Uh oh!

github-actions Bot left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 29, 2024

Choose a reason for hiding this comment

Uh oh!

dschwoerer commented Jul 16, 2025

Uh oh!

ZedThree commented Jul 16, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants