Code

Epanet2.3 new updates#62

Code

Open

ichrys03 wants to merge 148 commits intoOpenWaterAnalytics:dev2.3OpenWaterAnalytics/EPyT:dev2.3from ichrys03:epanet2.3-undercoverichrys03/EPyT:epanet2.3-undercoverCopy head branch name to clipboard

+2,965-752

Commits

Commits on Aug 8, 2024

• 2.3 library update

  ichrys03

  committed
  40982c7

  Copy full SHA for 40982c7

• Update 2.3 EN_setcurvetype (api)

  ichrys03

  committed
  cd6f469

  Copy full SHA for cd6f469

• update 2.3 def EN_setvertex api

  ichrys03

  committed
  5191749

  Copy full SHA for 5191749

• update 2.3 EN_timetonextevent api

  ichrys03

  committed
  a238034

  Copy full SHA for a238034

• 2.3 EN_getcontrolenabled api

  ichrys03

  committed
  2890262

  Copy full SHA for 2890262

• 2.3 EN_setcontrolenabled api

  ichrys03

  committed
  9140058

  Copy full SHA for 9140058

• 2.3 EN_getruleenabled api

  ichrys03

  committed
  b469b2c

  Copy full SHA for b469b2c

• 2.3 EN_setruleenabled api

  ichrys03

  committed
  203bd4e

  Copy full SHA for 203bd4e

• 2.3 EN_openX api

  ichrys03

  committed
  36ee4d8

  Copy full SHA for 36ee4d8

• 2.3 EN_getlinksvalues api

  ichrys03

  committed
  0b68449

  Copy full SHA for 0b68449

• 2.3 EN_loadpatternfile api

  ichrys03

  committed
  e56468c

  Copy full SHA for e56468c

• setCurvetype()

  ichrys03

  committed
  838847e

  Copy full SHA for 838847e

• 2.3 setvertex()

  ichrys03

  committed
  2908856

  Copy full SHA for 2908856

• 2.3 timetonexteven

  ichrys03

  committed
  9bf105e

  Copy full SHA for 9bf105e

• 2.3 getcontrolenabled()

  ichrys03

  committed
  e240a89

  Copy full SHA for e240a89

• 2.3 setcontrolenabled()

  ichrys03

  committed
  bb6e63c

  Copy full SHA for bb6e63c

• 2.3 getruleenabled()

  ichrys03

  committed
  2845ae6

  Copy full SHA for 2845ae6

• 2.3 setruleenabled()

  ichrys03

  committed
  d8bb7c4

  Copy full SHA for d8bb7c4

Commits on Aug 9, 2024

• 2.3 openX()

  ichrys03

  committed
  a3bb023

  Copy full SHA for a3bb023

• 2.3 loadpatternfile()

  ichrys03

  committed
  7c7abb9

  Copy full SHA for 7c7abb9

• 2.3 getlinksvalues()

  ichrys03

  committed
  1201e3a

  Copy full SHA for 1201e3a

Commits on Aug 23, 2024

• function getlinkvalues() from update 2.3 tested

  ichrys03

  committed
  f7d95ca

  Copy full SHA for f7d95ca

Commits on Aug 26, 2024

• setCurveType tested, now with comments + getLinkValues

  ichrys03

  committed
  50a7d0f

  Copy full SHA for 50a7d0f

• minor fix with setCurveType now shows errorcode + setVertex() now has comments

  Show description for 4eed1f7
  ichrys03

  committed
  4eed1f7

  Copy full SHA for 4eed1f7

• Update epanet.py

  ichrys03

  committed
  41c3c56

  Copy full SHA for 41c3c56

• minor fix

  ichrys03

  committed
  3a992d5

  Copy full SHA for 3a992d5

• getControlEnabled() + setControlEnabled()

  ichrys03

  committed
  925c157

  Copy full SHA for 925c157

• getRuleEnabled() + setRuleEnabled()

  ichrys03

  committed
  b91cb84

  Copy full SHA for b91cb84

• loadPatternfile()

  ichrys03

  committed
  9c3f978

  Copy full SHA for 9c3f978

• openX()

  ichrys03

  committed
  2edaa97

  Copy full SHA for 2edaa97

• error message added

  ichrys03

  committed
  a0f089a

  Copy full SHA for a0f089a

Commits on Aug 28, 2024

