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

Pul develop into fniycbo branch #5

Merged
merged 74 commits into from
Jan 11, 2024
Merged

Pul develop into fniycbo branch #5

merged 74 commits into from
Jan 11, 2024

Commits on Jun 13, 2023

  1. Based on Tom's modification on removing crossing points of the mesh n… 

    …ear the X-pt for a 1D flux tube ranging from the OMP to the outer target, I added a few lines so that it also works for the inner X-pt if one wants to use a full flux tube including both targets.
    Menglong Zhao committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    d215077 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Separatrion of the Tg equation from the Ti equation

    Menglong Zhao committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    dd1152f View commit details
    Browse the repository at this point in the history

  2. add user-specified fraction of ionization for D2 dissociation - intro… 

    …duced by Tom
    Menglong Zhao committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    545b00e View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. Merge branch 'LLNL:develop' into develop

    @ganjinzero1
    ganjinzero1 authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    02d92c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2023

  1. the bug with j5, replace j5 with j6

    Menglong Zhao committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    9accc48 View commit details
    Browse the repository at this point in the history

  2. untrack pyscripts/__src__.py

    Menglong Zhao committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    1daefee View commit details
    Browse the repository at this point in the history

  3. merge from remote

    Menglong Zhao committed Aug 17, 2023
    Configuration menu
    Copy the full SHA
    344308f View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. version number updated

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    17d0f48 View commit details
    Browse the repository at this point in the history

  2. update bbb.v and com.v adding +input according to 8.0.4.1

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    0f609a4 View commit details
    Browse the repository at this point in the history

  3. remove the error that was not compatible with newer compiler

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    7bc273a View commit details
    Browse the repository at this point in the history

  4. remove most of the comments with #..zml

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    9215c43 View commit details
    Browse the repository at this point in the history

  5. remove comments #..zml in bbb.v and com.v

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    b1edd8b View commit details
    Browse the repository at this point in the history

  6. remove some commented-out lines

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    18f63d8 View commit details
    Browse the repository at this point in the history

  7. change the comments on energy transfer due to ion/molecule collisions

    Menglong Zhao committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    9b88574 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'develop' into develop

    @ganjinzero1
    ganjinzero1 authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    c245ab3 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Merge branch 'develop' into develop

    @ganjinzero1
    ganjinzero1 authored Nov 7, 2023
    Configuration menu
    Copy the full SHA
    c507ac9 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Merge pull request #1 from LLNL/master 

    Merge pull request #58 from LLNL/develop
    @ganjinzero1
    ganjinzero1 authored Nov 8, 2023
    Configuration menu
    Copy the full SHA
    576c6a0 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2023

  1. Removes install-generated files from repo

    @holm10
    holm10 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    d1acd7d View commit details
    Browse the repository at this point in the history

  2. Adds setup-generated files to gitignore

    @holm10
    holm10 committed Dec 1, 2023
    Configuration menu
    Copy the full SHA
    de78340 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2023

  1. Adds broader output supression com.iprint 

    Moves iprint from bbb to com
Adds more checks for whether to ouput standard UEDGE info or not
Errors etc still printed
    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    1d61b1b View commit details
    Browse the repository at this point in the history

  2. Makes tests run on pytests branch

    @holm10
    holm10 authored Dec 7, 2023
    Configuration menu
    Copy the full SHA
    61e7303 View commit details
    Browse the repository at this point in the history

  3. Attempts to run tests from dedicated branch

    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3eabc25 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/LLNL/UEDGE into develop

    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    841a336 View commit details
    Browse the repository at this point in the history

  5. Fixes workflow syntax error

    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    148b901 View commit details
    Browse the repository at this point in the history

  6. Fixes additional workflow syntax error

    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    82dbcb7 View commit details
    Browse the repository at this point in the history

  7. Updates setup-python to v4 

    To avoid generating run node warning
    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    3b1c98c View commit details
    Browse the repository at this point in the history

  8. Fixes missed use of checkout v2

    @holm10
    holm10 committed Dec 7, 2023
    Configuration menu
    Copy the full SHA
    c17cf3a View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. Changes checks to new tests on pytests-branch

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    9b69a72 View commit details
    Browse the repository at this point in the history

  2. Tries to fix chekout of pytests

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    f92ed31 View commit details
    Browse the repository at this point in the history

  3. Adds repo to branch search path in action

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    df02527 View commit details
    Browse the repository at this point in the history

  4. Adds repo path for pytests 

    Removes build output file a.out
    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    ad419ed View commit details
    Browse the repository at this point in the history

  5. Adds output file a.out to gitignore

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    000453e View commit details
    Browse the repository at this point in the history

  6. Removes terms related to manufactured solutions

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    e506630 View commit details
    Browse the repository at this point in the history

  7. Removes manuf. solution term pwrsorg

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    8409be9 View commit details
    Browse the repository at this point in the history

  8. Removes changes related to 1D FT setup

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    021e42a View commit details
    Browse the repository at this point in the history

  9. Fixes label misspell 

    Removes build-generated Python files, and adds them to gitignore
    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    762528b View commit details
    Browse the repository at this point in the history

  10. Adds minimal working UEDGE example

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    436b12f View commit details
    Browse the repository at this point in the history

  11. Removes test from example

    @holm10
    holm10 committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    694f34e View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2023

  1. Updates workflow to be compatible with pytests

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

  2. Updates workflow to be compatible with pytests

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

