forked from BLAST-ImpactX/impactx
-
Notifications
You must be signed in to change notification settings - Fork 0
Development into branch quad_spin_push #3
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
Open
cemitch99
wants to merge
30
commits into
cemitch99:add_quad_spin_push
Choose a base branch
from
BLAST-ImpactX:Resolve-conflicts-InitDistribution
base: add_quad_spin_push
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Development into branch quad_spin_push #3
cemitch99
wants to merge
30
commits into
cemitch99:add_quad_spin_push
from
BLAST-ImpactX:Resolve-conflicts-InitDistribution
Conversation
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
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.4 → v0.14.5](astral-sh/ruff-pre-commit@v0.14.4...v0.14.5) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Correct ref check and calculate bending angle for Sbend in plot_survey() Fix conditional check for 'ref' and add calculation for bending angle. Use ref when it's not None and calculate the exact bending angle for Sbend through the ratio of segment length and bending radius. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Transformations: Single Precision Improve stability with single precision for s-to-t / t-to-s transform. * Tests: Relax Tolerance for SP * More Cleanup * KISS: Only the tol needed update
* Pytest: SP Tolerances * Update tests/python/test_impactx.py
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v5...v6) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.5 → v0.14.6](astral-sh/ruff-pre-commit@v0.14.5...v0.14.6) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* start of PolygonAperture implementation * PolygonAperture logic added and builds now. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update src/elements/PolygonAperture.H initializer for member object m_id Co-authored-by: Axel Huebl <[email protected]> * Added input file parsing logic. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update src/elements/PolygonAperture.H * sense of test was incorrect * input file example * examples of aperture with offsets and rotations * Rearrange storage of vertices data and min_radius2 so that it should work on CPU and GPU and eliminate out-of-order initialization warnings. * script to plot the action of the aperture * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * tweaks to plot layout * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * New analysis script that checks tests the results of the aperture, small changes to other scripts. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * python bindings for polygon aperture * python example file for the polygon aperture * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * additional scripts demonstrating absorb, rotate, offset options * add new polygon aperture tests to test suite * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix python stanza * another fix python stanza * cleanup comments * Fix type for binding of PolygonAperture class data member definitions. * Added the element to the examples documentation. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added Python and Input-file documentation * spelling correction * Update examples/polygon_aperture/README.rst Co-authored-by: Axel Huebl <[email protected]> * Update src/elements/PolygonAperture.H Don't do simd here yet to avoid type error. Later, we'll redo this with an array of the proper bool type. Co-authored-by: Axel Huebl <[email protected]> * Update examples/polygon_aperture/README.rst ax3l: just a warning we can fix Co-authored-by: Axel Huebl <[email protected]> * Update docs/source/usage/parameters.rst Co-authored-by: Axel Huebl <[email protected]> * add comments describing the particle-in-polygon algorithm * Update src/elements/PolygonAperture.H ax3l: I need to clarify that ABLASTR goes before AMReX includes, because it depends on the latter. Co-authored-by: Axel Huebl <[email protected]> * Update src/elements/PolygonAperture.H from ax3l Co-authored-by: Axel Huebl <[email protected]> * update documentation to include additional examples * add test that first and last vertices are equal * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Clarify that the first and last vertices must be identical. * Add additional example scripts to testing list * fix indent and close unterminated literal string to squash sphinx warnings * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Check in example plot file and point to it in the documentation. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Axel Huebl <[email protected]> Co-authored-by: Chad Mitchell <[email protected]>
Fix the `getNode` and `runNode` alias in our profile to support multiple GPUs well.
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.6 → v0.14.7](astral-sh/ruff-pre-commit@v0.14.6...v0.14.7) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
The code that the snippet end to referred to in the docs had changed. This updates it and fixes the include to be shown again / fixes the sphinx warning.
The README included the wrong file, so the analysis script was not shown.
The instructions on how to build our docs were not using our proper dependency files. This fixes it. Fix #1223
Use Python's own warning system for deprecated APIs. This integrates better in workflows with Jupyter and can be explicitly be filtered for.
Add a note on MPI-parallel init with `pc.add_n_particles`.
Add an option `active_once` to the `Source` element. This controls if the source should only inject particles when tracking through lattice period 0. This is useful when defining rings or periodic channels with a source that shall only inject particles once. Breaking change: `active_once = True` is also the new default, since it is the most common use case.
* Update dipedge documentation. * Add defaults in parameters.rst.
* place function for lattice parser in own file will need it's own file to handle all the capabilities * break parse_lattice_elements into smaller helper functions * refactor: parse_cleaned_lattice make more readable and clearly layout its purpose * add: collect_lattice_operations * add: inline_element_variables will need to handle variable references * add: flatten_variable_definition not yet completed * rebase for updating parse_cleaned_lattice * update: parse_lattice_elements to utilize helper functions * update naming: flatten variable list def * add test: run/fodo.py * add test: cyclotron * add test: dogleg * change if/else block to 'match' does not affect performance, simpler to read * change static class to instance-based for 'self. calls * fix indentation for match * fix: parsing blocking_factor we just need the numerical number and not the brackets * update debug print statement for flatten * improve: flatten_variable_list_definitions * update collect_lattice_operations do a greedy search of the parenthesis to stop at the last ')' in the line. We need this because sim.extend() can have a element.(..) stored inside, and stopped at the first ')' is premature * rename flatton function name * add tests: expanding_fft_lattice * update function name replace_variables_to_elements -> replace_variables * add .reverse() functionality/chicane test * add tests: apochromatic & expanding_fft - lattice builds * add docstring to class * update typends * add: caching for saving recursive time * separately find used lattice variables * update: docstrings/comments * store file_content in lattice class' initialization * add docstring * cache content hash * fix parser - distribution funciton * delete wrongly added file from rebase * revise naming for lattice vars/class/functions * simplify update how lattice element counts are stored add lattice stats test expand on testdata/examples cleanup/fix make imports relative fix add tests simplify simplify parse_list_inputs more comments/docstring simplify more cleanup tests: only keep 1-2 hardcoded tests to validate python parser * support .revsese() found the culprit - the built in .reverse() that was being used emitted a reversed copy into the lattice instead of mutating the variable itself, and caused an extra set of elements to appear. we needed the reversed copy to be the only thing pushed to the elements, not the reversed copy AND the non-reversed * fix/cleanup modify test_python_import's lattice section testing test for correct population of element names and a single element parameter's value I believe this is sufficient enough for testing how the lattice populates when importing from a file fix test_lattice_stats and cleanup fix examples show examples cleanup [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci improvements * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * relocate get_impactx_dir function * duplicate get_impactx_root_dir in tests utils this funciton is needed by both the source code and the testing files. unsure where a good single location for the function would be without any import issues. * remove duplicate method both methods accomplish same directory * remove duplicate calling in tests * Remove Print
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.7 → v0.14.8](astral-sh/ruff-pre-commit@v0.14.7...v0.14.8) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* scale canvas aspect ratio, not data aspect ratio * matplotlib v3.3+ Co-authored-by: Samuel Kronenberg <[email protected]> Co-authored-by: Axel Huebl <[email protected]>
* ConstF can now handle kx<0 and ky<0 * Make comment about conventions and units more precise * Signing my name on the source code files for the two elements I modified, as suggested by Axel Huebel in #1030 (comment) * Remove no-longer-applying comment, as discussed in #1041 (comment) * Fix what was effectively a syntax error in the REST file for the active_plasma_lens examples * Cosmetic improvements * Fix indentation * FLUSH prints from python so that they arrive in order with output generated from C++ * fix small error * Remove not-needed copying of .py library files for APL tests * Increase rtol a bit so the APL_ChrPlasmaLens tests pass reliably; while they were passing when running through CTest they were (barely) failing when ran directly. Different seeding maybe? * Add tracking tests for ConstF and rename ChrPlasmaLens tests, 10x more particles, small bugfixes related to ConstF * Much improved analytical estimates * Starting to add envelope testing for APL/ConstF * Fix reference final emittance in tracking/defocusing APL test (reference is that it is conserved) * Add APL tests for envelope, some small re-organization. * Much improved documentation for examples/active_plasma_lens * Slight documentation fixes * Try to add image to README.rst, fix a few mispellings in the plotting scripts * Added figures to all test cases * Fix typo
* ABLASTR: 25.12 Constants Update to constant names & types. * Release: 25.12 * pyAMReX: Update Iterators Helper types are now CamelCase.
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 6. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@v5...v6) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '6' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v4...v5) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
updates: - [github.com/astral-sh/ruff-pre-commit: v0.14.8 → v0.14.9](astral-sh/ruff-pre-commit@v0.14.8...v0.14.9) Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Add spin to particle container. * Add spin sampling algorithm. * Add citations for documentation * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update citations * Spin Distribution Call * Add conditional form of call to AddNParticles. * Add input for a simple distribution test. * [Dependencies] pyAMReX: ax3l branch Update after 25.12 releases to development branch, once PR is merged AMReX-Codes/pyamrex#518 * Fix use of optional arguments in AddNParticles call. * Formatting Just some readability, already fixed in prior commit * [Dependencies] AMReX: development branch Update after 25.12 releases to development branch, once PR is merged AMReX-Codes/pyamrex#518 * Add P to kappa. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add analysis and README for distribution test. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Add app/C++ documentation of distribution. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Test: Update DataFrame Comparison * Fix Init (No-Spin Case) * rst titles * Remove todo comment * Improve `SpinvMF` * NVCC: Work-Around Lambda Same work-around for NVCC as for phase space init. * pyAMReX: `development` * Python Test * `Source` Element: Support Spin in Restart --------- Co-authored-by: Axel Huebl <[email protected]>
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.
No description provided.