• Unit test update 2.3 setcurvetype()

  ichrys03

  committed
  2553102

  Copy full SHA for 2553102

• Unit test update 2.3 set/get control enabled

  ichrys03

  committed
  0ed2780

  Copy full SHA for 0ed2780

• unitest for getlinkvalues

  ichrys03

  committed
  0573879

  Copy full SHA for 0573879

Commits on Aug 29, 2024

• major fix

  ichrys03

  committed
  f6fc1d2

  Copy full SHA for f6fc1d2

Commits on Sep 3, 2024

• typepump index 3 added 2.3 update

  ichrys03

  committed
  3fd0919

  Copy full SHA for 3fd0919

• Underscore typo functions 2.3

  ichrys03

  committed
  c35e368

  Copy full SHA for c35e368

• setControlEnabled() function splitted into 2 functions setControlEnabled and setControlDisabled, same arguments apply for setRuleEnabled() for update 2.3

  ichrys03

  committed
  5a37717

  Copy full SHA for 5a37717

• typo fix getControlRulesCount() -> getControlCount

  ichrys03

  committed
  90be47c

  Copy full SHA for 90be47c

• typo fixed with warning to users that already have been using the function

  ichrys03

  committed
  839ef00

  Copy full SHA for 839ef00

• getControlEnabled() now works without arguments to get all items update 2.3

  ichrys03

  committed
  8807f93

  Copy full SHA for 8807f93

• getRulesEnabled() now works without arguments to get all items update 2.3

  ichrys03

  committed
  cb0722b

  Copy full SHA for cb0722b

Commits on Sep 7, 2024

• getControlEnabled() renamed to getControlState() for users

  ichrys03

  committed
  a8b1755

  Copy full SHA for a8b1755

• setcontroldisabled and set ruleenabled removed , back with setcontrolenabled

  ichrys03

  committed
  801455f

  Copy full SHA for 801455f

Commits on Sep 10, 2024

• new param added update 2.3 to create setStartTime()

  ichrys03

  committed
  3a3767e

  Copy full SHA for 3a3767e

• 4 new option constants added for update 2.3

  ichrys03

  committed
  76265d8

  Copy full SHA for 76265d8

• setPressureUnit() for options (function) added. update 2.3

  ichrys03

  committed
  6219e51

  Copy full SHA for 6219e51

• getPressureUnit() function added update 2.3

  ichrys03

  committed
  927b36b

  Copy full SHA for 927b36b

• new constants for nodes update 2.3

  ichrys03

  committed
  02de18f

  Copy full SHA for 02de18f

• get statusreport/nodeemitterflow() added update 2.3

  ichrys03

  committed
  1570813

  Copy full SHA for 1570813

• new constants added update 2.3

  ichrys03

  committed
  c25114f

  Copy full SHA for c25114f

• new link constants parameters added for update 2.3

  ichrys03

  committed
  454a847

  Copy full SHA for 454a847

• set/get for GPVCurver and PVCCurve

  ichrys03

  committed
  6b2b790

  Copy full SHA for 6b2b790

• get/set DefaultTimePat update 2.3

  ichrys03

  committed
  be076b3

  Copy full SHA for be076b3

• Curve constants added 2.3 update

  ichrys03

  committed
  6422925

  Copy full SHA for 6422925

• typepump comment

  ichrys03

  committed
  f405285

  Copy full SHA for f405285

• Constant added update 2.3

  ichrys03

  committed
  3afab22

  Copy full SHA for 3afab22

• get/set LinkLeakArea & LinkExpansionProp

  ichrys03

  committed
  8c1dee0

  Copy full SHA for 8c1dee0

• getLinkLeakageRate() added 2.3 update

  ichrys03

  committed
  76fe5cf

  Copy full SHA for 76fe5cf

• getNodeLeageDemand & getTotalLeageLoss added, update 2.3

  ichrys03

  committed
  962b960

  Copy full SHA for 962b960

• new functions from update 2.3

  ichrys03

  committed
  68980d3

  Copy full SHA for 68980d3

Commits on Sep 12, 2024

• setCurveType() -> split into 5 types setCurveTypeVolume(),setCurveTypePump,(),setCurveTypeEfficiency(),setCurveTypeHeadloss() and setCurveTypeGeneral()

  ichrys03

  committed
  8414557

  Copy full SHA for 8414557

