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

Fill out more of the EFIT mapping to MDS+ #255

Merged
merged 40 commits into from
Aug 12, 2023
Merged

Fill out more of the EFIT mapping to MDS+ #255

merged 40 commits into from
Aug 12, 2023

Commits on Jun 29, 2023

  1. Fill out more of the EFIT mapping to MDS+ 

    This may not be 100% complete, but should be pretty close.
    @torrinba
    torrinba committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    bc532a0 View commit details
    Browse the repository at this point in the history

  2. Add magnetic axis field

    @torrinba
    torrinba committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    bfa2e50 View commit details
    Browse the repository at this point in the history

  3. Add variables that are in the tree, but not yet being filled 

    Changes will be made in EFIT to make these usable
    @torrinba
    torrinba committed Jun 29, 2023
    Configuration menu
    Copy the full SHA
    a0ba816 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2023

  1. Extending the EFIT mapping further 

    This includes nearly all of the additional EFIT variables in MDS+
that I know how to mapp to IMAS.
    @torrinba
    torrinba committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    ccd53ca View commit details
    Browse the repository at this point in the history

  2. Found even more variables in MDS+ 

    There were other name changes I had missed.

This takes care of everything that comes out of EFIT now.
    @torrinba
    torrinba committed Jun 30, 2023
    Configuration menu
    Copy the full SHA
    1456c2a View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Allow ods roots to be loaded with machine mappings

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

Commits on Jul 18, 2023

  1. This works but needs some clean-up

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

  2. Forgot a to commit a file

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

  3. Removed non-IMAS conform fields

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

  4. Correction to MDS field names

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

  5. Another MDS+ vs EFIT discrepancy

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

  6. Bug fixes for stack_outer

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

  7. removed *args from stack_outer

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

  8. Forgot changes to _efit in last commit

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

  9. Updated error handling

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

Commits on Jul 19, 2023

  1. Removed more imas non-conform mappings

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

  2. Attempt to fix for EFIT iterations

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

  3. More attempts at getting the iterations to work

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

  4. Removing interation_n for now

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

  5. Trying again

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

  6. Should be finally fixed now

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

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

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

  8. Fixed DSEP and homogenous time

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

  9. Merge change from omas cherry pick

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

  10. Removed chi_squared_total again

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

  11. Removed normalization from j_tor- no longer needed

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

  12. Adding IMAS 3.39.0 

    I have not tested anything associated with this yet
    @torrinba
    torrinba committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    7e5971b View commit details
    Browse the repository at this point in the history

  13. Readded IMAS ccontraints from the future

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

Commits on Jul 20, 2023

  1. Fix AEQDSK problems in mapping 

    Some variables have different names in MDS+ and EFIT which is
complicated by the fact that some of the names in MDS+ match the
EFIT names but have different or missing data...
    @torrinba
    torrinba committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2a69ca6 View commit details
    Browse the repository at this point in the history

  2. Fixed commas...

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

  3. Fix typo and remove variable not yet setup in MDS+

    @torrinba
    torrinba committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    02addbe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'EFIT_mdsplus_mapping' of github.com:gafusion/omas into … 

    …EFIT_mdsplus_mapping
    @torrinba
    torrinba committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    8ed34a2 View commit details
    Browse the repository at this point in the history

  5. Fixed last two broken fields

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

  6. Removed cruft

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

Commits on Jul 27, 2023

  1. Update COCOs

    @torrinba
    torrinba committed Jul 27, 2023
    Configuration menu
    Copy the full SHA
    c275b12 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2023

  1. More missing COCOS

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

  2. Cherry pick efit mapping changes from omas viewer

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

Commits on Jul 29, 2023

  1. Fix COCOs 

    The comments do matter...
    @torrinba
    torrinba committed Jul 29, 2023
    Configuration menu
    Copy the full SHA
    485e3ba View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2023

  1. Fixed messed up indentation

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

Commits on Aug 9, 2023

  1. Added sizes for all new entries

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