From e7ccf5281f5329b8715bec1596a92490c7d13623 Mon Sep 17 00:00:00 2001 From: Elad Salomons Date: Fri, 22 May 2020 21:43:14 +0300 Subject: [PATCH] Update include files --- include/epanet2.bas | 3 ++- include/epanet2.pas | 5 +++-- include/epanet2.vb | 7 +++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/epanet2.bas b/include/epanet2.bas index 1d6072c..b786bc5 100644 --- a/include/epanet2.bas +++ b/include/epanet2.bas @@ -25,7 +25,6 @@ Public Const EN_SOURCEMASS = 13 Public Const EN_INITVOLUME = 14 Public Const EN_MIXMODEL = 15 Public Const EN_MIXZONEVOL = 16 - Public Const EN_TANKDIAM = 17 Public Const EN_MINVOLUME = 18 Public Const EN_VOLCURVE = 19 @@ -37,6 +36,7 @@ Public Const EN_TANKVOLUME = 24 Public Const EN_MAXVOLUME = 25 Public Const EN_CANOVERFLOW = 26 Public Const EN_DEMANDDEFICIT = 27 +Public Const EN_NODE_INCONTROL = 28 Public Const EN_DIAMETER = 0 ' Link parameters Public Const EN_LENGTH = 1 @@ -61,6 +61,7 @@ Public Const EN_PUMP_HCURVE = 19 Public Const EN_PUMP_ECURVE = 20 Public Const EN_PUMP_ECOST = 21 Public Const EN_PUMP_EPAT = 22 +Public Const EN_LINK_INCONTROL = 23 Public Const EN_DURATION = 0 ' Time parameters Public Const EN_HYDSTEP = 1 diff --git a/include/epanet2.pas b/include/epanet2.pas index a532134..c1182ff 100644 --- a/include/epanet2.pas +++ b/include/epanet2.pas @@ -31,7 +31,6 @@ const EN_INITVOLUME = 14; EN_MIXMODEL = 15; EN_MIXZONEVOL = 16; - EN_TANKDIAM = 17; EN_MINVOLUME = 18; EN_VOLCURVE = 19; @@ -42,7 +41,8 @@ const EN_TANKVOLUME = 24; EN_MAXVOLUME = 25; EN_CANOVERFLOW = 26; - EN_DEMANDDEFICIT = 27; + EN_DEMANDDEFICIT = 27; + EN_NODE_INCONTROL = 28; EN_DIAMETER = 0; { Link parameters } EN_LENGTH = 1; @@ -67,6 +67,7 @@ const EN_PUMP_ECURVE = 20; EN_PUMP_ECOST = 21; EN_PUMP_EPAT = 22; + EN_LINK_INCONTROL = 23; EN_DURATION = 0; { Time parameters } EN_HYDSTEP = 1; diff --git a/include/epanet2.vb b/include/epanet2.vb index bfe65c2..0b84386 100644 --- a/include/epanet2.vb +++ b/include/epanet2.vb @@ -29,7 +29,6 @@ Public Const EN_SOURCEMASS = 13 Public Const EN_INITVOLUME = 14 Public Const EN_MIXMODEL = 15 Public Const EN_MIXZONEVOL = 16 - Public Const EN_TANKDIAM = 17 Public Const EN_MINVOLUME = 18 Public Const EN_VOLCURVE = 19 @@ -37,11 +36,11 @@ Public Const EN_MINLEVEL = 20 Public Const EN_MAXLEVEL = 21 Public Const EN_MIXFRACTION = 22 Public Const EN_TANK_KBULK = 23 - Public Const EN_TANKVOLUME = 24 Public Const EN_MAXVOLUME = 25 Public Const EN_CANOVERFLOW = 26 -Public Const EN_DEMANDDEFICIT = 27 +Public Const EN_DEMANDDEFICIT = 27 +Public Const EN_NODE_INCONTROL = 28 Public Const EN_DIAMETER = 0 ' Link parameters Public Const EN_LENGTH = 1 @@ -59,7 +58,6 @@ Public Const EN_SETTING = 12 Public Const EN_ENERGY = 13 Public Const EN_LINKQUAL = 14 Public Const EN_LINKPATTERN = 15 - Public Const EN_PUMP_STATE = 16 Public Const EN_PUMP_EFFIC = 17 Public Const EN_PUMP_POWER = 18 @@ -67,6 +65,7 @@ Public Const EN_PUMP_HCURVE = 19 Public Const EN_PUMP_ECURVE = 20 Public Const EN_PUMP_ECOST = 21 Public Const EN_PUMP_EPAT = 22 +Public Const EN_LINK_INCONTROL = 23 Public Const EN_DURATION = 0 ' Time parameters Public Const EN_HYDSTEP = 1