• The method set /get GPVCurve has been renamed to set/get LinkValveCurveGPV to provide clearer naming and indicate the relationship to link valve GPV/PCV curves.

  ichrys03

  committed
  0ecad3b

  Copy full SHA for 0ecad3b

• +

  ichrys03

  committed
  8932fb6

  Copy full SHA for 8932fb6

• set/get timestarttime has been renamed to set/get TimeClockStartTime() to provide clearer naming

  ichrys03

  committed
  1dfdce4

  Copy full SHA for 1dfdce4

• Performance Example for new function getLinkValues() update 2.3

  ichrys03

  committed
  aa6a3c1

  Copy full SHA for aa6a3c1

• getPatternAverageDefaultValue() update 2.3 function

  ichrys03

  committed
  13d44bb

  Copy full SHA for 13d44bb

• set/get OptionsDemandPattern() update 2.3 update

  ichrys03

  committed
  f999c99

  Copy full SHA for f999c99

• Warning message if the network is not fully connected update 2.3 (now networks open even if they are not fully connected)

  ichrys03

  committed
  a6cd366

  Copy full SHA for a6cd366

Commits on Sep 13, 2024

• 2 functions added update 2.3 (addLinkValvePCV + setLinkTypeValvePCV)

  ichrys03

  committed
  589facd

  Copy full SHA for 589facd

• new functions added set/get OptionsEmitterBackFlow() update 2.3

  ichrys03

  committed
  ce87433

  Copy full SHA for ce87433

• Refactor : from ENgetLinkValues(code) - > __getLinkInfo(code,*argv)

  ichrys03

  committed
  25673aa

  Copy full SHA for 25673aa

• update 2.3 EN_timetonextevent function fixed

  ichrys03

  committed
  fff4cec

  Copy full SHA for fff4cec

Commits on Sep 17, 2024

• ENgettimetonextevent ->{getTimetoNextEventIndex, getTimeDurationtoNextEvent,getTimeNextEventtoType} update2.3

  ichrys03

  committed
  dcca1e9

  Copy full SHA for dcca1e9

Commits on Sep 26, 2024

• getoNodeEmitterFlow now accepts *argv as input

  ichrys03

  committed
  43aa8bc

  Copy full SHA for 43aa8bc

• getTimeToNextEvent function update 2.3

  ichrys03

  committed
  3f1bab8

  Copy full SHA for 3f1bab8

• setoptionsemmiterbackflowAllowed and dissalowed update 2.3

  ichrys03

  committed
  78bed9e

  Copy full SHA for 78bed9e

• new constants update 2.3

  ichrys03

  committed
  0ed429b

  Copy full SHA for 0ed429b

• setOptionsStatusReport slit to 3 functions -> setOptionsStatusReportNo,setOptionsStatusReportFull & setOptiosStatusReportNormal update 2.3

  ichrys03

  committed
  c2347ec

  Copy full SHA for c2347ec

• new constants update 2.3 for pressure unit type

  ichrys03

  committed
  9aa6c00

  Copy full SHA for 9aa6c00

• setOptionsPressureUnits split to -> setOptionsPressureUnitsMeters, setOptionsPressureUnitsPSI & setOptionsPressureUnitsKPA

  ichrys03

  committed
  56c8d79

  Copy full SHA for 56c8d79

• ENsetOption for status report now is called with constants from toolkit.

  ichrys03

  committed
  e77f428

  Copy full SHA for e77f428

• getpressureunit to getOptionspressureunits()

  ichrys03

  committed
  62d455f

  Copy full SHA for 62d455f

• setOptionsCurveType now uses toolkitconstants

  ichrys03

  committed
  8894a23

  Copy full SHA for 8894a23

• new function setCurveTypeValveCurve() update 2.3

  ichrys03

  committed
  eb76cf8

  Copy full SHA for eb76cf8

• getOptionsPressureUnits() now returns string instead of integer

  ichrys03

  committed
  8826cd8

  Copy full SHA for 8826cd8

• new constants for demand driven analysis and pressure driven analysis

  ichrys03

  committed
  69153b3

  Copy full SHA for 69153b3

• getNodeInControl / getLinkInControl new functions update 2.3

  ichrys03

  committed
  fe15d38

  Copy full SHA for fe15d38

• getNodeLeakageDemand() typo fix

  ichrys03

  committed
  65bb907

  Copy full SHA for 65bb907

• fix for new functions missing argument update 2.3

  ichrys03

  committed
  c212438

  Copy full SHA for c212438

Commits on Sep 28, 2024

• typo link instead of node

  ichrys03

  committed
  3dfd1db

  Copy full SHA for 3dfd1db

Commits on Oct 3, 2024

• removed duplicate functions

  ichrys03

  committed
  358dd1b

  Copy full SHA for 358dd1b

• fixed for getnodeincontrol and getlinkincontrol where the output was float instead of int

  ichrys03

  committed
  6620563

  Copy full SHA for 6620563

• getNodeInControl() and getLinkInControl() can be called by 4 different ways : d.getNodeInControl() -> will return all values (0 or 1) for Nodes ,d.getNodeInControl(2) will return node index 2 ,d.ge…

  Show description for 194c044
  ichrys03

  committed
  194c044

  Copy full SHA for 194c044

• Revert "getNodeInControl() and getLinkInControl() can be called by 4 different ways : d.getNodeInControl() -> will return all values (0 or 1) for Nodes ,d.getNodeInControl(2) will return node index…

  Show description for 7ee7cd1
  ichrys03

  committed
  7ee7cd1

  Copy full SHA for 7ee7cd1

• Revert "getNodeInControl() and getLinkInControl() can be called by 4 dif… …ferent ways : d.getNodeInControl() -> will return all values (0 or 1) for Nodes ,d.getNodeInControl(2) will return node in…

  Show description for 8afb873
  ichrys03

  committed
  8afb873

  Copy full SHA for 8afb873

• update 2.3 setFLowUnitsCMS() new function

  ichrys03

  committed
  f1b8d4d

  Copy full SHA for f1b8d4d

• getStatistic got another property .TotalLeakageLoss update 2.3

  ichrys03

  committed
  96c8b09

  Copy full SHA for 96c8b09

• getstatistic splitted into 5 new functions

  ichrys03

  committed
  7f3a6e6

  Copy full SHA for 7f3a6e6

• after every function is called there is a check for errors. if an error occurs now instead of the normal error message with the code , a new error will generated that includes the name of the funct…

  Show description for ab8ae46
  ichrys03

  committed
  ab8ae46

  Copy full SHA for ab8ae46

Commits on Oct 4, 2024

• fix with program starting with errors

  ichrys03

  committed
  1de5053

  Copy full SHA for 1de5053

• smooth error messages for users 1 line instead of 2-3 lines for each error

  ichrys03

  committed
  4577fa6

  Copy full SHA for 4577fa6

• Changed variables for easier understanding(item - > function_id) and updated functions for better usability

  ichrys03

  committed
  d65b822

  Copy full SHA for d65b822

• Updated comments for the family of functions using setFlowUnits.

  ichrys03

  committed
  ec5c73a

  Copy full SHA for ec5c73a

• Function that checks the current flow units and returns whether it's PSI or KPA and METERS.

  ichrys03

  committed
  135b8f8

  Copy full SHA for 135b8f8

• Function that checks if the change of metric is possible; if not, it recommends a set of functions to the user to make it possible.

  ichrys03

  committed
  681bb9d

  Copy full SHA for 681bb9d

• Comments for set of functions -> setOptionsPressureUnits

  ichrys03

  committed
  dcc1ca2

  Copy full SHA for dcc1ca2

• comments for set of functions -> setOptionsStatusReport

  ichrys03

  committed
  f60aec4

  Copy full SHA for f60aec4

• Comments for get/set LinkLeakArea

  ichrys03

  committed
  5d8e22f

  Copy full SHA for 5d8e22f

• comments for get/set LinkExpansionProperties()

  ichrys03

  committed
  450b9f0

  Copy full SHA for 450b9f0

• removed duplicate function getConsumerDemandDeficit -> getNodeDemandDeficit() exists

  ichrys03

  committed
  d8d4dcd

  Copy full SHA for d8d4dcd

• Comments for non user functions

  ichrys03

  committed
  a46d2e3

  Copy full SHA for a46d2e3

• Coments for getLinkInControl & getNodeInControl

  ichrys03

  committed
  c8157e9

  Copy full SHA for c8157e9

