Michael Tryby
8dd917dfe5
Adding *.orig to .gitignore
2019-01-30 13:35:24 -05:00
Michael Tryby
725650853a
Merge remote-tracking branch 'upstream/dev' into dev-swig-redux
2019-01-30 13:29:48 -05:00
Elad Salomons
bdbd23edba
Merge pull request #377 from Mariosmsk/patch-1
...
update example code Hydraulic & Quality analysis steps
2019-01-30 19:47:32 +02:00
Lew Rossman
ba8926e4c4
Merge pull request #378 from LRossman/lrossman-dev
...
Minor edits to documentation
2019-01-29 19:17:41 -05:00
Marios S. Kyriakou
5adc02bc99
call ENnextH before ENnextQ
2019-01-29 18:50:17 +02:00
Lew Rossman
67947e5ea8
Minor edits to documentation
2019-01-29 09:46:14 -05:00
Michael Tryby
8d12664061
Removing EN_API_FLOAT_TYPE
2019-01-28 11:31:31 -05:00
Michael Tryby
b339ff22ca
Merging dev into dev-swig-redux
2019-01-28 11:23:25 -05:00
Michael Tryby
30c9843965
Merge remote-tracking branch 'upstream/dev' into dev-swig-redux
2019-01-28 10:41:23 -05:00
Marios S. Kyriakou
d5e467fe47
Update ReleaseNotes2_1.md
2019-01-28 17:25:21 +02:00
Marios S. Kyriakou
c877730f6e
added the ENopenQ; in example code
...
for the hydraulic and water quality analysis steps
2019-01-28 17:24:07 +02:00
Lew Rossman
3b6b0d9f40
Merge pull request #374 from LRossman/lrossman-dev
...
Replaced the Doxygen files in the doc folder (issue #373 )
2019-01-25 15:38:25 -05:00
Lew Rossman
821d13497f
Replaced the Doxygen files in the doc folder (issue #373 )
2019-01-24 10:51:37 -05:00
Lew Rossman
2626ab9982
Merge pull request #372 from LRossman/lrossman-dev
...
New updates to address compiler warnings (issue #370 )
2019-01-22 10:50:07 -05:00
Lew Rossman
0cfa45e52e
New updates to address compiler warnings (issue #370 )
...
In addition to addressing compiler warnings, argument names in the API function prototypes were made more consistent and descriptive. Also additional Doxygen comments were added in preparation for producing a more thorough documentation of the API.
2019-01-19 16:56:19 -05:00
Lew Rossman
414db4d7e2
Merge pull request #369 from LRossman/lrossman-dev
...
Floating pt. args in thread-safe API changed to doubles (Issue #365 )
2019-01-16 09:20:34 -05:00
Lew Rossman
f673aa2f20
Modifications made to EN_getlinkvalue & EN_setlinkvalue in EPANET.C
...
1. EN__PUMP_ECOST added to EN_getlinkvalue.
2. Order of cases in switch statement of both EN_getlinkvalue and EN_setlinkvalue changed to match the order of EN_LinkProperty enumeration.
2019-01-11 12:52:09 -05:00
Elad Salomons
23e542a492
Mark VB reserved words in variable names
...
I have marked the VB reserved words with an ending "_". Sorry the IDE messed the nice spacing...
2019-01-10 08:39:49 +02:00
Lew Rossman
dd376692ad
Floating pt. args in thread-safe API changed to doubles (Issue #365 )
2019-01-09 15:14:10 -05:00
Lew Rossman
15bc01253b
Merge pull request #368 from LRossman/lrossman-dev
...
Added additional network building features (#367 )
2019-01-04 12:20:52 -05:00
Lew Rossman
baa7ba9357
Update ReleaseNotes2_2.md
2019-01-02 11:04:34 -05:00
Lew Rossman
628fffc718
Added additional network building features ( #367 )
2019-01-02 10:33:58 -05:00
Lew Rossman
9464465fa7
Merge pull request #363 from LRossman/lrossman-dev
...
Checks addded to prevent changing network structure when solver active (#361 )
2018-12-21 10:40:17 -05:00
Lew Rossman
3ce0361c1d
Network validity checks added to openhyd()
...
Checks on illegal valve connections made whenever API creates a new link, changes its end nodes, or changes its type.
2018-12-20 08:36:05 -05:00
Lew Rossman
a66f5a2c92
Checks addded to prevent changing network structure when solver active ( #361 )
2018-12-18 15:35:06 -05:00
Lew Rossman
311871b577
Merge pull request #360 from LRossman/lrossman-dev
...
Error reporting fixes and re-formatting (issue #358 )
2018-12-17 13:13:08 -05:00
Michael Tryby
fed58fdcbd
Updating benchmark version
2018-12-17 12:14:08 -05:00
Lew Rossman
f1175b1f92
Error reporting fixes and re-formatting (issue #358 )
2018-12-15 15:13:19 -05:00
Michael Tryby
9d83955129
Deleting test_epanet_py
2018-12-10 17:32:13 -05:00
Michael Tryby
186c17bb15
Adding file headers
2018-12-10 17:30:47 -05:00
Michael Tryby
9e3ecbd17f
Merge remote-tracking branch 'upstream/dev' into dev-swig-redux
2018-12-10 17:17:11 -05:00
Michael Tryby
51795d86e9
Adding API for simple and rule based controls
2018-12-10 15:53:38 -05:00
Michael Tryby
fca9c42411
Fixing arg as return with enum type
2018-12-07 16:23:12 -05:00
Lew Rossman
4e3b96e61c
Merge pull request #356 from LRossman/lrossman-dev
...
Re-write of main.c (issue #355 )
2018-12-07 16:15:54 -05:00
Lew Rossman
6783b68e4f
Set main() to return 100, not errmsg, if run has fatal error
2018-12-07 11:41:37 -05:00
Lew Rossman
e2ee4564a8
Return 0 from main.c if run has warnings
2018-12-07 09:46:15 -05:00
Michael Tryby
d5de19caa0
Ongoing dev
2018-12-06 17:48:32 -05:00
Lew Rossman
fa80bec8bb
Included error number as part of error message (issue #357 )
2018-12-06 11:40:59 -05:00
Lew Rossman
0930a64142
Re-write of main.c
2018-12-06 11:11:41 -05:00
Lew Rossman
5f2cd402ef
Merge pull request #354 from LRossman/lrossman-dev
...
Avoid possible divide by zero in hydcoeffs.c
2018-12-06 10:56:08 -05:00
Michael Tryby
c1adfd514d
Fleshing out api for swig wrap
2018-12-04 17:54:39 -05:00
Lew Rossman
107483bee8
Avoid possible divide by zero in hydcoeffs.c
2018-12-04 09:50:01 -05:00
Michael Tryby
b63f232884
Initial commit interface for python wrap
2018-11-30 15:49:28 -05:00
Michael Tryby
9ed3462dbf
Ignoring nrtestsuite/ and tests/data
2018-11-30 12:00:07 -05:00
Michael Tryby
98cb6b4d12
Merge pull request #353 from michaeltryby/dev
...
epanet toolkit api versioning
2018-11-30 09:38:04 -05:00
Michael Tryby
76a9dd999c
Fixing file header, adding epanet2.c to winbuild
2018-11-30 09:08:38 -05:00
Michael Tryby
b0c7714d72
Keeping legacy api in epanet2.h epanet2.c and moving new api to epanet2_2.h epanet.c
2018-11-29 12:51:47 -05:00
Michael Tryby
333e87b026
Fixing tests
2018-11-29 12:20:13 -05:00
Michael Tryby
fef02cd0a7
Merging origin dev
2018-11-29 12:02:10 -05:00
Michael Tryby
be2ca0a9f6
Implmenting Toolkit API versioning
2018-11-29 11:57:51 -05:00
