-
Notifications
You must be signed in to change notification settings - Fork 50
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
Feature/imas coupling #938
Draft
mikesndrs
wants to merge
60
commits into
google-deepmind:main
Choose a base branch
from
mikesndrs:feature/IMAS_coupling
base: main
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.
Draft
Conversation
This file contains 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
A useful thing to know about the persistent cache is that the hash of an object to be included in the key only needs to be constant across a given run and not between runs as helpfully explained in google-deepmind#276. Also update an outdated comment that says otherwise. PiperOrigin-RevId: 698339770
PiperOrigin-RevId: 698403411
PiperOrigin-RevId: 698756638
PiperOrigin-RevId: 698796273
PiperOrigin-RevId: 699992434
PiperOrigin-RevId: 699997644
Better reflects the intended use and interpretation of these outputs, i.e. the power exiting the confined plasma to the scrape-off-layer. Also use new math_utils.cell_integration for all integrated powers. Regenerate test cases for new post-processed values and names (simulation results themselves remain the same). PiperOrigin-RevId: 700000709
…umbing through to where it is used in calc_coeffs and transport models. The rest of this change is a whole lot of plumbing and updating interfaces. TODO in follow up changes: - rename pedestal_model/basic.py to something more meaningful - only conditionally compute the pedestal model depending on `set_pedestal` as it could be wasteful to compute this in future if we have more expensive pedestal models. This change also doesn't introduce configuration for choosing between different pedestal models (of which there is only one atm). Propose doing that in a separate change too. PiperOrigin-RevId: 700028014
PiperOrigin-RevId: 700031800
Also add docs for configuration for the existing pedestal model and its configuration. PiperOrigin-RevId: 700048032
PiperOrigin-RevId: 700063003
The most recent release of xarray contains fixes to file persistence https://github.com/pydata/xarray/releases/tag/v2024.11.0 PiperOrigin-RevId: 700070903
PiperOrigin-RevId: 700257299
Regenerate tests to include new post-processed output PiperOrigin-RevId: 700278439
PiperOrigin-RevId: 700394263
PiperOrigin-RevId: 700466574
to torax_imastools dir + add pyproject optional dependency * add decorator that throws import error if needed module is not installed * fix unavailable type hints * rename test func to actual func name --------- Co-authored-by: Sanders Mike EXT <[email protected]>
* add loading function for local hdf5 equilibrium * Adding example IDS equilibrium based on EQDSK Equilibrium generated with CHEASE from EQDSK_ITERhybrid_COCOS02 Same equilibrium available in different formats and different DD versions - IMAS netcdf files in DDv3 and 4 - IMAS hdf5 files in DDv4 * Potential fix for automated test * Modification of mapping to work with DDv4 Adaptation to match the change of COCOS between DDv3 and DDV4 Switched sign of psi and dpsidrhotor * Minor modifications of the examples equilibrium Filling b_field_phi to be compliant with DDv4 * Add load_IMAS_data to differentiate nCDf and hdf5 --------- Co-authored-by: MateoBell <[email protected]> Co-authored-by: MateoBell <[email protected]>
* integration test and unit test for imas geometry based on chease geometry * integration test and unit test for imas geometry based on chease geometry * use self.skipif instead of @pytest.mark.skipip * imas test runs --------- Co-authored-by: Sanders Mike EXT <[email protected]>
Previous example was not the same as ITER_hybrid file
* separate torax_imastools dir per ids * Tranfer function for geometry to imas eq Formula for j parallel just a sketch, will probably have to be corrected * Small correction * Updated example config to match argument changes * Fix variables names and grid in the interfacing * Group inputs into SimState and remove input IDS Objects are naturally grouped into ToraxSimState object now Input IDS loading removed as for now, might be reimplemented later * Modified tests for IMAS equilibrium coupling - Added unit tests for I/O IDS - Modified integration tests configs (.nc to be changed) * Small fixes + removal of jparallel for the moment --------- Co-authored-by: MateoBell <[email protected]>
Generated from the same config. Could be changed with output with CHEASE config for comparison
Possibility to save the plasma boundary from input equilibrium
* separate torax_imastools dir per ids * Tranfer function for geometry to imas eq Formula for j parallel just a sketch, will probably have to be corrected * Small correction * Updated example config to match argument changes * Fix variables names and grid in the interfacing * Group inputs into SimState and remove input IDS Objects are naturally grouped into ToraxSimState object now Input IDS loading removed as for now, might be reimplemented later * Modified tests for IMAS equilibrium coupling - Added unit tests for I/O IDS - Modified integration tests configs (.nc to be changed) * Small fixes + removal of jparallel for the moment * Add output files for IMAS equilibrium tests Generated from the same config. Could be changed with output with CHEASE config for comparison * Re add deleted test * Fix b0 in output equilibrium Co-authored-by: Rick-Fusion <[email protected]> --------- Co-authored-by: MateoBell <[email protected]> Co-authored-by: Rick-Fusion <[email protected]>
Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA). View this failed invocation of the CLA check for more information. For the most up to date status, view the checks section at the bottom of the pull request. |
DaanVanVugt
reviewed
Apr 4, 2025
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.
Wait for CLA signing