• fix on setVertex() from float to double and updated example

  ichrys03

  committed
  2fa0984

  Copy full SHA for 2fa0984

• comments for set/get LinkValveCurveGPV/PCV

  ichrys03

  committed
  44c97a8

  Copy full SHA for 44c97a8

• comments getTimeofNextEvent

  ichrys03

  committed
  9759846

  Copy full SHA for 9759846

• comments for statistics functions

  ichrys03

  committed
  565d3b6

  Copy full SHA for 565d3b6

• comments

  ichrys03

  committed
  b312400

  Copy full SHA for b312400

Commits on Oct 6, 2024

• updated readme and comments

  ichrys03

  committed
  f351184

  Copy full SHA for f351184

Commits on Oct 7, 2024

• updated readme + comments + private functions

  ichrys03

  committed
  2c46f6c

  Copy full SHA for 2c46f6c

• typo in readme

  ichrys03

  committed
  8cace5a

  Copy full SHA for 8cace5a

• private function

  ichrys03

  committed
  87b0576

  Copy full SHA for 87b0576

Commits on Oct 8, 2024

• Users will now be able to see the line of error in their code, along with a link.

  ichrys03

  committed
  22ca820

  Copy full SHA for 22ca820

• fix :memory violation error with changeMSXOptions

  ichrys03

  committed
  acf80da

  Copy full SHA for acf80da

• typofix

  ichrys03

  committed
  e7bd168

  Copy full SHA for e7bd168

• Update epanet.py

  ichrys03

  committed
  e061497

  Copy full SHA for e061497

• fix in genral unit test

  ichrys03

  committed
  ec38a6c

  Copy full SHA for ec38a6c

• unit_test update 2.3

  ichrys03

  committed
  73d1a41

  Copy full SHA for 73d1a41

• unit test and example for new functions update 2.3

  ichrys03

  committed
  2bcde51

  Copy full SHA for 2bcde51

• library for linux update 2.3

  ichrys03

  committed
  de3070c

  Copy full SHA for de3070c

• test1

  ichrys03

  committed
  8d361ff

  Copy full SHA for 8d361ff

• Update general_unit_test.py

  ichrys03

  committed
  365f219

  Copy full SHA for 365f219

Commits on Oct 9, 2024

• mac libraries

  ichrys03

  committed
  d1602eb

  Copy full SHA for d1602eb

• mac_libaries update

  ichrys03

  committed
  7056b72

  Copy full SHA for 7056b72

• mac libraries

  ichrys03

  committed
  85c07e5

  Copy full SHA for 85c07e5

• Update epanet.py

  ichrys03

  committed
  1a43916

  Copy full SHA for 1a43916

• maclibs

  ichrys03

  committed
  8294396

  Copy full SHA for 8294396

• mac libs

  ichrys03

  committed
  5d7b4c5

  Copy full SHA for 5d7b4c5

• Update epanetmsx.dylib

  ichrys03

  committed
  6314958

  Copy full SHA for 6314958

Commits on Oct 15, 2024

• Update general_unit_test.py

  ichrys03

  committed
  0a90a7d

  Copy full SHA for 0a90a7d

• Update epanet.py

  ichrys03

  committed
  81f3cd0

  Copy full SHA for 81f3cd0

• Revert "Update epanet.py"

  Show description for 07b98db
  ichrys03

  committed
  07b98db

  Copy full SHA for 07b98db

• Revert "Update general_unit_test.py"

  Show description for 7764345
  ichrys03

  committed
  7764345

  Copy full SHA for 7764345

Commits on Oct 22, 2024

• general unit test fix?

  ichrys03

  committed
  f0d7115

  Copy full SHA for f0d7115

• unit_test leakage from epanet 2.3 update + some set functions now return their error

  ichrys03

  committed
  267f49d

  Copy full SHA for 267f49d

Commits on Oct 24, 2024

• test unit leakage with EN functions

  ichrys03

  committed
  0e9b9fb

  Copy full SHA for 0e9b9fb

• revert changes

  ichrys03

  committed
  83f2dc6

  Copy full SHA for 83f2dc6

Commits on Nov 12, 2024

• Users can now include an id column which contains the node or link IDs from the EPANET model by setting the id parameter to True

  Show description for e4cd12f
  ichrys03

  committed
  e4cd12f

  Copy full SHA for e4cd12f