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.

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

SPLIME #22

Merged
merged 26 commits into from
Jan 24, 2024
Merged

SPLIME #22

merged 26 commits into from
Jan 24, 2024

Conversation

krystophny
Copy link
Member

@krystophny krystophny commented Jan 19, 2024

Depends on: #17 (not logically, but let's merge #17 first)

Introduces generic tensor-product-spline routines based on existing code. Semantics are taken from scipy.interpolate.

@krystophny krystophny added the enhancement New feature or request label Jan 19, 2024
@krystophny krystophny marked this pull request as ready for review January 19, 2024 14:11
@krystophny krystophny requested a review from pazathoth January 19, 2024 14:11
@krystophny
Copy link
Member Author

@pazathoth now that one is also finished.

Refactor: Clean up CMake for faster builds (don't check for HDF5 three times) and readability
Feature: Add generic 1D and 2D spline driver routines and tests

Copy link
Member

@pazathoth pazathoth left a comment

Choose a reason for hiding this comment

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

Note that I didn't repeat possibilities for improvement when they are anyway nearby, e.g. they apply analogously to 1D and 2D splines.

src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Show resolved Hide resolved
src/util.f90 Show resolved Hide resolved
tests/source/test_interpolate.f90 Outdated Show resolved Hide resolved
tests/source/test_interpolate.f90 Outdated Show resolved Hide resolved
tests/source/test_interpolate.f90 Outdated Show resolved Hide resolved
@krystophny
Copy link
Member Author

@pazathoth that should be fine now. Please do a quick check and then we merge. I merged #17 already, since the code changes there appeared also here (branch based on the other one) and there were no comments.

src/interpolate.f90 Outdated Show resolved Hide resolved
src/interpolate.f90 Outdated Show resolved Hide resolved
src/util.f90 Outdated Show resolved Hide resolved
tests/source/test_util.f90 Outdated Show resolved Hide resolved
@krystophny
Copy link
Member Author

krystophny commented Jan 23, 2024

@pazathoth I added the last changes. I still ask for your formal acknowledgement in the code review to check the messages.

In the future, if we just have minor revisions at the end, let's handle it like in a journal paper and the PR owner can just merge after minor last fixes, OK?

Regarding rebase and merge, let's try the rebase strategy for now, since PRs should always be small (< 1 week work) and independent, so the danger of conflicts is low. Is that fine for you too?

See https://github.blog/changelog/2022-02-03-more-ways-to-keep-your-pull-request-branch-up-to-date/ for browser-based rebase. Use Pull-Down menu in the big green "Update" box and select "Rebase".

@pazathoth
Copy link
Member

@pazathoth I added the last changes. I still ask for your formal acknowledgement in the code review to check the messages.

In the future, if we just have minor revisions at the end, let's handle it like in a journal paper and the PR owner can just merge after minor last fixes, OK?

Regarding rebase and merge, let's try the rebase strategy for now, since PRs should always be small (< 1 week work) and independent, so the danger of conflicts is low. Is that fine for you too?

See https://github.blog/changelog/2022-02-03-more-ways-to-keep-your-pull-request-branch-up-to-date/ for browser-based rebase. Use Pull-Down menu in the big green "Update" box and select "Rebase".

Yes, that's alright with me. Then I will repeat comments at every occurrence, e.g. with replacement of real(8), so that nothing is missed. The rebase I will try with Jonatan on #18.

@krystophny
Copy link
Member Author

Thank you, I merge then!

@krystophny krystophny merged commit cae2816 into main Jan 24, 2024
2 checks passed
@krystophny krystophny deleted the splime branch January 24, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants