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

Jump to bottom

Add ZInterpolation, ZHermiteSpline #1944

Merged
merged 9 commits into from
Mar 9, 2020
Merged

Add ZInterpolation, ZHermiteSpline #1944

merged 9 commits into from
Mar 9, 2020

Conversation

ZedThree
Copy link
Member

@ZedThree ZedThree commented Mar 4, 2020

For interpolation in Z only

Cherry-picked, rebased, squashed and formatted from #1897 but into next

@johnomotani @ZedThree
Add ZInterpolation, ZHermiteSpline
420c8e2 
Cherry-picked and rebased

Previous commit message:
Create new class ZInterpolation, to be used by ShiftedMetricInterp

Previous HermiteSplineOnlyZ interpolation class is renamed to
ZHermiteSpline and is now an implementation of ZInterpolation.
@ZedThree ZedThree added this to the BOUT-5.0 milestone Mar 4, 2020
@ZedThree ZedThree mentioned this pull request Mar 4, 2020
Merged
@ZedThree
Add missing header to 4to5 header list
d470fb4
@ZedThree
Add missing override to weights method
edc74d8
@ZedThree
Make ZInterpolation::getWeightsForYUpApproximation const
92e49a0
@ZedThree
Simplify ZInterpolation::getWeightsForYUpApproximation
c83c651 
Construct and return vector immediately
@ZedThree
Add BoutMask ctor that takes Mesh*, fall back to global mesh
1f90262 
Also make both ctors explicit

This is needed to make the ZInterpolation ctors cleaner
@ZedThree
Use new BoutMask ctor in ZInterpolation ctors
e70c2c2 
This avoids assigning to skip_mask in ctor body (prefer init list)

Also make ctors explicit (cleaner for single argument ctors)
@ZedThree
Make ZHermiteSpline local variables const where possible
152cebf
@ZedThree
Copy link
Member Author

ZedThree commented Mar 5, 2020

I've made some minor changes:

  • make more things const
  • add a constructor for BoutMask that takes Mesh* in order to make the ZInterpolation/ZHermiteSpline constructors a bit cleaner
  • explicit on new constructors
  • simplified the getWeights method by using aggregate construction of the vector<PositionAndWeights>

@ZedThree ZedThree mentioned this pull request Mar 5, 2020
Merged
@ZedThree ZedThree merged commit 8fa37a5 into next Mar 9, 2020
@ZedThree ZedThree deleted the hermitespline-only-z branch March 9, 2020 10:42
@johnomotani johnomotani mentioned this pull request Mar 11, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnomotani johnomotani johnomotani approved these changes

Assignees
No one assigned
Labels
feature
Projects
None yet
Milestone
BOUT-5.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@ZedThree @johnomotani