Allow X splitting with FCI #2651

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

There were too many comments to post at once. Showing the first 25 out of 51. Check the log or trigger a new build to see more.

github-actions · 2024-02-07T13:29:03Z

include/bout/interpolation_xz.hxx

-    this->region_name = "";
-    this->region = std::make_shared<Region<Ind3D>>(region);
+    std::string name;
+    int i = 0;


warning: variable name 'i' is too short, expected at least 3 characters [readability-identifier-length]

int i = 0; ^

github-actions · 2024-02-07T13:29:03Z

include/bout/interpolation_xz.hxx

-    this->region = std::make_shared<Region<Ind3D>>(region);
+    std::string name;
+    int i = 0;
+    do {


warning: avoid do-while loops [cppcoreguidelines-avoid-do-while]

do { ^

github-actions · 2024-02-07T13:29:03Z

include/bout/interpolation_xz.hxx

+      name = fmt::format("unsec_reg_xz_interp_{:d}", i++);
+    } while (localmesh->hasRegion3D(name));
+    localmesh->addRegion(name, region);
+    this->region_id = localmesh->getRegionID(name);


warning: narrowing conversion from 'size_t' (aka 'unsigned long') to signed type 'int' is implementation-defined [bugprone-narrowing-conversions]

this->region_id = localmesh->getRegionID(name); ^

github-actions · 2024-02-07T13:29:03Z

include/bout/interpolation_xz.hxx

      return localmesh->getRegion(region);
    }
-    ASSERT1(has_region);
-    return getRegion();
+    if (region == "" or region == "RGN_ALL") {


warning: the 'empty' method should be used to check for emptiness instead of comparing to an empty object [readability-container-size-empty]

Suggested change

if (region == "" or region == "RGN_ALL") {

if (region.empty() or region == "RGN_ALL") {

Additional context

/usr/include/c++/12/bits/basic_string.h:1190: method 'basic_string'::empty() defined here

empty() const _GLIBCXX_NOEXCEPT ^

github-actions · 2024-02-07T13:29:03Z

include/bout/interpolation_xz.hxx

@@ -134,8 +138,8 @@ protected:
  /// This is protected rather than private so that it can be
  /// extended and used by HermiteSplineMonotonic

-  Tensor<int> i_corner; // x-index of bottom-left grid point
-  Tensor<int> k_corner; // z-index of bottom-left grid point
+  Tensor<SpecificInd<IND_TYPE::IND_3D>> i_corner; // index of bottom-left grid point


warning: member variable 'i_corner' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

Tensor<SpecificInd<IND_TYPE::IND_3D>> i_corner; // index of bottom-left grid point ^

github-actions · 2024-02-07T13:29:04Z

src/mesh/interpolation/hermite_spline_xz.cxx

+    newWeights[w].allocate();
+  }
+#ifdef HS_USE_PETSC
+  petsclib = new PetscLib(


warning: assigning newly created 'gsl::owner<>' to non-owner 'PetscLib *' [cppcoreguidelines-owning-memory]

petsclib = new PetscLib( ^

github-actions · 2024-02-07T13:29:04Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  // PetscInt N, 			      PetscInt d_nz, const PetscInt d_nnz[],
+  // PetscInt o_nz, const PetscInt o_nnz[], Mat *A)
+  //  MatSetSizes(Mat A,PetscInt m,PetscInt n,PetscInt M,PetscInt N)
+  const int m = mesh->LocalNx * mesh->LocalNy * mesh->LocalNz;


warning: variable name 'm' is too short, expected at least 3 characters [readability-identifier-length]

const int m = mesh->LocalNx * mesh->LocalNy * mesh->LocalNz; ^

github-actions · 2024-02-07T13:29:04Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  // PetscInt o_nz, const PetscInt o_nnz[], Mat *A)
+  //  MatSetSizes(Mat A,PetscInt m,PetscInt n,PetscInt M,PetscInt N)
+  const int m = mesh->LocalNx * mesh->LocalNy * mesh->LocalNz;
+  const int M = m * mesh->getNXPE() * mesh->getNYPE();


warning: variable name 'M' is too short, expected at least 3 characters [readability-identifier-length]

const int M = m * mesh->getNXPE() * mesh->getNYPE(); ^

github-actions · 2024-02-07T13:29:04Z

src/mesh/interpolation/hermite_spline_xz.cxx


-    h11_x(x, y, z) = (t_x * t_x * t_x) - (t_x * t_x);
-    h11_z(x, y, z) = (t_z * t_z * t_z) - (t_z * t_z);
+    for (int w = 0; w < 16; ++w) {


warning: loop variable name 'w' is too short, expected at least 2 characters [readability-identifier-length]

for (int w = 0; w < 16; ++w) { ^

github-actions · 2024-02-07T13:29:04Z

src/mesh/interpolation/hermite_spline_xz.cxx

+    newWeights[7][i] -= h11_x[i] * h11_z[i] / 4;
+    newWeights[5][i] += h11_x[i] * h11_z[i] / 4;
+#ifdef HS_USE_PETSC
+    PetscInt idxn[1] = {conv.fromLocalToGlobal(x, y + y_offset, z)};


warning: do not declare C-style arrays, use std::array<> instead [cppcoreguidelines-avoid-c-arrays]

PetscInt idxn[1] = {conv.fromLocalToGlobal(x, y + y_offset, z)}; ^

dschwoerer · 2024-02-07T13:49:45Z

This PR requires par-bc-cleanup #2629

It uses also the updated boundary condition name (parallel_neumann_o2 instead of parallel_neumann) which I think is introduced in #2649 but that would be easy to revert.

bendudson · 2024-02-08T00:20:56Z

tests/integrated/test-boutpp/slicing/basics.indexing.txt

Why is this file needed? It looks like NumPy documentation. Also the html version.

bendudson · 2024-02-08T00:28:01Z

Thanks @dschwoerer ! The testing is nice. A couple of questions:

Would you mind if I split the hermitespline XZ interpolation into two implementations? It would help keep the PETSc implementation cleaner if it didn't have #ifdefs throughout. I started this in WIP: XZ interpolation using PETSc #2858. Would you mind if I made a PR into this branch?
Do I interpret this right that the PETSc global index includes the communication guard cells (i.e. two global indices correspond to conceptually the same cell, but on different processors)? I think this is ok, and am just trying to work out what sensible ways there are to define a global cell index.

dschwoerer · 2024-02-13T13:26:04Z

1. Would you mind if I split the `hermitespline` XZ interpolation into two implementations? It would help keep the PETSc implementation cleaner if it didn't have #ifdefs throughout. I started this in [WIP: XZ interpolation using PETSc #2858](https://github.com/boutproject/BOUT-dev/pull/2858). Would you mind if I made a PR into this branch?

Not at all!
I thought it would not be needed, but if you can use it, sure 👍

2. Do I interpret this right that the PETSc global index includes the communication guard cells (i.e. two global indices correspond to conceptually the same cell, but on different processors)? I think this is ok, and am just trying to work out what sensible ways there are to define a global cell index.

Yes, that is the case. The motivation is that a PETScVector can use directly a Field3D, and I do not have to shuffle the data around. I am not sure about the performance implication, but I think it also avoids some copying. At least it made it easier for me to think about the PETSc Vector, if it has the same memory layout then the Field3D.

github-actions

clang-tidy made some suggestions

There were too many comments to post at once. Showing the first 25 out of 41. Check the log or trigger a new build to see more.

github-actions · 2024-02-13T13:41:50Z

include/bout/parallel_boundary_op.hxx

-
+  virtual BoundaryOpPar* clone(BoundaryRegionPar* region,
+                               const std::list<std::string>& args) = 0;
+  virtual BoundaryOpPar* clone(BoundaryRegionPar* region, Field3D* f) = 0;


warning: parameter name 'f' is too short, expected at least 3 characters [readability-identifier-length]

virtual BoundaryOpPar* clone(BoundaryRegionPar* region, Field3D* f) = 0; ^

github-actions · 2024-02-13T13:41:50Z

include/bout/parallel_boundary_op.hxx

  BoundaryRegionPar* bndry{nullptr};

 protected:
  /// Possible ways to get boundary values
  std::shared_ptr<FieldGenerator> gen_values;
-  Field3D* field_values;
+  Field3D* field_values{nullptr};


warning: member variable 'field_values' has protected visibility [cppcoreguidelines-non-private-member-variables-in-classes]

Field3D* field_values{nullptr}; ^

github-actions · 2024-02-13T13:41:50Z

include/bout/parallel_boundary_op.hxx

+      }
+    }
+
+    return new T(region);


warning: returning a newly created resource of type 'BoundaryOpPar *' or 'gsl::owner<>' from a function whose return type is not 'gsl::owner<>' [cppcoreguidelines-owning-memory]

return new T(region); ^

github-actions · 2024-02-13T13:41:50Z

include/bout/parallel_boundary_op.hxx

+    return new T(region);
+  }
+
+  BoundaryOpPar* clone(BoundaryRegionPar* region, Field3D* f) override {


warning: parameter name 'f' is too short, expected at least 3 characters [readability-identifier-length]

BoundaryOpPar* clone(BoundaryRegionPar* region, Field3D* f) override { ^

github-actions · 2024-02-13T13:41:50Z

include/bout/parallel_boundary_op.hxx

+  }
+
+  BoundaryOpPar* clone(BoundaryRegionPar* region, Field3D* f) override {
+    return new T(region, f);


warning: returning a newly created resource of type 'BoundaryOpPar *' or 'gsl::owner<>' from a function whose return type is not 'gsl::owner<>' [cppcoreguidelines-owning-memory]

return new T(region, f); ^

github-actions · 2024-02-13T13:41:52Z

src/mesh/parallel_boundary_op.cxx

@@ -38,7 +14,7 @@ BoutReal BoundaryOpPar::getValue(const BoundaryRegionPar& bndry, BoutReal t) {
  switch (value_type) {
  case ValueType::GEN:
    return gen_values->generate(
-        Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));
+        bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));


warning: narrowing conversion from 'BoutReal' (aka 'double') to 'int' [bugprone-narrowing-conversions]

bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t)); ^

github-actions · 2024-02-13T13:41:52Z

src/mesh/parallel_boundary_op.cxx

@@ -38,7 +14,7 @@ BoutReal BoundaryOpPar::getValue(const BoundaryRegionPar& bndry, BoutReal t) {
  switch (value_type) {
  case ValueType::GEN:
    return gen_values->generate(
-        Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));
+        bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));


warning: narrowing conversion from 'BoutReal' (aka 'double') to 'int' [bugprone-narrowing-conversions]

bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t)); ^

