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

Set ODS from ids objects #282

Closed
wants to merge 69 commits into from
Closed

Set ODS from ids objects #282

wants to merge 69 commits into from

Commits on Nov 30, 2022

  1. Extended magnetic mapping 

    - This my crude attempt to allow mapping between
rho_pol_norm <-> rho_tor_norm
- This also includes phi
- I qualitatively tested rho_pol_norm -> rho_tor_norm
- Might have some COCOS issues
- Probably overly complicated
- Needs dynamic fetching of `phi` and `rho_pol_norm`
    @AreWeDreaming
    AreWeDreaming committed Nov 30, 2022
    Configuration menu
    Copy the full SHA
    f0e5394 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. Fixed some horrible math errors from last commit 

    - Tested against mapping form OMFITprofiles
- Results are OK by eye. Numerical verification still pending.
    @AreWeDreaming
    AreWeDreaming committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    2f0e0b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2023

  1. Fixed error in rho_tor to rho_pol conversion

    @AreWeDreaming
    AreWeDreaming committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    a634444 View commit details
    Browse the repository at this point in the history

  2. Merged master into this branch

    @AreWeDreaming
    AreWeDreaming committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    1d7ab5e View commit details
    Browse the repository at this point in the history

  3. Fixed some bugs, but the result is still wrong

    @AreWeDreaming
    AreWeDreaming committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    a35e79d View commit details
    Browse the repository at this point in the history

  4. Fixed broken psi <-> conversion 

    - Results seem good now
    @AreWeDreaming
    AreWeDreaming committed Feb 16, 2023
    Configuration menu
    Copy the full SHA
    df2cf6b View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2023

  1. Merge remote-tracking branch 'origin/master' into mapping_to_from_rho… 

    …_tor_norm
    @AreWeDreaming
    AreWeDreaming committed Jul 13, 2023
    Configuration menu
    Copy the full SHA
    989b295 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Some changes that allow imas_set for ids objects

    @AreWeDreaming
    AreWeDreaming committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    fbdd940 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    37fb8f0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ed3700f View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/imas_set_for_ids_objects' into t… 

    …est_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    bae815f View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    d0a7197 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    432a26b View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    97d4aba View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    537f900 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    a71f710 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    8bf84e6 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    b1df43a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    a8c90d9 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    699ec70 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    1382e78 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    48371b6 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    8d958d7 View commit details
    Browse the repository at this point in the history

  7. Cherry picked changes from omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    d7ad23e View commit details
    Browse the repository at this point in the history

  8. Fixed missing raised exception

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    8bb1966 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    9a93cb5 View commit details
    Browse the repository at this point in the history

  10. How to fix closest_wall_point.distance

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    ed4dc2b View commit details
    Browse the repository at this point in the history

  11. Fixed extra argument in min)4

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    97df88f View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int… 

    …o test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    be1243f View commit details
    Browse the repository at this point in the history

  13. Fixed missing raised exception

    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    6b0bf16 View commit details
    Browse the repository at this point in the history

  14. Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int… 

    …o test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    ada7df0 View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into cherr… 

    …y_pick_omas_viewer_dev
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    ea7fe8a View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int… 

    …o test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    79fd988 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    3d43089 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into test_… 

    …new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    19204ba View commit details
    Browse the repository at this point in the history

  3. Merge efit_mds branch

    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    6a39152 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    82eb8a9 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    1ab073b View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/cherry_pick_omas_viewer_dev' int… 

    …o test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    767e7b9 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2023

  1. Changes needed to get ITPA IDA to work 

    - OMAS can now store omas data in IDS in memory