Commits on Dec 12, 2023

  1. Merge pull request #65 from LLNL/iprint_quiet 

    Adds broader output supression via com.iprint
    @holm10
    holm10 authored Dec 12, 2023
    Configuration menu
    Copy the full SHA
    6c9096a View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2024

  1. Initial add

    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    862d7f6 View commit details
    Browse the repository at this point in the history

  2. Added new reference to a group from another package without adding 

    the .v file to the Package file.
    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    684a18e View commit details
    Browse the repository at this point in the history

  3. Duplicated Group use statement. Not an error for python but fatal 

    for Basis build.
    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    3c9669c View commit details
    Browse the repository at this point in the history

  4. Fixes bug for albedo pumping 

    Addresses bug that affects albedo-like pumping at the plates
- The pumped fraction is Gamma_pump = (1-alb)*(n*v^bar)/4)*A
- Previously, A was taken as sx, the area of the cell normal to the poloidal direction (i.e. flux tube cross-section)
- However, for shaped, non-orthogonal target plates, the projection results in a larger pumping area than the perpendicular, increasing pumping
- This projection is now taken into account when isoldalbarea = 0
- By default, isoldalbarea = 1, and can be varied continuously

Co-Authored-By: Thomas Rognlien <[email protected]>
    @holm10 @trognlien
    holm10 and trognlien committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    f365d76 View commit details
    Browse the repository at this point in the history

  5. Initial add

    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    3de2ce1 View commit details
    Browse the repository at this point in the history

  6. Added new reference to a group from another package without adding 

    the .v file to the Package file.
    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    1832b2b View commit details
    Browse the repository at this point in the history

  7. Duplicated Group use statement. Not an error for python but fatal 

    for Basis build.
    @llnl-fesp @holm10
    llnl-fesp authored and holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    ec9e353 View commit details
    Browse the repository at this point in the history

  8. Removes usage of override switch

    @holm10
    holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    1572ced View commit details
    Browse the repository at this point in the history

  9. Updates develop branch version

    @holm10
    holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    0d03ed5 View commit details
    Browse the repository at this point in the history

  10. Ensures uedge_ver is up-to-date with Python 

    Does not address any BASIS-related issues
    @holm10
    holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    16cb4cb View commit details
    Browse the repository at this point in the history

  11. Updates uedge_ver to current version

    @holm10
    holm10 committed Jan 3, 2024
    Configuration menu
    Copy the full SHA
    acac3da View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2024

  1. Makes HDF5 grid files compatible with iprint

    @holm10
    holm10 committed Jan 4, 2024
    Configuration menu
    Copy the full SHA
    94e87d0 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. remove switches of istiexclg and istiinclg_test

    Menglong Zhao committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    7cb200a View commit details
    Browse the repository at this point in the history

  2. add comments to the coef. cftgticore

    Menglong Zhao committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    f33732d View commit details
    Browse the repository at this point in the history

  3. complete boundary conditions for istglb,istgrb,istgwc,istgpfc = 5

    Menglong Zhao committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    1920705 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. remove some unused coef.

    Menglong Zhao committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    3aec13b View commit details
    Browse the repository at this point in the history

  2. add comments for istgcore and cftiexclg

    Menglong Zhao committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    40427fa View commit details
    Browse the repository at this point in the history

  3. Adds warnings pertaining to new variable cftiexclg 

    The variable scales the contribution of atom energy in the ion energy equation
- When Ti and Ta solved together, the switch should be set to 1
- When Ti and Ta solved separately, the switch should be set to 0
- Cases are allowed to run in faulty setups since the coefficient is scaleable to allow gradually turning it off
    @holm10
    holm10 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    9ae0736 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'Tg_for_test' of https://github.com/ganjinzero1/UEDGE in… 

    …to Tg_for_test
    @holm10
    holm10 committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    399fb95 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'develop' into Tg_for_test

    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    47b0cc2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #62 from ganjinzero1/Tg_for_test 

    Merging Tg into the LLNL/develop
    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    672573f View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into albedo_area_bugfix

    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    e7bba78 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #67 from holm10/albedo_area_bugfix 

    Albedo pumping bugfix
    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    506a927 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' into removing_override

    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    7d42ee4 View commit details
    Browse the repository at this point in the history

  10. Update UEDGE version in setup.py

    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    c27b831 View commit details
    Browse the repository at this point in the history

  11. Update version for bbb.uedge_ver

    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    92c5f91 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #68 from holm10/removing_override 

    Removing override check and trip
    @holm10
    holm10 authored Jan 9, 2024
    Configuration menu
    Copy the full SHA
    fb4896f View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Allows hdf5_restore to restore from any save 

    - Includes detection and restoration of saves written by UETOOLS
- Makes some modifications to the user prompts during read
  - Specifies the file structure detected
  - Specifies the file read by name
  - Explicitly reports success
- Changes most of the structure of the restore
- No impact on usage
    @holm10
    holm10 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    2ff7a5b View commit details
    Browse the repository at this point in the history

  2. Updates develop to use pytests-develop tests

    @holm10
    holm10 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    3519b4a View commit details
    Browse the repository at this point in the history

  3. Run test suite in parallel jobs

    @holm10
    holm10 committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    18447ab View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. Put HDF5 restore output behind iprint

    @holm10
    holm10 committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    2a8a704 View commit details
    Browse the repository at this point in the history

  2. Makes oldseec a float 

    To better be able to gradually transition to new, improved model
    @holm10
    holm10 committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    2da412d View commit details
    Browse the repository at this point in the history

  3. Bugfix for variable oldseec

    @holm10
    holm10 committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    c778688 View commit details
    Browse the repository at this point in the history