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.

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

update from master #690

Merged
merged 2 commits into from
May 20, 2023
Merged

update from master #690

merged 2 commits into from
May 20, 2023

Conversation

EvenSol
Copy link
Collaborator

@EvenSol EvenSol commented May 20, 2023

No description provided.

EvenSol and others added 2 commits May 19, 2023 23:14
* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* refact: simplified if-else nesting

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>
@EvenSol EvenSol merged commit 9d4e5f6 into waterDegasserBugs May 20, 2023
EvenSol added a commit that referenced this pull request May 21, 2023
* waterDegasserBugs

* style and assert@

* update from master (#690)

* 684 addfluid is not adding pc if not existing (#685)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* refact: simplified if-else nesting

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* dont do log of zeros (#688)

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* modeidief test

* log off

* rebase on master (#693)

* 684 addfluid is not adding pc if not existing (#685)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* refact: simplified if-else nesting

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* dont do log of zeros (#688)

* AddfluidHighTemp (#689)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* add test TPflas high

* added gitlense extension

* update

* update

* update test

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* added pretty print for table

* added prettyPrint + various fixes to PhaseType use

* copy phasetype object in clone method

* removed phasetpye setter not needed?

* disable test that throws run tim exception

* fixed doc

* fixed doc

* added BWRS parameter table

* exception handling BWRS

* updated glycol rigtest

* disable pH test

* fixed bug

* enabled test ph test

* added serialization test back again

---------

Co-authored-by: Sviatoslav Eroshkin <109044598+Sviatose@users.noreply.github.com>
Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>
EvenSol added a commit that referenced this pull request May 22, 2023
* waterDegasserBugs

* style and assert@

* update from master (#690)

* 684 addfluid is not adding pc if not existing (#685)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* refact: simplified if-else nesting

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* dont do log of zeros (#688)

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* modeidief test

* log off

* rebase on master (#693)

* 684 addfluid is not adding pc if not existing (#685)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* refact: simplified if-else nesting

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* dont do log of zeros (#688)

* AddfluidHighTemp (#689)

* added test for addFLuids

* updated test

* updated test with new pseudo component

* solution for bug

* add test TPflas high

* added gitlense extension

* update

* update

* update test

---------

Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>

* added pretty print for table

* added prettyPrint + various fixes to PhaseType use

* copy phasetype object in clone method

* removed phasetpye setter not needed?

* disable test that throws run tim exception

* fixed doc

* fixed doc

* added BWRS parameter table

* exception handling BWRS

* updated glycol rigtest

* disable pH test

* fixed bug

* enabled test ph test

* added serialization test back again

---------

Co-authored-by: Sviatoslav Eroshkin <109044598+Sviatose@users.noreply.github.com>
Co-authored-by: Åsmund Våge Fannemel <34712686+asmfstatoil@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant