Sam Hatchett
e2a8e5a614
resolve conflict
2016-07-25 20:14:33 -04:00
Sam Hatchett
a4d27ad489
mac rpath in cmake
2016-07-25 20:12:02 -04:00
Sam Hatchett
ea6b3619f7
note about api float type
2016-07-21 11:39:16 -04:00
Elad Salomons
773705e3d2
Consistency change in ENgetcurve function call
2016-07-21 17:07:50 +03:00
Elad Salomons
754d24c118
Small fix to VB header file
...
and consistency in ENgetcurve function call
2016-07-21 17:04:29 +03:00
Elad Salomons
e42d59e754
Revert "Small VB header fix"
...
This reverts commit c81d2c6954
2016-07-21 17:01:38 +03:00
Elad Salomons
c81d2c6954
Small VB header fix
...
and consistency in ENgetcurve function call
2016-07-21 17:00:33 +03:00
Sam Hatchett
997c8839e1
Merge pull request #63 from mauriziocingi/patch-1
...
Update epanet.c
2016-07-20 16:29:52 -04:00
Elad Salomons
98e9a31eb3
Merge pull request #69 from eldemet/dev-2.1-windsdk
...
Windows compilation using SDK
2016-07-15 10:46:28 +03:00
eldemet
1d83b69427
deleted redundant bat files
2016-07-15 09:53:26 +03:00
eldemet
c098ca286a
Create Makefile.bat
2016-07-15 09:48:43 +03:00
eldemet
b26e3dce49
Exclude windows sdk compiled folders
2016-07-15 09:47:38 +03:00
Sam Hatchett
4e3efb1aba
disable local file location
2016-07-14 15:28:11 -04:00
Sam Hatchett
528d972f54
updates and proper tagging for dox
2016-07-14 15:03:14 -04:00
Sam Hatchett
7f958d797d
update doxyfile
2016-07-14 14:35:45 -04:00
Sam Hatchett
2c60a703b5
Update README.md
2016-07-13 13:20:56 -04:00
Sam Hatchett
2d39d1fee4
Update README.md
2016-07-13 13:19:18 -04:00
Sam Hatchett
880f57d237
Merge branch 'dev-2.1-doxy-markup' into dev-2.1
...
updates comment blocks to oxygen-compatible, and adds release notes
(draft)
2016-07-13 13:16:53 -04:00
Sam Hatchett
cdbe7e409a
adding release notes, 2.1
2016-07-13 13:14:42 -04:00
Maurizio Cingi
31a05e34cc
Update epanet.c
2015-12-21 22:21:00 +01:00
Elad Salomons
1c0690837f
Fix for avgqual function
...
Due to changes in the order initsegs was called the links average
quality value, for the initial time step, was wrong. This was found in
issue #16
2015-12-18 13:34:04 +02:00
Sam Hatchett
8d90000f3f
Merge pull request #62 from OpenWaterAnalytics/dev-2.1-debug-python-test
...
Dev 2.1 debug python test
2015-12-17 13:52:52 -05:00
sam hatchett
ff6225372a
there are two hard problems.
...
naming things and counting things
2015-12-17 13:49:23 -05:00
sam hatchett
8fe3bbef23
fixes diff script
2015-12-17 13:46:32 -05:00
sam hatchett
81fa79745a
fixing python printing
2015-12-17 13:36:53 -05:00
sam hatchett
eb629b8392
better debug output
2015-12-17 13:33:33 -05:00
sam hatchett
71fa408f0b
removes fake python comparator
2015-12-17 13:29:47 -05:00
sam hatchett
d2625edab4
removes fake files
2015-12-17 13:24:00 -05:00
sam hatchett
1d8d2fb882
combining testing framework with python diff script
2015-12-17 13:22:28 -05:00
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
