Commit Graph

290 Commits

Author SHA1 Message Date
Sam Hatchett
cb417ce08b Merge pull request #59 from bemcdonnell/dev-2.1
Minor updates to ENOutputWrapper.py; Adding OutDiff.py
2015-12-17 11:48:32 -05:00
Sam Hatchett
70e1eb5818 Merge pull request #58 from OpenWaterAnalytics/dev-2.1-test-network-script
Dev 2.1 test network script
2015-12-17 11:48:11 -05:00
Bryant McDonnell
b2309e257a Minor updates to ENOutputWrapper.py; Adding OutDiff.py 2015-12-16 22:09:38 -05:00
Sam Hatchett
523dee5412 adds/fixes attribution 2015-12-16 16:28:40 -05:00
Sam Hatchett
de211562f2 adds cmake build for ENBOF 2015-12-16 16:28:40 -05:00
Sam Hatchett
96cf6ece16 Revert "adds/fixes attribution"
This reverts commit 2f344d4884.
2015-12-15 20:41:54 -05:00
Sam Hatchett
6579a83ba3 fake files for test iteration 2015-12-15 20:39:03 -05:00
Sam Hatchett
92ea5a84a7 testing scripts and travis invocation 2015-12-15 20:38:53 -05:00
Sam Hatchett
2f344d4884 adds/fixes attribution 2015-12-15 16:40:01 -05:00
Sam Hatchett
dd5d3d2e36 adds cmake build for ENBOF 2015-12-15 16:39:47 -05:00
Elad Salomons
32fa8feda7 Fix ENgetheadcurveindex VB header 2015-12-12 21:23:07 +02:00
Sam Hatchett
ab470ba4e1 adding brief orientation for the contribution workflow 2015-12-10 22:15:22 -05:00
Sam Hatchett
a86e330dbb Merge pull request #52 from bemcdonnell/dev-2.1
Adding Python wrapper for outputapi
2015-12-10 21:39:37 -05:00
Bryant McDonnell
44ad6e841a Adding Python wrapper for outputapi 2015-12-10 20:54:57 -05:00
Elad Salomons
ec04b7f535 Initial commit of VB6 code to perform comparison of binary output files
Related to #16
2015-12-10 22:57:16 +02:00
Elad Salomons
19f04fb8b3 Add WIN build for linked EXE
Now the WIN build script supports two options: one is a standalone EXE
were the entire code base is compiled into one EXE file and the second
is an EXE which is linked to the DLL
2015-12-09 21:55:16 +02:00
Sam Hatchett
4ccab6a27e simplify cmake file 2015-12-07 17:18:30 -05:00
Elad Salomons
99a215b88a Change VERSION to ENGINE_VERSION
Also changed it form 200 to 201 as some changes were made to the engine
in 2.1.

Closes #27
2015-12-07 22:18:05 +02:00
Elad Salomons
3c006d724e Add more checks for ENsetnodevalue tank properties
Work in progress for issue #29
2015-12-06 13:01:20 +02:00
Sam Hatchett
9ff4afe6cb change badge ref for tests 2015-12-04 16:42:12 -05:00
Sam Hatchett
7351bd9a94 Merge pull request #51 from OpenWaterAnalytics/dev-2.1-travis-ci
adds travis-ci integration (basic build)
2015-12-04 16:41:26 -05:00
Sam Hatchett
5297407d3e Merge pull request #50 from michaeltryby/dev-2.1
Initial commit for EPANET binary output API
2015-12-04 16:38:45 -05:00
Sam Hatchett
b937ff8e04 update readme with travis badge 2015-12-04 16:24:39 -05:00
Sam Hatchett
655f5021b5 experiment with travis ci 2015-12-04 16:04:19 -05:00
Michael Tryby
2f00a822c5 Initial commit for EPANET binary output API 2015-12-04 15:46:32 -05:00
Elad Salomons
4e965f1dd7 Merge pull request #45 from mauriziocingi/dev-2.1
issue #44 memory leak
2015-12-01 13:10:28 +02:00
Maurizio Cingi
22f6cbb46d issue #44 memory leak
node coordinates deallocation added in freedata()
2015-12-01 11:57:50 +01:00
Sam Hatchett
6e7cf5f02a more dox, nesting pages
#33
2015-11-30 12:02:01 -05:00
Elad Salomons
395533c53d Remove hard coded version number
This should close #17
2015-11-29 22:33:30 +02:00
sam hatchett
23ac6e5a55 clean up old comment block. 2015-11-28 18:59:49 -05:00
sam hatchett
90c2dfa0c4 complete function description. still needs user manual "application" examples 2015-11-28 18:58:49 -05:00
Sam Hatchett
92517b3944 declare curve-related functions in module 2015-11-28 17:10:26 -05:00
sam hatchett
5d2a1f82b5 finish moving defines to enums for better documentation 2015-11-28 13:28:32 -05:00
sam hatchett
bcc1dcc806 Merge branch 'dev-2.1' into doxy-trial
# Conflicts fixed:
#	include/epanet2.h
#	src/epanet.c
2015-11-28 13:22:45 -05:00
sam hatchett
0745b6b448 adding main page content 2015-11-28 13:04:22 -05:00
sam hatchett
82e8d2a329 Merge remote-tracking branch 'origin/dev-2.1' into dev-2.1 2015-11-28 12:41:09 -05:00
Elad Salomons
096167af8b Change ENgetheadcurve to ENgetheadcurveindex
Closes #31
2015-11-28 00:21:36 +02:00
Sam Hatchett
d191ec73d6 xcode build file update to use correct input files 2015-11-25 19:41:38 -05:00
Sam Hatchett
8ef2f7e3e3 Merge pull request #39 from mauriziocingi/dev-2.1
organize the division between DLL and CLE
2015-11-25 19:28:51 -05:00
Sam Hatchett
e28f24af3c migrating from defines to enums, and moving some documentation blocks into doxygen format 2015-11-25 19:26:47 -05:00
Maurizio Cingi
60dc2870f5 adapted Linux/Makefile and created runepanet.sh.template 2015-11-25 12:03:51 +01:00
Maurizio Cingi
1905c1011c adapted Linux/Makefile and created runepanet.sh.template 2015-11-25 12:01:51 +01:00
Maurizio Cingi
f89515febd added TmpOutFile=NULL; after closing TmpOutFile
In case of [TIMES] Statistic not equal NONE (see page 174 of Epanet2 users manual) ENclose() function tries to close TmpOutFile again giving a "double free or corruption" error
2015-11-24 19:49:13 +01:00
mauriziocingi
08937fc838 resolved no_args bug 2015-11-23 11:16:11 +01:00
mauriziocingi
ea08fb9da1 undone Warnflag declaration due to cl.exe incompatibilities , now Warnflag is retuned with errorcode 2015-11-20 13:35:40 +01:00
Sam Hatchett
3151805675 Merge pull request #37 from mauriziocingi/dev-2.1
added Warnflag in exported symbols
2015-11-18 08:17:57 -05:00
mauriziocingi
cca1cda37a added Warnflag in exported symbols 2015-11-04 13:55:01 +01:00
Sam Hatchett
e484486915 moving more comments into dox, enum-wrapping and documenting property keys 2015-09-30 15:15:19 -04:00
Sam Hatchett
1c8b592e34 define module groups externally 2015-09-30 15:14:54 -04:00
Sam Hatchett
41c47bcc09 support dox in Xcode build 2015-09-30 15:14:40 -04:00