jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
914 Commits 1 Branch 0 Tags
1f67c8c5c91c0875c66dd0d08da59e0ae3961efc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Lew RossmanandGitHub 1f67c8c5c9 Merge pull request #450 from OpenWaterAnalytics/lrossman-dev 
Eliminates use of temporary linked lists to process Patterns & Curves…
 2019-04-08 11:08:34 -04:00
Lew Rossman b2a8b55bc6 Update input2.c 2019-04-05 16:28:55 -04:00
Lew Rossman edcd4b69c7 Eliminates use of temporary linked lists to process Patterns & Curves (issue #449) 2019-04-05 13:02:39 -04:00
Lew RossmanandGitHub b87c102de5 Merge pull request #447 from OpenWaterAnalytics/lrossman-dev 
Add more analysis options to the API (issue #425)
 2019-04-04 10:23:01 -04:00
Lew Rossman 1632508545 Fixed epanet2_enums.h 2019-04-03 21:23:46 -04:00
Lew Rossman 3e733f5a2a Add more analysis options to the API (issue #425) 2019-04-03 21:17:28 -04:00
Lew Rossman fa4952a265 Fixed failure to update test_analysis.cpp 2019-04-03 10:56:24 -04:00
Lew Rossman af825005d4 Fixed failure to update test_net_builder.cpp 2019-04-03 10:43:19 -04:00
Lew Rossman 83ffc1cfc7 Removed the EN_DEFDEMANDPAT option 
See issue #429. Also allowed the EN_HEADLOSSFORM option to be changed if the solver is not active.
 2019-04-03 10:25:37 -04:00
Lew RossmanandGitHub 513b545ff6 Merge pull request #442 from OpenWaterAnalytics/lrossman-dev17 
Fixes bug in EN_getcurve
 2019-04-03 09:34:32 -04:00
Lew Rossman 23b11ab672 Add test of EN_setcurve & EN_getcurve to test_curve.cpp 2019-04-03 01:15:57 -04:00
Lew Rossman ca0ea0e17c Fixes bug in EN_getcurve 2019-04-03 00:58:40 -04:00
Lew RossmanandGitHub 8b35866b69 Merge pull request #441 from OpenWaterAnalytics/lrossman-dev17 
Bug fixes
 2019-04-02 22:36:08 -04:00
Lew Rossman 6a4b95f4d5 Bug fixes 2019-04-02 22:21:05 -04:00
Lew RossmanandGitHub 34705d442d Merge pull request #423 from OpenWaterAnalytics/lrossman-dev15 
Replace fixed-sized comment strings with dynamic strings
 2019-03-20 09:13:15 -04:00
Lew Rossman 18f65eb8b0 Replace fixed-sized comment strings with dynamic strings 2019-03-17 19:54:51 -04:00
Lew RossmanandGitHub 9399ef4b54 Merge pull request #414 from LRossman/lrossman-dev14 
Fixes writing auxiliary data to a saved input file (#411)
 2019-03-13 10:28:55 -04:00
Lew Rossman 03f41d567d Set InFile to NULL after closing it 2019-03-09 10:52:59 -05:00
Lew Rossman e5ec4eecab Fixes writing auxiliary data for deleted elements to a saved input file (#411) 2019-03-08 16:41:12 -05:00
Lew RossmanandGitHub d2386707d6 Merge pull request #410 from makusuko/dev 
Fix re-entrancy problems / crashes caused by the use of static variables in functions
 2019-03-08 13:09:33 -05:00
Lew RossmanandGitHub cd3826570f Merge pull request #408 from LRossman/lrossman-13 
Give external apps access to binary output file (#407)
 2019-03-06 13:48:58 -05:00
Lew Rossman 12c64b69cd Refactored EN_close function to use newly added closeoutfile function 2019-03-06 13:23:55 -05:00
Lew Rossman 6e13d7e3aa Refactoring how the binary output is closed 
This change implements the fix suggested by @gonccalo.
 2019-03-06 11:14:03 -05:00
Lew Rossman 3ebb1831d7 Another attempt to fix closing/opening of output project 2019-03-06 10:44:03 -05:00
Lew Rossman 8765dfa3ab Initialize all file pointers to NULL in initpointers 2019-03-05 20:50:34 -05:00
Lew Rossman 324487ba86 Opening & closing output file in writeresults 2019-03-05 19:40:30 -05:00
Lew Rossman 09d6c7ea5d Reverting some previous changes 2019-03-05 19:07:55 -05:00
Lew Rossman f2c0718819 Refactored closing/opening of output file 2019-03-05 16:15:33 -05:00
Lew Rossman 8052ed0b6f Walking back closing/opening output file 2019-03-05 15:20:37 -05:00
Lew Rossman 692955e3d2 Give external apps access to binary output file (#407) 2019-03-05 09:23:49 -05:00
Lew RossmanandGitHub b0a0014f19 Merge pull request #406 from LRossman/lrossman-dev4 
Change ENgetcoords & ENsetcoords args. to doubles
 2019-03-05 09:04:38 -05:00
Lew Rossman 65a6c846b6 Change ENgetcoords & ENsetcoords args. to doubles 2019-03-02 12:26:49 -05:00
Lew RossmanandGitHub 382572e8bc Merge pull request #395 from LRossman/lrossman-dev2 
Adds new pattern, curve and reporting functions to API
 2019-02-22 15:15:59 -05:00
Lew Rossman fcbbbf9b2e Adds new pattern, curve and reporting functions to API 2019-02-20 12:43:32 -05:00
Lew RossmanandGitHub 219e3ab0ce Merge pull request #389 from LRossman/lrossman-dev1 
Fixes win_build and VS/cmake build problems
 2019-02-11 16:18:22 -05:00
Lew Rossman 3eb9a68783 Fixes win_build and VS/cmake build problems 2019-02-11 14:30:15 -05:00
Lew RossmanandGitHub d6d244d4d2 Merge pull request #386 from LRossman/lrossman-dev 
New function clearreport added (see issue #383)
 2019-02-10 22:55:54 -05:00
Lew Rossman 996e26158c Updates documentation with newly added functions 2019-02-08 19:06:42 -05:00
Lew Rossman 2c86a8febb Fixes the win_build Makefile.bat file 2019-02-08 15:27:52 -05:00
Lew Rossman 36b78f28d3 New function clearreport added (see issue #383) 
The newly added `gettitle` and `settitle` functions were moved from the Reporting Functions section to the Project (formerly System) Functions section of epanet2.c and epanet.c.
 2019-02-08 12:07:56 -05:00
Lew RossmanandGitHub ba8926e4c4 Merge pull request #378 from LRossman/lrossman-dev 
Minor edits to documentation
 2019-01-29 19:17:41 -05:00
Lew Rossman 67947e5ea8 Minor edits to documentation 2019-01-29 09:46:14 -05:00
Lew RossmanandGitHub 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 RossmanandGitHub 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 RossmanandGitHub 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
Lew Rossman dd376692ad Floating pt. args in thread-safe API changed to doubles (Issue #365) 2019-01-09 15:14:10 -05:00
Lew RossmanandGitHub 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 RossmanandGitHub 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 RossmanandGitHub 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
Lew Rossman f1175b1f92 Error reporting fixes and re-formatting (issue #358) 2018-12-15 15:13:19 -05:00
Lew RossmanandGitHub 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 RossmanandGitHub 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
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
Lew RossmanandGitHub 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
Lew RossmanandGitHub 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
Lew RossmanandGitHub 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 RossmanandGitHub 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
Lew RossmanandGitHub 1234c7e685 Merge pull request #326 from LRossman/lrossman-dev 
Restored epanet_export.h to \include folder
 2018-10-29 09:12:12 -04:00
Lew Rossman a86ba29cb6 Restored epanet_export.h to \include folder 2018-10-29 09:06:08 -04:00
Lew RossmanandGitHub 5cb9d06151 Merge pull request #325 from LRossman/lrossman-dev 
Deleted previous, commented-out version of EN_setlinktype
 2018-10-28 20:25:10 -04:00
Lew Rossman c2b16a6466 Deleted previous, commented-out version of EN_setlinktype 2018-10-28 20:07:54 -04:00
Lew RossmanandGitHub 291789ca04 Merge pull request #324 from LRossman/lrossman-dev 
Rewrite of EN_setlinktype function (#305)
 2018-10-28 17:09:41 -04:00
Lew Rossman 8514929622 Rewrite of EN_setlinktype function (#305) 
- Complete rewrite of EN_setlinktype with link index argument passed by reference
- New unit test of EN_setlinktype added
- New function EN_setlinknodes added
 2018-10-28 16:58:43 -04:00
Lew RossmanandGitHub 7d021d8b82 Merge pull request #322 from LRossman/lrossman-dev 
Removed 'writecon' function (#300)
 2018-10-27 12:04:38 -04:00
Lew Rossman 27cc088c4a Reverted back to old main() 
Trying to see why new version of main causes some CI reg tests to fail.
 2018-10-27 11:31:06 -04:00
Lew Rossman 320dec3ff7 Replaced main() for runnable version of the library 2018-10-27 11:00:00 -04:00
Lew Rossman 9d0b738e77 Removed writecon function and all calls to it 2018-10-27 09:36:21 -04:00
Lew Rossman 8286918b94 Removed unused runconcurrent() function 2018-10-27 09:05:30 -04:00
Lew Rossman e9161adbe6 Defined EN_MAXID & EN_MAXMSG limits in API header 2018-10-27 08:48:41 -04:00
Lew RossmanandGitHub 09e46bc459 Merge pull request #320 from LRossman/lrossman-dev 
Fixed bug setting pump curve params (#314) and in setting demand categories
 2018-10-25 12:22:04 -04:00
Lew Rossman 39fcfa2162 Fixed bug setting pump curve params (#314) and in setting demand categories 
-Split off calc. of a pump's curve coeffs. from getpumpparams to updatepumpparams.
- Fixed problem with initializing node demand category when default demand pattern set before node is created.
- Increased MAXLINE to 1024 to accomodate increase in MAXMSG.
- Replaced EN_geterror calls in input2.c with geterrmsg (it's bad form to call API functions in the body of the library)
 2018-10-25 09:39:28 -04:00
Lew RossmanandGitHub 2ed36c06a1 Merge pull request #315 from LRossman/lrossman-dev 
Fixed bug in EN_deletelink (#312)
 2018-10-24 09:02:54 -04:00
Lew Rossman 69388024fb Fixed bug in EN_deletelink (#312) 2018-10-23 16:00:14 -04:00
Lew RossmanandGitHub 3f90e44eda Merge pull request #303 from LRossman/dev-lrossman 
Fix #211 for EN_setreport
 2018-10-23 09:21:02 -04:00
Lew Rossman f7346cef5f Modified re-factored version of hash.c 2018-10-19 10:36:39 -04:00
Lew Rossman 0041772aa0 Corrected test_setid unit test code 2018-10-18 10:16:47 -04:00
Lew Rossman 60a79de4a9 Fixed bug in hash.c 
A bug in the delete function in hash.c was preventing the unit test of the new set ID API functions from running properly. In fixing this bug the entire hash table code was refactored to make it look more like the mempool service routines. Also the need to copy the string passed into the table's insert function was eliminated.
 2018-10-18 10:03:09 -04:00
Lew Rossman b3e84e0c42 Added unit test for ENsetnodeid and ENsetlinkid functions 2018-10-17 10:17:00 -04:00
Lew Rossman 76419e0b4c Added EN_setnodeid and EN_setlinkid (Issue #306) 2018-10-17 09:05:16 -04:00
Lew Rossman 1fce14efb8 Increased size of MAXMSG to 255 (#189) 2018-10-15 11:34:25 -04:00