- Changed `b_r` and related  to `b_field_r`
- Added ece if_bandwidth for ECE
    @AreWeDreaming
    AreWeDreaming committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    ad2dc06 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    98c74dd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    946b5d0 View commit details
    Browse the repository at this point in the history

  3. Fix summary plot w. new mapping 

    - Still missing j_tor from EFITEXT tree
    @AreWeDreaming
    AreWeDreaming committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    914183b View commit details
    Browse the repository at this point in the history

  4. Fix indenting

    @AreWeDreaming
    AreWeDreaming committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    241f4bb View commit details
    Browse the repository at this point in the history

  5. Exception handling to look at older EFIT MDS+

    @AreWeDreaming
    AreWeDreaming committed Jul 28, 2023
    Configuration menu
    Copy the full SHA
    1ce3cf3 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2023

  1. Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    0d9a398 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'test_new_EFIT_mappings_for_IDA' of github.com:gafusion/… 

    …omas into test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    2470512 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Merge indentation fixes

    @AreWeDreaming
    AreWeDreaming committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    d363957 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'test_new_EFIT_mappings_for_IDA' of github.com:gafusion/… 

    …omas into test_new_EFIT_mappings_for_IDA
    @AreWeDreaming
    AreWeDreaming committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    e12d609 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'EFIT_mdsplus_mapping' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    dc92fa9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'EFIT_mdsplus_mapping' into cherry_pick_omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    a7fcf51 View commit details
    Browse the repository at this point in the history

  5. Fixes for the failing omas_plot regression test

    @AreWeDreaming
    AreWeDreaming committed Jul 31, 2023
    Configuration menu
    Copy the full SHA
    4a3b09e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2023

  1. More robustly handle multiple run ids

    @AreWeDreaming
    AreWeDreaming committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    db70f71 View commit details
    Browse the repository at this point in the history

  2. Added density_thermal, begrudgingly

    @AreWeDreaming
    AreWeDreaming committed Aug 1, 2023
    Configuration menu
    Copy the full SHA
    96a5170 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Handling mismatched times from profiles and eq

    @AreWeDreaming
    AreWeDreaming committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    5576428 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2023

  1. Merge remote-tracking branch 'origin/EFIT_mdsplus_mapping' into omas_… 

    …plot_w_new_EFIT_mapping
    @AreWeDreaming
    AreWeDreaming committed Aug 10, 2023
    Configuration menu
    Copy the full SHA
    a0cf687 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. use_subplot support without manager

    @AreWeDreaming
    AreWeDreaming committed Aug 12, 2023
    Configuration menu
    Copy the full SHA
    0b3ed22 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2023

  1. Merge branch 'master' into test_new_EFIT_mappings_for_IDA

    @AreWeDreaming
    AreWeDreaming committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    a613a21 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'test_new_EFIT_mappings_for_IDA' into omas_plot_w_new_EF… 

    …IT_mapping
    @AreWeDreaming
    AreWeDreaming committed Aug 15, 2023
    Configuration menu
    Copy the full SHA
    2b0ff47 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2023

  1. Fixed error in carbon density and redundant loads

    @AreWeDreaming
    AreWeDreaming committed Sep 21, 2023
    Configuration menu
    Copy the full SHA
    3c19d7b View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge remote-tracking branch 'origin/master' into cherry_pick_omas_vi… 

    …ewer_dev
    @AreWeDreaming
    AreWeDreaming committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    cd09d0d View commit details
    Browse the repository at this point in the history

  2. Attempt to fix regression

    @AreWeDreaming
    AreWeDreaming committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    51dba47 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. Merge remote-tracking branch 'origin/master' into omas_plot_w_new_EFI… 

    …T_mapping
    @AreWeDreaming
    AreWeDreaming committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    8c0f4d7 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Merge branch 'master' into cherry_pick_omas_viewer_dev

    @AreWeDreaming
    AreWeDreaming committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    e0351d1 View commit details
    Browse the repository at this point in the history

  2. electrons.density_~~thermal~~

    @AreWeDreaming
    AreWeDreaming committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    bef0a6e View commit details
    Browse the repository at this point in the history

  3. Fixed density_thermal in sample data

    @AreWeDreaming
    AreWeDreaming committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    b627204 View commit details
    Browse the repository at this point in the history

  4. Robustness upgrades to pass omas_test_plot

    @AreWeDreaming
    AreWeDreaming committed Dec 11, 2023
    Configuration menu
    Copy the full SHA
    77bad43 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Replace deprecated interp2d->RectBivariateSpline 

    - Plus 2 missed density_thermal
    @AreWeDreaming
    AreWeDreaming committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    ddaf49d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'cherry_pick_omas_viewer_dev' into omas_plot_w_new_EFIT_… 

    …mapping
    @AreWeDreaming
    AreWeDreaming committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    df0ae53 View commit details
    Browse the repository at this point in the history