Skip to content

Commit

Permalink
updated with master (#1080)
Browse files Browse the repository at this point in the history
* fix: upgrade org.ojalgo:ojalgo from 53.1.0 to 53.1.1 (#837)

Snyk has created this PR to upgrade org.ojalgo:ojalgo from 53.1.0 to 53.1.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.ojalgo/ojalgo/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* added flow setter (#838)

* added flow setter

* improve setter

* fix bug

* fix errors

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.20.0 to 2.21.0 (#840)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.20.0 to 2.21.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.0 (#839)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.20.0 to 2.21.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* added test for flow setter for simple process (#841)

* Bug  error with flash calc (#843)

* bug: error with flash calc Gudrun

* temporary "fix" bug in stabiilty analysis

---------

Co-authored-by: Sviatoslav Eroshkin <[email protected]>

* Fix multifeed (#845)

* fixed minor bug in stability analysis

* fix multifeed

* update

* update

* fixed bug

* update

* remove log

* version 2.5.8

* fix flow setter bug

* feat: use defined constant values (#825)

* refact: use defined constant values for atmospheric pressure 
* refact: use defined constant value for R
style / docfix
---------

Co-authored-by: Even Solbraa <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.21.0 to 2.21.1 (#846)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.21.0 to 2.21.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.21.0 to 2.21.1 (#847)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.21.0 to 2.21.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fixed minor bug in stability analysis (#844)

* Process new tp flash problem (#852)

* bug: TPflash problem

* fixed bug in flash

* comment out method

---------

Co-authored-by: Sviatoslav Eroshkin <[email protected]>

* New release (#854)

* add test (#855)

* Fix pressure bug (#856)

* add test

* fix pressure bug

* fix staility of TEG process (#859)

* improve TPflash speed (#860)

* bug fix

* update flash

* imporve flash

* improve flash in high pressure area (#862)

* improve flash

* update

* version 2.5.10 (#863)

* Update TPmultiflash.java

* Update TPmultiflash.java

* Update TPmultiflash.java

* fix error flash

* updated dynamics calc (#868)

* updated dynamics calc

* updates

* update dynamic calc

* update model

* fix test error

* remove output

* added test and fix

* update

* fixed errors control

* Release 2.5.11 (#869)

* Update pom.xml

* Update pomJava8.xml

* feat: assure no negative Ti and Td (#872)

* feat: assure no negative Ti and Td

* feat: also check for Kp
test: added tests

* fix controller (#874)

* version 2.5.12 (#875)

* Update pom.xml

* Update pomJava8.xml

* add chlorine parameters (#871)

* fix: throw exceptions in pTphaseEnvelope (#876)

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0 (#880)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* [Snyk] Upgrade org.apache.logging.log4j:log4j-core from 2.21.1 to 2.22.0 (#879)

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.21.1 to 2.22.0

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.21.1 to 2.22.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0 (#880) (#881)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.21.1 to 2.22.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

---------

Co-authored-by: snyk-bot <[email protected]>

* test: add LNGship unit tests (#878)

* chore: add a security-policy (#884)

Required to stay complient for public repos in equinor. (https://developer.equinor.com/governance/scm-policy/)

* fix set lp limit (#885)

* added test for umrpru (#886)

* added test for umrpru

* updated

* update

* fix bug saturation temperature and add test

* update name

* Update src/main/java/neqsim/PVTsimulation/simulation/SaturationTemperature.java

good suggestion

Co-authored-by: Jørgen Engelsen <[email protected]>

* Update src/test/java/neqsim/PVTsimulation/simulation/SaturationTemperatureTest.java

Co-authored-by: Jørgen Engelsen <[email protected]>

* Update src/main/java/neqsim/PVTsimulation/simulation/SaturationPressure.java

Co-authored-by: Jørgen Engelsen <[email protected]>

* Update SaturationTemperature.java

* Update SaturationPressure.java

---------

Co-authored-by: Jørgen Engelsen <[email protected]>

* Update pom.xml (#888)

* Update pom.xml

* Update pomJava8.xml

* added compressor test and initial code (#877)

* added compressor test and initial code

* some more work

* some further work to get dynamic compressor to work

* strugling to find error

* improve compressor calcs

* added compressor mointor

* further work in dynamic compressors

* update

* updates

* updated

* further work

* update dynamic

* update

* update

* update

* update

* update

* update

* update

* update

* update power

* add maxminspeed setters

* check if controller is active

* removed try catch block and added check for actualFlowRateNew

* removed print to screen in test

* Update pom.xml (#889)

* Update pom.xml

* Update pomJava8.xml

* doc: fix javadoc (#891)

* doc: fix javadoc

* chore: remove non-implemented FileWriter classes (#848)

* chore: build with java 21
update dependencies and github workflows

* Update release_with_jars.yml

indentation error

* Update release_with_jars.yml

* fix: typo Update release_with_jars.yml

* fix read kij from eclipse (#892)

* fix read kij from eclipse

* fix bug

* add inflow unit (#893)

* add inflow unit

* minor updates

* updates

* update adjuster

* pdate

* update

* finalize test

* update (#894)

* version 2.5.15 (#895)

* Update pom.xml

* Update pomJava21.xml

* Update pomJava8.xml

* Update release_with_jars.yml

* fix: pipe beggs and brills y factor (#898)

* possible to calc out pressure of valve (#897)

* possible to calc out pressure of valve

* added test to pipeline flow

* remove output

* prepare version 2.5.16

* update adjuster (#900)

* update adjuster

* fix bug adjuster

* removed output added test

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update verify_build.yml

* fix: add more get methods (#902)

* feat: module class add get meas device (#903)

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.22.0 to 2.22.1 (#905)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.22.0 to 2.22.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.22.0 to 2.22.1 (#904)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.22.0 to 2.22.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* build(deps): sync log4j version in all poms (#906)

* update mechanical design models for scrubber (#912)

* update models

* update

* updates

* updates

* update

* update

* update

* release 2.5.17 (#913)

* release 2.5.17

* Update pomJava21.xml

* Update pomJava8.xml

* fix: upgrade org.ojalgo:ojalgo from 53.1.1 to 53.2.0 (#908)

Snyk has created this PR to upgrade org.ojalgo:ojalgo from 53.1.1 to 53.2.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.ojalgo/ojalgo/

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: pipeBeggsAndBrills (#914)

* fix: pipeBeggsAndBrills

* fix: update

* fix: set default to isothermal running

* fix: update

* fix: tests

* fix: typo in ProcessModule (#915)

* Bug  mpm returns incorrect value (#917)

* bug: MPM returns incorrect value

* bug fix suggestion.

Bug had to do when we create a stream from another stream (as we do for stream2). Then we set temperature and pressure on it - but it does not set it on the correct stream

* added init properties

* bug fix

* update

* fix bug

* new fix

---------

Co-authored-by: Sviatoslav Eroshkin <[email protected]>

* refact: use const from modelsettings

* fix: rename class CalcIonicComposition

* refact: remove deprecation, simplify init

* simplify default method

* feat: do not let display throw exception

* fix

* test: disable tests not working on github

* fix

* style: whitespace (#924)

* style: whitespace

* release 2.5.18 (#925)

* refact: remove deprecated setPhaseType(int phaseToChange, int newPhaseType)

* rm:  setPhaseType(int phaseToChange, String phaseTypeName)

* refact: rm getPhaseType and setPhaseType(int phaseType)

* refact: remove deprecated functions

* refact: reorder code

* refact: replace use of phasetype as int

* doc: javadoc fix

* refact: replace integer references to phasetype

* refact: phaseType.getValue-> compare with enum type

docfix

revert

* refact: rename variables

* style

* fix: upgrade org.ojalgo:ojalgo from 53.2.0 to 53.3.0 (#931)

Snyk has created this PR to upgrade org.ojalgo:ojalgo from 53.2.0 to 53.3.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.ojalgo/ojalgo/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* refact: make PhaseGE abstract, throw exception for non implemented methods

* chore: move main function to test

* test: allow some numerical inaccuracy

* refact: logger error -> warn

* refact: systemthermo.initAnalytic(int type, int phase)

* refact:   public void initAnalytic(int type)

* git commit -m "refact: rename type to initType"

* refact: remove redundant method definition

* test: add tests (#936)

* test: add tests

* update tests

* Update PhasePCSAFTRahmatTest.java

* Update SystemPCSAFTTest.java

---------

Co-authored-by: Even Solbraa <[email protected]>

* docfix

* rename variables

* docfix: revert

* refact: remove redundant code

* chore: update github action versions

* refact: remove unused function input compnumber from removecomponent (#940)

* feat: simplify removeComponent
* refact: reorder methods
* docfix

* refact: Phase classes clean up (#941)

* refact: remove redundant variable definitions (#943)

* Ref rahmat 2 (#945)

* refact: remove duplicate setters/getters

* refact: remove redundant getter/setters (#946)

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.22.1 to 2.23.0 (#948)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.22.1 to 2.23.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.22.1 to 2.23.0 (#947)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.22.1 to 2.23.0.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* Update README.md (#949)

* refact: make method default in Interface (#950)

* fix: throw exception for not implemented methods (#951)

* fix: throw exception for not implemented methods

* style: alignment

* refact: simplify EOS subclass constructor

* refact: simplify super ctor calls

* refact: simplify srkeos subclass constructors

* refact: simplify preos subclass constructors

* refact: simplify SystemSrkCPA subclass constructors

* Whitespace style (#955)

* style: whitespace and comment fixes

* fix: javadoc typo (#956)

* release 2.5.19 (#958)

* refact: Eclipse cleanup (#959)

* refact: Eclipse cleanup
* style: whitespace

* chore: align pom files (#960)

* chore: align pom files
update maven references for java8

* refact: reorder methods system (#961)

* refact: reorder methods using eclipse reorder code (#963)

* feat: propertyFlash - more robust input handling  (#962)

* fix: check that fraction belongs to current component
* feat: more robust handling of input components
* feat: SystemInterface.hasComponent
* chore: release 2.5.20

* Update MultiPhaseMeter.java (#964)

remove output in MPM

* fix: bugfixes Phase.addComponent (#966)

* Update verify_build.yml

* Create publish_javadoc.yml

* feat: Phase.hasComponent check against normalized name (#965)

feat: Phase.hasComponent check against normalized name
feat: new function Phase.getComponentNames
fix: check that compnumber is valid and not in use (previously possible to overwrite component in array)
docfix

* Update verify_build.yml

* fix: more robust propertyFlash (#967)

* phaseType fix (#969)

* v2.5.21 (#970)

* Update pom.xml

* Update pomJava8.xml

* Update pomJava21.xml

* fix: upgrade org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1 (#972)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-core from 2.23.0 to 2.23.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: upgrade org.apache.logging.log4j:log4j-api from 2.23.0 to 2.23.1 (#973)

Snyk has created this PR to upgrade org.apache.logging.log4j:log4j-api from 2.23.0 to 2.23.1.

See this package in Maven Repository:
https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-api/

See this project in Snyk:
https://app.snyk.io/org/neqsim/project/86e71bb0-950f-445f-94e7-32e73d92cca3?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix solid flash (#975)

* fix solid calcs (#976)

* fix solid flash

* update

* update

* update

* add chack for component in temp database

* remove output

* prepare for version 2.5.22 (#977)

* fix: update devcontainer.json to new format (#978)

* fix: update devcontainer.json to new format
chore: update checkstyle version
style: fix xml and json tab settings
* chore: checkstyle, match default import order

* add alkene components (#981)

* add ethylene

* update components

* added pHFlash Test for CPA (#982)

* Add more units (#983)

* add psi and psig units

* add common unit specification

* added test for temperatures (#984)

* added more field units (#985)

* added more field units

* more updates to units

* more field units

* add possibility to see available units

* fix test for units

* update text

* update

* first implementation of reporting of process (#986)

* first implementation of reporting of process

* added json reporting

* fixed bug in stream

* update pom

* update doc

* fix bug

* update

* update

* update

* 987 do not converge recycles at each process simulation (#989)

* first test

* update run step

* added Value as response (#988)

* added Value as response

* added json report from process object

* update

* update

* fix error.

* added tests for saturation calculations (#991)

* improve json properties (#990)

* inproved properties

* further updates

* update barrels/day

* add wt fraction

* updated method

* added RVP and TVP methods (#992)

* Update Standard_ASTM_D6377Test.java

* bug fix json stream (#994)

* initial test rachford rice (#995)

* initial test rachford rice

* update rachford rice - moved to separate class

* modified rachford rice implementation

* added Rachford rice tests

* new implementation rachford rice (#996)

* new implementation rachford rice

* update tests

* update

* update method doc

* update

* Update StreamResponse.java

* update response

* add GCV and WI for streams (#997)

* added GCV/WI to stream response (#998)

* Update StreamResponse.java

* update Sm3hr unit

* added response

* improved speed of water saturator (#999)

* fix report (#1000)

* updated diff lib simulation and test (#1001)

* updated diff lib simulation and test

* update

* update CME

* update

* fix Eclipse update (#1003)

* remove gitlens from devcontainer (#1004)

* update eclipse read (#1005)

* update eclipse reader (#1006)

* release 2.5.23 (#1007)

* update units (#1008)

* Units-upd (#1009)

* update units

* update

* added exceptions for units not supported (#1010)

* added exceptions for units not supported

* typo fix

* work on units

* update tests

* added unit

* test for metric units

* update units

* added fluid report

* removed output in json fluid and stream

* update respons

* Update FluidResponse.java

* Update FluidResponse.java

* added pure component properties in json

* added more parameters to json

* update

* update process simulation with run in step (#1011)

* update process simulation with run in step

* update run step

* update test for run in steps

* update test for step process

* version 2.5.24 Update pom.xml (#1012)

* version 2.5.25 Update pom.xml

* Update pomJava21.xml

* Update pomJava8.xml

* added Cp, Cv, enthalpy, entropy (#1013)

* update josn report format (#1014)

* added Zvol corr (#1015)

* Update SystemThermo.java

* update json reporting (#1016)

* update json reporting

* update test

* added unit for temperature (#1017)

* version 2.5.25 (#1019)

* update test (#1020)

* update test

* fixed bug

* update

* update (#1021)

* fix bug change composition to all phases (#1022)

* cvd and multiphase corrections for reservoir (#1023)

* cvdfor reservoir

* added some implementation of TPflash reservoir

* update

* fix error in simulation

* update

* update init(0)

* start adding MPFM fitter

* fix: upgrade com.google.code.gson:gson from 2.10.1 to 2.11.0 (#1024)

Snyk has created this PR to upgrade com.google.code.gson:gson from 2.10.1 to 2.11.0.

See this package in maven:
com.google.code.gson:gson

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* added test (#1026)

* Flow Induced Vibrations  (#1025)

* feat: LOF calc

---------

Co-authored-by: Even Solbraa <[email protected]>

* fix bug separator inlet stream

* update version (#1027)

* Update release_with_jars.yml

* try fix (#1029)

* try fix

* update

* fix: but with str units (#1028)

* fix: bug with Oil Test increase (#1032)

* fix: flow induced vibrations (#1031)

* version 2.5.27 (#1033)

* mior update logger floe rate adjuster (#1035)

* mior update logger floe rate adjuster

* minor updates

* fix json error on report (#1034)

* add temperature dependent volume correction for gas (#1036)

* add temperature dependent volume correction for gas

* Update Density.java

* Update Density.java

* fix: oil sep bug (#1037)

* fix: oil sep bug

* commented out failed test

* removed feiling test oilProcessTest

* rachford rice cleanup

---------

Co-authored-by: Even Solbraa <[email protected]>

* version 2.5.28 (#1038)

* Update Units.java

* add set and get methods and a test (#1039)

* Update Splitter.java (#1043)

* Update Splitter.java

get  split factor values

* Update Splitter.java

* remove unhandeled runtime exception (#1042)

* remove unhandeled runtime exception

* added possibility to chenge method used in Rachford RIce

* update

* Update PhaseEos.java

* add vol correction test (#1041)

* feat: update flow rate adjuster (#1044)

* fix: flow rate adjuster phases (#1045)

* 2.5.29 (#1046)

* Cv method valves (#1047)

* Cv method valves

* added Cv for liquids

* update formulaes

* update

* sstill something wrong here...

* fixed error

* update RVP calc (#1048)

* Rvpupdate2 (#1049)

* Cv method valves

* added Cv for liquids

* update formulaes

* update

* sstill something wrong here...

* fixed error

* update RVP calc

* update 2

* update

* improved TVflash (#1051)

* Fix-failed-SimpleReservoirTest.testRun (#1052)

* improved TVflash

* fixed bug TVflash

* Update TVflash.java

* RVP fix

* added more methods (#1053)

* fix: upgrade org.jfree:jfreechart from 1.5.4 to 1.5.5 (#1054)

Snyk has created this PR to upgrade org.jfree:jfreechart from 1.5.4 to 1.5.5.

See this package in maven:
org.jfree:jfreechart

See this project in Snyk:
https://app.snyk.io/org/evensol/project/5734e76a-5ebe-4fe0-9fb9-776e0cbc8504?utm_source=github&utm_medium=referral&page=upgrade-pr

Co-authored-by: snyk-bot <[email protected]>

* fix: HEX (#1055)

* version 2.5.30 (#1056)

* fixed bug in json HX response (#1058)

* work ongoing

* fixed NaN in HX response

* added duty in output

* changed variable name

* added pump output (#1060)

* use key overall in stream and fluid response (#1061)

* added set pressure with unit (#1062)

* doc: fix javadoc @link to type double causing javadoc warnings (#1057)

* doc: fix javadoc link

* chore: update maven plugins, require maven version 3.8.8 and java 8 (#1064)

* chore: update maven plugins

* chore: fix javadoc (#1066)

* chore: fix javadoc (#1067)

* chore: fix javadoc

* feat: publish releases to maven central (#1068)

* chore: release v2.5.31 (#1069)

* Update maven_publish.yml

* Update maven_publish.yml

* upgrade H2 db (#1070)

* upgrade H2 db

* Update pomJava21.xml

* 1063 add delta t specification for heat exchangers (#1071)

* first version

* update delta T with HX

* update delta T HX

* chore: add checkstyle plugin (#1072)

remove unused/outdated parameters

* test a new method for phase envelope calculation (#1074)

* test a new method for phase envelope calculation

* update test

* further improvements

* update model

* update

* update

* added one test

* update method name to calcPTphaseEnvelope2

* updated method name in test

---------

Co-authored-by: Åsmund Våge Fannemel <[email protected]>

* chore: fixed warnings (#1073)

* chore: fixed warnings

* start adding more fluid property models (#1075)

* start adding more fluid property models

* add java test to sdcode

* further implementation

* futher updates on Twu model

* updated test

* added PC, TC and VC

* fix bug in PC calculation for oil components and all tests (#1076)

* fix bug in PC calculation for oil components and all tests

* fix slim tube test

* change default phase envelope algorithm (#1077)

* change default phase envelope algorithm

* update errors

* updated to version 2.5.32

* fix errors

* update calc PT envelope

* update phaseenvelope tests

* added test for Plus fraction model (#1079)

---------

Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Sviatoslav Eroshkin <[email protected]>
Co-authored-by: Åsmund Våge Fannemel <[email protected]>
Co-authored-by: Jørgen Engelsen <[email protected]>
Co-authored-by: Åsmund Våge Fannemel <[email protected]>
  • Loading branch information
6 people authored Aug 15, 2024
1 parent 9fc3f66 commit 8bf9809
Show file tree
Hide file tree
Showing 1,590 changed files with 199,786 additions and 160,701 deletions.
5 changes: 4 additions & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,12 @@ RUN if [ "${INSTALL_MAVEN}" = "true" ]; then su vscode -c "umask 0002 && . /usr/
ARG NODE_VERSION="none"
RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

ENV JAVA_HOME /usr/lib/jvm/msopenjdk-current/
RUN export JAVA_HOME

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

# [Optional] Uncomment this line to install global node packages.
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
82 changes: 37 additions & 45 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,55 +8,47 @@
// Update the VARIANT arg to pick a Java version: 11, 17
// Append -bullseye or -buster to pin to an OS version.
// Use the -bullseye variants on local arm64/Apple Silicon.
"VARIANT": "11-bullseye",
"VARIANT": "11",
// Options
"INSTALL_MAVEN": "true",
"INSTALL_GRADLE": "false",
"NODE_VERSION": "lts/*"
}
},

// Set *default* container specific settings.json values on container create.
//"settings": {
// "java.home": "/docker-java-home"
//},
"settings": {
"java.configuration.updateBuildConfiguration": "interactive",
"[java]": {
"editor.defaultFormatter": "redhat.java",
"editor.formatOnSave": true,
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false
},
"java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml",
"java.saveActions.organizeImports": true,
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false,
"java.checkstyle.version": "10.3",
"java.checkstyle.configuration": "https://raw.githubusercontent.com/checkstyle/checkstyle/master/src/main/resources/google_checks.xml"
},


// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"vscjava.vscode-java-pack",
"ms-vscode.test-adapter-converter",
"shengchen.vscode-checkstyle"
]


// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "java -version",

// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
//"remoteUser": "vscode",
//"features": {
// "github-cli": "latest"
//}
}

"customizations": {
"vscode": {
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"vscjava.vscode-java-pack",
"ms-vscode.test-adapter-converter",
"shengchen.vscode-checkstyle",
"mechatroner.rainbow-csv",
"redhat.vscode-xml",
"vscjava.vscode-java-test"
],
"settings": {
"java.configuration.updateBuildConfiguration": "interactive",
"[java]": {
"editor.defaultFormatter": "redhat.java",
"editor.formatOnSave": true,
"editor.tabSize": 2,
"editor.insertSpaces": true,
"editor.detectIndentation": false
},
"java.format.settings.url": "https://raw.githubusercontent.com/google/styleguide/gh-pages/eclipse-java-google-style.xml",
"java.saveActions.organizeImports": true,
"java.checkstyle.version": "10.15.0",
"java.checkstyle.configuration": "${workspaceFolder}/checkstyle_neqsim.xml",
"[xml]": {
"editor.tabSize": 4,
"editor.insertSpaces": false
},
"[json]": {
"editor.tabSize": 4,
"editor.insertSpaces": true
}
}
}
}
}
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/newrelease.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
name: New release
about: Prepare for new release
title: ''
labels: ''
assignees: ''

---

**Why do we need a new release? Please describe.**
...
24 changes: 0 additions & 24 deletions .github/workflows/build.yml

This file was deleted.

28 changes: 28 additions & 0 deletions .github/workflows/maven_publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Publish package to the Maven Central Repository
on:
workflow_dispatch:
release:
types: [published]
jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Set up Maven Central Repository
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'
server-id: central
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Set version
run: mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
- name: Publish package
run: mvn -P release --batch-mode deploy -DskipTests
env:
MAVEN_USERNAME: ${{ secrets.CENTRAL_TOKEN_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.CENTRAL_TOKEN_PASSWORD }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_SIGNING_KEY_PASSWORD }}
19 changes: 0 additions & 19 deletions .github/workflows/pr_test.yml

This file was deleted.

21 changes: 21 additions & 0 deletions .github/workflows/publish_javadoc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Deploy Javadoc

on:
workflow_dispatch:
release:
types: [published]

jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: write # if you have a protection rule on your repository, you'll need to give write permission to the workflow.
steps:
- name: Deploy JavaDoc 🚀
uses: MathieuSoysal/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
javadoc-branch: javadoc
java-version: 17
target-folder: javadoc # url will be https://equinor.github.io/neqsim/javadoc
project: maven
Original file line number Diff line number Diff line change
@@ -1,22 +1,24 @@
name: Release to Github Packages
name: Release to Github Packages

on:
workflow_dispatch:
push:
tags:
- v*
branches:
- release/*

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
- name: Set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
java-version: 11
- name: Get the version
distribution: 'temurin'
cache: 'maven'
- name: Get the version number from the pushed tag
id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\/v/}
- name: Deploy to Github Package Registry
Expand Down
Loading

0 comments on commit 8bf9809

Please sign in to comment.