WIP: XZ interpolation using PETSc #2858
Conversation
Reduce duplication by moving some overloads to the base class.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| @@ -208,6 +209,10 @@ | |||
|
|
|||
| Field3D t_x, t_z; | |||
|
|
|||
| BoutReal lagrange_4pt(BoutReal v2m, BoutReal vm, BoutReal vp, BoutReal v2p, | |||
| BoutReal offset) const; | |||
| BoutReal lagrange_4pt(const BoutReal v[], BoutReal offset) const; | |||
There was a problem hiding this comment.
warning: do not declare C-style arrays, use std::array<> instead [cppcoreguidelines-avoid-c-arrays]
BoutReal lagrange_4pt(const BoutReal v[], BoutReal offset) const;
^Optimised build was omitting XZInterpolation factory registrations.
| XZInterpolationFactory::RegisterUnavailableInFactory; | ||
|
|
||
| namespace { | ||
| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; |
There was a problem hiding this comment.
warning: variable 'registerinterphermitespline' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]
RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"};
^| XZInterpolationFactory::RegisterUnavailableInFactory; | ||
|
|
||
| namespace { | ||
| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; |
There was a problem hiding this comment.
warning: variable 'registerinterphermitespline' defined in a header file; variable definitions in header files can lead to ODR violations [misc-definitions-in-headers]
RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"};
^|
|
||
| namespace { | ||
| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; | ||
| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ |
There was a problem hiding this comment.
warning: variable 'registerinterpmonotonichermitespline' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]
RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{
^|
|
||
| namespace { | ||
| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; | ||
| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ |
There was a problem hiding this comment.
warning: variable 'registerinterpmonotonichermitespline' defined in a header file; variable definitions in header files can lead to ODR violations [misc-definitions-in-headers]
RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{
^| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; | ||
| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ | ||
| "monotonichermitespline"}; | ||
| RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"}; |
There was a problem hiding this comment.
warning: variable 'registerinterplagrange4pt' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]
RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"};
^| RegisterXZInterpolation<XZHermiteSpline> registerinterphermitespline{"hermitespline"}; | ||
| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ | ||
| "monotonichermitespline"}; | ||
| RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"}; |
There was a problem hiding this comment.
warning: variable 'registerinterplagrange4pt' defined in a header file; variable definitions in header files can lead to ODR violations [misc-definitions-in-headers]
RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"};
^| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ | ||
| "monotonichermitespline"}; | ||
| RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"}; | ||
| RegisterXZInterpolation<XZBilinear> registerinterpbilinear{"bilinear"}; |
There was a problem hiding this comment.
warning: variable 'registerinterpbilinear' is non-const and globally accessible, consider making it const [cppcoreguidelines-avoid-non-const-global-variables]
RegisterXZInterpolation<XZBilinear> registerinterpbilinear{"bilinear"};
^| RegisterXZInterpolation<XZMonotonicHermiteSpline> registerinterpmonotonichermitespline{ | ||
| "monotonichermitespline"}; | ||
| RegisterXZInterpolation<XZLagrange4pt> registerinterplagrange4pt{"lagrange4pt"}; | ||
| RegisterXZInterpolation<XZBilinear> registerinterpbilinear{"bilinear"}; |
There was a problem hiding this comment.
warning: variable 'registerinterpbilinear' defined in a header file; variable definitions in header files can lead to ODR violations [misc-definitions-in-headers]
RegisterXZInterpolation<XZBilinear> registerinterpbilinear{"bilinear"};
^
|
Hi Ben, The FCI MMS tests are passing, thus I am not sure the issue I am seeing in hermes-2 with X-splitting is actually related to the PETSc part, or some other part of the code that has hard-coded the assumption that there is no splitting in X. |
|
Hi @dschwoerer ! Thanks yes; I'm going through your PR in steps so I can (a) understand it myself; (b) implement the PETSc method as a separate implementation of XZInterpolate. As I'm going through it I'm trying to work out where the no-X-splitting assumptions are being made. |
| // Cast to base pointer so virtual function overload is resolved | ||
| return static_cast<XZInterpolation*>(&interpolateMethod) | ||
| ->interpolate(f, delta_x, delta_z); |
There was a problem hiding this comment.
This shouldn't be needed -- the issue is probably because we now need a using XZInterpolation::interpolate in the derived classes to bring in the missing overloads of the virtual function.
Work in progress
Intend to adapt D.Bold's PETSc interpolation for yup/ydown, for merging into next.