Commit Graph

209 Commits

Author SHA1 Message Date
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
Elad Salomons
395533c53d Remove hard coded version number
This should close #17
2015-11-29 22:33:30 +02:00
Elad Salomons
096167af8b Change ENgetheadcurve to ENgetheadcurveindex
Closes #31
2015-11-28 00:21:36 +02: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
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
Elad Salomons
942a3f2860 Fix typo on vb.net header file 2015-09-29 23:23:14 +03:00
Elad Salomons
8be1fcffd6 Fix header file 2015-09-24 12:55:29 +03:00
Elad Salomons
322a3cb463 Added pump's type constants to header files 2015-09-23 15:31:29 +03:00
Elad Salomons
f894ade5ee Fix case when no section at top of input file
This fixes issue #13
2015-09-20 22:44:31 +03:00
Elad Salomons
bdcf3d77d5 Fix header typo 2015-09-20 21:57:09 +03:00
Elad Salomons
472d9dd35b Added curves SET functions
ENsetcurvevalue, ENsetcurve and ENaddcurve
This should close issue #9
2015-09-18 14:54:43 +03:00
Elad Salomons
02a42fe16b Added curve GET functions
ENgetcurveindex, ENgetcurveid, ENgetcurvelen and ENgetcurvevalue. This
is for issue #9
2015-09-18 13:03:53 +03:00
Elad Salomons
a31e4242f3 Update sample networks 2015-09-16 23:32:14 +03:00
Sam Hatchett
c4abd61b1f cleans up the AUTHORS file generation script and mailmap
fixes #28
2015-09-16 16:07:03 -04:00
Elad Salomons
c23c846cd8 replace strlcpy with strncpy 2015-09-15 22:38:13 +03:00
Sam Hatchett
b62f179e96 more build file targets related to float-precision builds, and comments about the use of that define 2015-09-15 11:42:07 -04:00
Sam Hatchett
7dfd7f748d fixes mac compilation, adds sample networks and debug schema 2015-09-15 10:46:37 -04:00
Sam Hatchett
cb8dc35cae fixes version numbering 2015-09-15 10:46:18 -04:00
Sam Hatchett
7336d7a69d resolve git conflict 2015-09-15 10:46:06 -04:00
Sam Hatchett
c9839c0eb3 adding authors listing tool and initial AUTHORS file 2015-09-15 10:45:51 -04:00
Sam Hatchett
72a9ce3026 Merge branch 'patch-2-0-13' into dev-2.1 2015-09-15 10:33:50 -04:00
Sam Hatchett
3c8d8d7211 free allocated char* for hash table entry key 2015-09-15 10:33:20 -04:00
Sam Hatchett
3f2e9eebfe Merge branch 'hash-string-copy-fix' into dev-2.1 2015-09-15 10:30:40 -04:00
Sam Hatchett
79d215732c Merge branch 'coordinates-getter' into dev-2.1
Conflicts resolved in :
	build/Linux/Makefile
	build/Linux/Makefile_Rev
	build/Xcode/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
2015-09-15 10:29:27 -04:00
Sam Hatchett
3fde235ab7 fixing string copy action for hash table insertion 2015-09-15 10:12:07 -04:00
Sam Hatchett
13f5741310 moving Xcode build files 2015-09-15 10:02:00 -04:00
Elad Salomons
2c46a002ba Changed coordinates are saved to INP
Added a flag which controls the loading of coordinates at epanet.c line
213.
When set to TRUE coordinates are loaded and users can use the ENgetcoord
and ENsetcoord functions. Changes are then saved when ENsaveinpfile is
called.
When set to FALSE coordinates are not loaded and can't be retrieved or
changed. When saved, the COORD section is copied from the original INP
file.
2015-09-13 12:56:28 +03:00
Elad Salomons
913f48f11a minor fix to VB6 & VBA include file 2015-09-13 09:56:21 +03:00
Elad Salomons
c12f901454 added ENsetcoord function
also minor fix to include files
2015-09-13 09:53:21 +03:00
Elad Salomons
4d6bcef623 rewrite the coordinate getter
currently controlled from input2.c lines 297-298. will need to add a
flag to not load the coordinates.
2015-09-12 16:34:52 +03:00
Elad Salomons
186f21f9a7 update coord struct 2015-09-12 11:54:57 +03:00