github-actions · 2024-02-13T13:41:52Z

src/mesh/parallel_boundary_op.cxx

@@ -38,7 +14,7 @@ BoutReal BoundaryOpPar::getValue(const BoundaryRegionPar& bndry, BoutReal t) {
  switch (value_type) {
  case ValueType::GEN:
    return gen_values->generate(
-        Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));
+        bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t));


warning: narrowing conversion from 'BoutReal' (aka 'double') to 'int' [bugprone-narrowing-conversions]

bout::generator::Context(bndry.s_x, bndry.s_y, bndry.s_z, CELL_CENTRE, mesh, t)); ^

github-actions · 2024-02-13T13:41:52Z

src/mesh/parallel_boundary_op.cxx

@@ -244,7 +139,7 @@ void BoundaryOpPar_neumann::apply(Field3D& f, BoutReal t) {
    int z = bndry->z;

    // Generate the boundary value
-    BoutReal value = getValue(x, y, z, t);
+    BoutReal value = getValue(*bndry, t);


warning: variable 'value' of type 'BoutReal' (aka 'double') can be declared 'const' [misc-const-correctness]

Suggested change

BoutReal value = getValue(*bndry, t);

BoutReal const value = getValue(*bndry, t);

github-actions · 2024-02-13T13:41:52Z

src/sys/generator_context.cxx

@@ -45,5 +45,8 @@ Context::Context(const BoundaryRegion* bndry, int iz, CELL_LOC loc, BoutReal t,
  parameters["t"] = t;
 }

+Context::Context(BoutReal x, BoutReal y, BoutReal z, Mesh* msh, BoutReal t)


warning: parameter name 't' is too short, expected at least 3 characters [readability-identifier-length]

Context::Context(BoutReal x, BoutReal y, BoutReal z, Mesh* msh, BoutReal t) ^

github-actions

clang-tidy made some suggestions

github-actions · 2024-02-13T14:14:07Z

tests/integrated/test-fci-mpi/fci_mpi.cxx

+  {
+    using bout::globals::mesh;
+    Options* options = Options::getRoot();
+    int i = 0;


warning: variable name 'i' is too short, expected at least 3 characters [readability-identifier-length]

int i = 0; ^

github-actions · 2024-02-13T14:14:07Z

tests/integrated/test-fci-mpi/fci_mpi.cxx

+    using bout::globals::mesh;
+    Options* options = Options::getRoot();
+    int i = 0;
+    std::string default_str{"not_set"};


warning: variable 'default_str' of type 'std::string' (aka 'basic_string') can be declared 'const' [misc-const-correctness]

Suggested change

std::string default_str{"not_set"};

std::string const default_str{"not_set"};

github-actions · 2024-02-13T14:14:07Z

tests/integrated/test-fci-mpi/fci_mpi.cxx

+      mesh->communicate(input);
+      input.applyParallelBoundary("parallel_neumann_o2");
+      for (int slice = -mesh->ystart; slice <= mesh->ystart; ++slice) {
+        if (slice) {


warning: implicit conversion 'int' -> bool [readability-implicit-bool-conversion]

Suggested change

if (slice) {

if (slice != 0) {

github-actions · 2024-02-13T14:14:07Z

tests/integrated/test-interpolate/test_interpolate.cxx

-      dx = index.x() - dice();
+  {
+    // Random number generator
+    std::default_random_engine generator;


warning: variable 'generator' of type 'std::default_random_engine' (aka 'linear_congruential_engine<unsigned long, 16807UL, 0UL, 2147483647UL>') can be declared 'const' [misc-const-correctness]

Suggested change

std::default_random_engine generator;

std::default_random_engine const generator;

github-actions · 2024-02-13T14:14:07Z

tests/integrated/test-interpolate/test_interpolate.cxx

+    // Random number generator
+    std::default_random_engine generator;
+    // Uniform distribution of BoutReals from 0 to 1
+    std::uniform_real_distribution<BoutReal> distribution{0.0, 1.0};


warning: variable 'distribution' of type 'std::uniform_real_distribution' (aka 'uniform_real_distribution') can be declared 'const' [misc-const-correctness]

Suggested change

std::uniform_real_distribution<BoutReal> distribution{0.0, 1.0};

std::uniform_real_distribution<BoutReal> const distribution{0.0, 1.0};

github-actions · 2024-02-13T14:14:08Z

tests/integrated/test-interpolate/test_interpolate.cxx

+
+    std::string c_func;
+    auto c_gen = getGeneratorFromOptions("c", c_func);
+    Field3D c = f.create3D(c_func);


warning: variable 'c' of type 'Field3D' can be declared 'const' [misc-const-correctness]

Suggested change

Field3D c = f.create3D(c_func);

Field3D const c = f.create3D(c_func);

github-actions · 2024-02-13T14:14:08Z

tests/integrated/test-interpolate/test_interpolate.cxx

+
+    std::string c_func;
+    auto c_gen = getGeneratorFromOptions("c", c_func);
+    Field3D c = f.create3D(c_func);


warning: variable name 'c' is too short, expected at least 3 characters [readability-identifier-length]

Field3D c = f.create3D(c_func); ^

github-actions · 2024-02-13T14:14:08Z

tests/integrated/test-interpolate/test_interpolate.cxx

+
+    for (const auto& index : deltax) {
+      // Get some random displacements
+      BoutReal dx = index.x() + dice();


warning: variable name 'dx' is too short, expected at least 3 characters [readability-identifier-length]

BoutReal dx = index.x() + dice(); ^

github-actions · 2024-02-13T14:14:08Z

tests/integrated/test-interpolate/test_interpolate.cxx

+    for (const auto& index : deltax) {
+      // Get some random displacements
+      BoutReal dx = index.x() + dice();
+      BoutReal dz = index.z() + dice();


warning: variable 'dz' of type 'BoutReal' (aka 'double') can be declared 'const' [misc-const-correctness]

Suggested change

BoutReal dz = index.z() + dice();

BoutReal const dz = index.z() + dice();

github-actions · 2024-02-13T14:14:08Z

tests/integrated/test-interpolate/test_interpolate.cxx

+    for (const auto& index : deltax) {
+      // Get some random displacements
+      BoutReal dx = index.x() + dice();
+      BoutReal dz = index.z() + dice();


warning: variable name 'dz' is too short, expected at least 3 characters [readability-identifier-length]

BoutReal dz = index.z() + dice(); ^

github-actions

clang-tidy made some suggestions

github-actions · 2024-02-15T21:09:43Z

include/bout/interpolation_xz.hxx

-    region = regionFromMask(mask, localmesh);
+    setRegion(regionFromMask(mask, localmesh));
+  }
+  ~XZHermiteSpline() {


warning: annotate this function with 'override' or (rarely) 'final' [cppcoreguidelines-explicit-virtual-functions]

Suggested change

~XZHermiteSpline() {

~XZHermiteSpline() override {

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  const int nype;
+  const int nzpe{1};
+  const int xstart, ystart, zstart;
+  const int lnx, lny, lnz;


warning: private field 'lnx' is not used [clang-diagnostic-unused-private-field]

const int lnx, lny, lnz; ^

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  const int nype;
+  const int nzpe{1};
+  const int xstart, ystart, zstart;
+  const int lnx, lny, lnz;


warning: private field 'lny' is not used [clang-diagnostic-unused-private-field]

const int lnx, lny, lnz; ^

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  const int nype;
+  const int nzpe{1};
+  const int xstart, ystart, zstart;
+  const int lnx, lny, lnz;


warning: private field 'lnz' is not used [clang-diagnostic-unused-private-field]

const int lnx, lny, lnz; ^

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+                                        k_corner(x, y, z) - 1 + k);
+        vals[k] = newWeights[j * 4 + k][i];
+      }
+      MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES);


warning: do not implicitly decay an array into a pointer; consider using gsl::array_view or an explicit cast instead [cppcoreguidelines-pro-bounds-array-to-pointer-decay]

MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES); ^

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+                                        k_corner(x, y, z) - 1 + k);
+        vals[k] = newWeights[j * 4 + k][i];
+      }
+      MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES);


warning: do not implicitly decay an array into a pointer; consider using gsl::array_view or an explicit cast instead [cppcoreguidelines-pro-bounds-array-to-pointer-decay]

MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES); ^

github-actions · 2024-02-15T21:09:43Z

src/mesh/interpolation/hermite_spline_xz.cxx

+                                        k_corner(x, y, z) - 1 + k);
+        vals[k] = newWeights[j * 4 + k][i];
+      }
+      MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES);


warning: do not implicitly decay an array into a pointer; consider using gsl::array_view or an explicit cast instead [cppcoreguidelines-pro-bounds-array-to-pointer-decay]

MatSetValues(petscWeights, 1, idxn, 4, idxm, vals, INSERT_VALUES); ^

mesh may not be initialised or be a different mesh

github-actions

clang-tidy made some suggestions

github-actions · 2024-02-19T13:23:14Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  // PetscInt N, 			      PetscInt d_nz, const PetscInt d_nnz[],
+  // PetscInt o_nz, const PetscInt o_nnz[], Mat *A)
+  //  MatSetSizes(Mat A,PetscInt m,PetscInt n,PetscInt M,PetscInt N)
+  const int m = localmesh->LocalNx * localmesh->LocalNy * localmesh->LocalNz;


warning: variable name 'm' is too short, expected at least 3 characters [readability-identifier-length]

const int m = localmesh->LocalNx * localmesh->LocalNy * localmesh->LocalNz; ^

github-actions · 2024-02-19T13:23:14Z

src/mesh/interpolation/hermite_spline_xz.cxx

+  // PetscInt o_nz, const PetscInt o_nnz[], Mat *A)
+  //  MatSetSizes(Mat A,PetscInt m,PetscInt n,PetscInt M,PetscInt N)
+  const int m = localmesh->LocalNx * localmesh->LocalNy * localmesh->LocalNz;
+  const int M = m * localmesh->getNXPE() * localmesh->getNYPE();


warning: variable name 'M' is too short, expected at least 3 characters [readability-identifier-length]

const int M = m * localmesh->getNXPE() * localmesh->getNYPE(); ^

github-actions

clang-tidy made some suggestions

github-actions · 2024-02-19T16:37:47Z

tests/integrated/test-interpolate/test_interpolate.cxx

+    // Set up generators and solutions for three different analtyic functions
+    std::string a_func;
+    auto a_gen = getGeneratorFromOptions("a", a_func);
+    const Field3D a = fieldfact.create3D(a_func);


warning: variable name 'a' is too short, expected at least 3 characters [readability-identifier-length]

const Field3D a = fieldfact.create3D(a_func); ^

github-actions · 2024-02-19T16:37:47Z

tests/integrated/test-interpolate/test_interpolate.cxx

+
+    std::string b_func;
+    auto b_gen = getGeneratorFromOptions("b", b_func);
+    const Field3D b = fieldfact.create3D(b_func);


warning: variable name 'b' is too short, expected at least 3 characters [readability-identifier-length]

const Field3D b = fieldfact.create3D(b_func); ^

github-actions · 2024-02-19T16:37:47Z

tests/integrated/test-interpolate/test_interpolate.cxx

+
+    std::string c_func;
+    auto c_gen = getGeneratorFromOptions("c", c_func);
+    const Field3D c = fieldfact.create3D(c_func);


warning: variable name 'c' is too short, expected at least 3 characters [readability-identifier-length]

const Field3D c = fieldfact.create3D(c_func); ^

github-actions

clang-tidy made some suggestions

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

include/bout/interpolation_xz.hxx

 public:
  XZHermiteSpline(Mesh* mesh = nullptr) : XZHermiteSpline(0, mesh) {}
  XZHermiteSpline(int y_offset = 0, Mesh* mesh = nullptr);
  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

include/bout/interpolation_xz.hxx

@@ -213,7 +249,7 @@
  XZLagrange4pt(int y_offset = 0, Mesh* mesh = nullptr);
  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

include/bout/interpolation_xz.hxx

@@ -246,7 +282,7 @@
  XZBilinear(int y_offset = 0, Mesh* mesh = nullptr);
  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

include/bout/utils.hxx

+    // ASSERT2(i.ny == n2);
+    ASSERT2(0 <= i.ind && i.ind < n1 * n2 * n3);
+    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

src/mesh/interpolation/hermite_spline_xz.cxx

+#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

src/mesh/interpolation/monotonic_hermite_spline_xz.cxx

@@ -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

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

github-actions bot reviewed Feb 7, 2024

View reviewed changes

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

eba722b

bendudson reviewed Feb 8, 2024

View reviewed changes

Remove accidentially added files

30ea7e3

github-actions bot reviewed Feb 13, 2024

View reviewed changes

Merge remote-tracking branch 'origin/next' into fci-splitting

66ff716

github-actions bot reviewed Feb 13, 2024

View reviewed changes

dschwoerer added 2 commits February 15, 2024 22:04

Use parallel_neumann as BC

10d320f

fix usage of f-string

4b05708

github-actions bot reviewed Feb 15, 2024

View reviewed changes

Use localmesh

60224e4

mesh may not be initialised or be a different mesh

github-actions bot reviewed Feb 19, 2024

View reviewed changes

dschwoerer added 3 commits February 19, 2024 14:52

add PETSc requirement for MPI test

608bb5d

Update header location

88741c5

More const correctness

09f609b

github-actions bot reviewed Feb 19, 2024

View reviewed changes

dschwoerer added the FCI label Mar 19, 2024

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

	if (region == "" or region == "RGN_ALL") {
	if (region.empty() or region == "RGN_ALL") {

	BoutReal value = getValue(*bndry, t);
	BoutReal const value = getValue(*bndry, t);

	std::string default_str{"not_set"};
	std::string const default_str{"not_set"};

	std::default_random_engine generator;
	std::default_random_engine const generator;

	std::uniform_real_distribution<BoutReal> distribution{0.0, 1.0};
	std::uniform_real_distribution<BoutReal> const distribution{0.0, 1.0};

	Field3D c = f.create3D(c_func);
	Field3D const c = f.create3D(c_func);

	BoutReal dz = index.z() + dice();
	BoutReal const dz = index.z() + dice();

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

		const auto curregion{getRegion(region)};

Allow X splitting with FCI #2651

Are you sure you want to change the base?

Allow X splitting with FCI #2651

Conversation

dschwoerer commented Feb 8, 2023

dschwoerer commented Feb 8, 2023

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

github-actions bot Feb 7, 2024

Choose a reason for hiding this comment

dschwoerer commented Feb 7, 2024

bendudson Feb 8, 2024

Choose a reason for hiding this comment

bendudson commented Feb 8, 2024

dschwoerer commented Feb 13, 2024

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot Feb 13, 2024

Choose a reason for hiding this comment

github-actions bot left a comment

Choose a reason for hiding this comment

github-actions bot Feb 15, 2024