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

initiated work on HC-water phase envelope #531

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

initiated work on HC-water phase envelope #531

wants to merge 14 commits into from

Commits on Sep 26, 2022

  1. initiated work on HC-water åhase envelope

    @EvenSol
    EvenSol committed Sep 26, 2022
    Configuration menu
    Copy the full SHA
    572e43c View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2022

  1. Merge branch 'master' into 530-add-new-algorithm-of-phase-envelope-ca… 

    …lculations-for-hydrocarbon-water-mixtrues
    @EvenSol
    EvenSol authored Sep 27, 2022
    Configuration menu
    Copy the full SHA
    b5cadb5 View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2022

  1. merge master into branch (#535) 

    * chore: update plugin versions, switch to using jdk 11 to compile (#532)

* javadoc fixes for jdk11 (#534)

Co-authored-by: fannemel <[email protected]>
Co-authored-by: Åsmund Våge Fannemel <[email protected]>
    @EvenSol @fannemel @asmfstatoil
    3 people authored Sep 30, 2022
    Configuration menu
    Copy the full SHA
    b3217ae View commit details
    Browse the repository at this point in the history

  2. implementation started

    @EvenSol
    EvenSol committed Sep 30, 2022
    Configuration menu
    Copy the full SHA
    fe17d82 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2022

  1. Merge master into branch (#536) 

    * chore: update plugin versions, switch to using jdk 11 to compile (#532)

* javadoc fixes for jdk11 (#534)

* Checkstyle config (#524)

* added checkstyle config xml file to specify which warnings to produce

* refact: use useing pattern for disposable/close objects (#533)

* refact: use useing pattern for disposable/close objects

* close connectors

Co-authored-by: fannemel <[email protected]>
Co-authored-by: Åsmund Våge Fannemel <[email protected]>
    @EvenSol @fannemel @asmfstatoil
    3 people authored Oct 1, 2022
    Configuration menu
    Copy the full SHA
    30da69a View commit details
    Browse the repository at this point in the history

  2. further work

    @EvenSol
    EvenSol committed Oct 1, 2022
    Configuration menu
    Copy the full SHA
    246b60b View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. further work

    @EvenSol
    EvenSol committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    ddf938a View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2022

  1. Add flash test (#538) 

    * added new TPflash test

* update

* updated TP flash test

* Update settings.json
    @EvenSol
    EvenSol committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    8b2a108 View commit details
    Browse the repository at this point in the history

  2. Convert main function to test (#539) 

    add test
add delta for test that failed in mac m1 environment
    @asmfstatoil @EvenSol
    asmfstatoil authored and EvenSol committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    feea79d View commit details
    Browse the repository at this point in the history

  3. refact Tank (#540) 

    style: formatting
    @asmfstatoil @EvenSol
    asmfstatoil authored and EvenSol committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    bce8f2b View commit details
    Browse the repository at this point in the history

  4. Formatting (#541) 

    * refact: autoformatting and fix of checkstyle violations
    @asmfstatoil @EvenSol
    asmfstatoil authored and EvenSol committed Oct 4, 2022
    Configuration menu
    Copy the full SHA
    12eb1b9 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Merge branch 'master' into 530-add-new-algorithm-of-phase-envelope-ca… 

    …lculations-for-hydrocarbon-water-mixtrues
    @asmfstatoil
    asmfstatoil committed May 11, 2023
    Configuration menu
    Copy the full SHA
    c4d77d7 View commit details
    Browse the repository at this point in the history

  2. merge fix

    @asmfstatoil
    asmfstatoil committed May 11, 2023
    Configuration menu
    Copy the full SHA
    357cec5 View commit details
    Browse the repository at this point in the history

  3. revert

    @asmfstatoil
    asmfstatoil committed May 11, 2023
    Configuration menu
    Copy the full SHA
    ac4a3e8 View commit details
    Browse the repository at this point in the history