JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
662 Commits 1 Branch 0 Tags
a66f5a2c9226b68147753de9961c764040cf283d
Commit Graph

662 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Lew Rossman
107483bee8 Avoid possible divide by zero in hydcoeffs.c 2018-12-04 09:50:01 -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
Michael Tryby
4831fd7951 Merge pull request #1 from OpenWaterAnalytics/dev 
Updating my fork
 2018-11-28 19:19:01 -05:00
Michael Tryby
9ff0056b7c Merge pull request #350 from LRossman/lrossman-dev 
Code cleanup
 2018-11-28 17:26:37 -05:00
Lew Rossman
20bc6358ff Restored previous parallel link detection method to smatrix.c 2018-11-28 10:01:29 -05:00
Lew Rossman
d3a50dc490 Fixed refactoring bug in EN_setlinkid 2018-11-27 19:25:01 -05:00
Lew Rossman
b7a7cdc5ee Another update to test_setid.cpp 2018-11-27 16:45:13 -05:00
Lew Rossman
7c21b9c740 Update test_setid.cpp 2018-11-27 16:10:39 -05:00
Lew Rossman
24d90a530d Replaced EN_ProjectHandle with EN_Project in unit tests 2018-11-27 15:16:12 -05:00
Lew Rossman
9a540cc0f4 Code cleanup 
1. Added a standard header to each code module and removed obsolete comments.
2. Re-named several of the sub-structs in the project struct and re-arranged some of their contents.
3. Re-named _defaultModel to _defaultProject.
4. Removed the need to call EN_createproject and EN_deleteproject when working with the default project.
5. Made X & Y coords. part of Snode properties instead of a separate struct.
6. Moved the non-API functions in epanet.c into a new module named project.c.
7. Re-factored the quality module so that it uses the same nodal adjacency lists as the hydraulics solver.
8. Re-factored the sparse matrix module (smatrix.c) to be more memory efficient.
9. Restricted line lengths to < 90 columns.
10. Grouped the placement of functions in EPANET2.H and EPANET.C by category.
 2018-11-27 14:22:06 -05:00
Michael Tryby
2988800448 Merge pull request #348 from michaeltryby/dev 
Rolling back errormanager
 2018-11-19 17:05:49 -05:00
Michael Tryby
a611832184 Fixing build error 2018-11-19 16:51:39 -05:00
Michael Tryby
ad4969ea1b Rolling back errormanager 2018-11-19 16:40:40 -05:00
Michael Tryby
440230ef6d Rolling back errormanager 2018-11-19 16:33:30 -05:00
Michael Tryby
25a4d93ef5 Merge pull request #341 from michaeltryby/dev 
Adding test_save_reopen, minor refactoring.
 2018-11-16 16:39:09 -05:00
Michael Tryby
b34c2ede81 Fixing build error on Travis 2018-11-16 14:06:29 -05:00
Michael Tryby
a4c9973d47 Adding test_save_reopen, minor refactoring. 2018-11-16 13:49:45 -05:00
Elad Salomons
db3f2f1818 Merge pull request #337 from Mariosmsk/update_realeasenotes_2_2 
update api functions/extensions. Thank you @Mariosmsk
 2018-11-10 07:47:20 +02:00
Marios Kyriakou
9444646385 update api functions/extensions 2018-11-09 17:15:53 +02:00
Lew Rossman
123a0c3788 Merge pull request #335 from LRossman/lrossman-dev 
Fixes #172 (adjust controls when node/link is deleted) & EN_addrule added
 2018-11-09 09:48:28 -05:00
Elad Salomons
36972c2a60 Fix for VB header file 2018-11-08 10:09:35 +02:00
Elad Salomons
d10649c0e7 Minor fix to the DEF file 2018-11-08 09:45:10 +02:00
Elad Salomons
ca927702fa Small fix for DEF file 2018-11-08 09:36:33 +02:00
Lew Rossman
6397a01363 Merge branch 'dev' into lrossman-dev 2018-11-07 23:19:16 -05:00
Lew Rossman
7443cea9d4 Fixes #172 (adjust controls when node/link is deleted) & EN_addrule added 
- Deleting controls with node/link deletion made conditional.
- New EN_addrule function added along with a test file.
- Rule structures re-named & rules.c heavily modified.
- Issue with exceeding limit on number of temporary file names fixed.
- VB declaration and DEF files updated.
 2018-11-07 23:09:47 -05:00
Michael Tryby
bdd67a9ae1 Merge pull request #332 from michaeltryby/dev 
Fix test_output check_cdd()
 2018-11-05 12:28:43 -05:00
Michael Tryby
bfec6d608b Merging upstream dev 2018-11-05 10:12:24 -05:00
Michael Tryby
5f0ca809d7 Fixing bug in check_cdd 2018-11-05 10:05:30 -05:00
Elad Salomons
18fb352527 Merge pull request #327 from eladsal/dev-link-nodes 
Add ENsetlinknodes to DEF file and add a function check
 2018-10-31 18:23:03 +02:00
Lew Rossman
de6d22ab41 Merge pull request #329 from LRossman/lrossman-dev 
Fixes bug #172 (adjust controls & rules when node/link added or deleted)
 2018-10-31 11:47:33 -04:00
Lew Rossman
ee335ab077 Fixes bug #172 (adjust controls & rules when node/link added or deleted) 
- Also adds new API function EN_deletecontrol
- Updates and re-arranges entries in the VBA and VB.Net headers
 2018-10-31 11:32:01 -04:00
Lew Rossman
3ac243d0c8 Merge pull request #328 from LRossman/lrossman-dev 
Deleted include\epanet_export.h
 2018-10-29 12:04:41 -04:00
Lew Rossman
5ddb54ab90 Deleted include\epanet_export.h 
It gets generated through the cmake build process.
 2018-10-29 11:44:25 -04:00
Elad Salomons
4394c53f9b Add ENsetlinknodes to DEF file and add a function check 2018-10-29 17:20:45 +02:00