Added all changes from struphy-with-cupy - #93
Merged
Conversation
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
# Conflicts: # src/struphy/feec/basis_projection_ops.py # src/struphy/feec/psydac_derham.py # src/struphy/feec/tests/test_l2_projectors.py # src/struphy/feec/tests/test_local_projectors.py # src/struphy/fields_background/tests/test_mhd_equils.py # src/struphy/geometry/base.py # src/struphy/main.py # src/struphy/models/base.py # src/struphy/models/fluid.py # src/struphy/models/toy.py # src/struphy/post_processing/likwid/plot_time_traces.py # src/struphy/propagators/propagators_markers.py Co-authored-by: max-models <181350288+max-models@users.noreply.github.com>
Contributor
Resolved all merge conflicts in commit 8b66de1. Here's a summary of what was resolved:
|
Member
Author
|
@copilot resolve the merge conflicts in this pull request |
…stricter than numpy, sign requires an actual array!
max-models
marked this pull request as ready for review
August 7, 2026 10:03
Member
Author
spossann
approved these changes
Aug 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Redo of #25
See corresponding PR in feectools here: struphy-hub/feectools#74
Notes:
This MR is still pointing towards
318, but it will be merged into devel once finished (which will be after 318 has already been merged).To run on my PC, I still need to do:
I am then running the Vlasov standard parameters
To do
from numpy import xyz, this makes sense in pyccelized kernels since we will not be allowed to use cupy there. But in my current testing, but otherwise not.