JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity
1,034 Commits 1 Branch 0 Tags
55bf038884404185280117be1ea65de59b1fa7c6
Commit Graph

1034 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hatchett
55bf038884 Update CODE_OF_CONDUCT.md 2019-05-09 11:43:06 -04:00
Sam Hatchett
cf9c2a9141 Merge pull request #3 from samhatchett/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2019-05-08 14:45:34 -04:00
Sam Hatchett
086db3bc02 Create CODE_OF_CONDUCT.md 2019-05-08 14:44:35 -04:00
Sam Hatchett
3f34a1ff2c Merge pull request #2 from OpenWaterAnalytics/dev 
updates dev
 2019-05-08 14:42:37 -04:00
Elad Salomons
52bda22833 Merge pull request #478 from eladsal/473 
For "conditional" do not delete a node connected to a link
 2019-05-08 16:56:23 +03:00
Lew Rossman
6ace84384b Merge pull request #472 from makusuko/fix-rules-label 
Fix NULL pointer error if rules label is missing
 2019-05-08 09:47:37 -04:00
Elad Salomons
eefc7f7d05 For "conditional" do delete a node connected to a link 
For "conditional" deletion the node is deleted only if all of its links have been explicitly deleted beforehand #473

Co-Authored-By: Lew Rossman <lrossman@outlook.com>
 2019-05-06 11:36:41 +03:00
Elad Salomons
d56601de43 Merge pull request #476 from Mariosmsk/update_win_build 
Create Makefile2.bat
 2019-05-04 22:03:13 +03:00
Sam Hatchett
6e621bcf57 Merge pull request #1 from OpenWaterAnalytics/dev 
updates from origin
 2019-05-03 16:12:20 -04:00
Markus Sunela
1b3141a8c7 Merge branch 'fix-rules-label' of https://github.com/makusuko/EPANET into fix-rules-label 2019-05-03 10:39:06 +03:00
Markus Sunela
1aef998b81 Fixed NULL pointer error, if no label is provided after the rule keyword. 
Add NULL guard in freerules function. Use strncat and strncpy to ensure
the buffer lengths are adhered to.
 2019-05-03 10:36:59 +03:00
Sam Hatchett
d3e989b621 Create LICENSE 2019-05-03 10:21:04 +03:00
mariosmsk
d34748e933 Create Makefile2.bat 
Co-Authored-By: Demetrios G. Eliades <eldemet@users.noreply.github.com>
Co-Authored-By: Elad Salomons <selad@optiwater.com>
 2019-05-02 20:56:38 +03:00
Markus Sunela
5d687d7d2c Fixed NULL pointer error, if no label is provided after the rule keyword. 2019-05-02 16:35:55 +03:00
Michael Tryby
61847dbcbc Merge pull request #466 from OpenWaterAnalytics/lrossman-dev 
Fix problems with setting tank parameters (issue #464 )
 2019-04-25 10:15:01 -04:00
Lew Rossman
97be7944f4 Fix problems with setting tank parameters (issue #464 ) 2019-04-25 08:22:44 -04:00
Michael Tryby
59bd09cc53 Merge pull request #465 from michaeltryby/dev-list 
Dev list
 2019-04-24 18:57:46 -04:00
Michael Tryby
35cf9bd422 Fix bug and test remove demand 2019-04-24 18:40:47 -04:00
Michael Tryby
dc3c2ffe1a Adding remove demand method to toolkit 2019-04-24 16:30:27 -04:00
Michael Tryby
d927851d20 Adding remove node method to generic list 2019-04-24 16:29:57 -04:00
Michael Tryby
9b3173f9be Adding key and search to list 2019-04-24 13:15:43 -04:00
Michael Tryby
cf97cf8c9c Work in progress 
code cleanup, addressed issue raised in review, and implemented EN_adddemand()
 2019-04-23 17:52:11 -04:00
Michael Tryby
900813367e Update demand.c 2019-04-23 14:44:11 -04:00
Michael Tryby
feee7f2c80 Update epanet.c 
Updating EN_getnodevalue() and EN_setnodevalue() to process the primary demand located at the head of the demand list
 2019-04-23 14:42:37 -04:00
Michael Tryby
5d3eeb91d9 Reverted handling of default pattern 
When creating demands, no pattern is marked with a zero. Then when data is adjusted it gets updated to default.
 2019-04-23 11:44:02 -04:00
Michael Tryby
73bc53ad54 Update demand.c 2019-04-23 08:51:22 -04:00
Michael Tryby
4f9c901e6e Merge branch 'dev-list' of https://github.com/michaeltryby/EPANET into dev-list 2019-04-23 08:44:53 -04:00
michaeltryby
a0048b7b09 Update test_demand_data.cpp 
Adding index to addnode calls. Fixing indent
 2019-04-22 13:37:41 -04:00
michaeltryby
f19d43d3a4 Merge branch 'dev' of https://github.com/OpenWaterAnalytics/EPANET into dev-list 2019-04-22 13:36:44 -04:00
michaeltryby
ce70d144ce Restoring write_demands section in saveinpfile 2019-04-22 13:13:38 -04:00
michaeltryby
60853ecb15 Update demand.c 
Fixing bug in get_category_name when category_name is NULL
 2019-04-22 13:08:43 -04:00
michaeltryby
c98a43e72c Isolating bug 
Not writing demand section of input file should eliminate it
 2019-04-22 12:47:52 -04:00
michaeltryby
ca097a948b Update test_project.cpp 
Isolating bug on gcc
 2019-04-22 12:22:15 -04:00
michaeltryby
d34ac67172 updating get demand name and write demands 
Everything passing locally
 2019-04-22 12:14:33 -04:00
michaeltryby
97f70e445d Update epanet.c 
Trying to isolate bug
 2019-04-22 11:07:01 -04:00
michaeltryby
b80b4ed09c Update inpfile.c 
Testing linux build
 2019-04-22 10:52:04 -04:00
Lew Rossman
1524adeb4d Merge pull request #463 from OpenWaterAnalytics/lrossman-dev 
Refactored xstrcpy function
 2019-04-20 21:38:01 -04:00
Lew Rossman
d985a69248 Refactored xstrcpy function 2019-04-20 11:54:33 -04:00
Michael Tryby
f05746cea2 GCC Bug 2019-04-19 22:56:08 -04:00
Michael Tryby
6a084cc764 Update inpfile.c 
Trying to isolate bug
 2019-04-19 22:35:15 -04:00
Michael Tryby
8761543395 Working on gcc bug 
Tests are passing on Appveyor
 2019-04-19 22:24:31 -04:00
Michael Tryby
17b82bd31f Fixing bug 2019-04-19 21:59:09 -04:00
Michael Tryby
e2e12fab22 Cleaning up gcc build 2019-04-19 21:51:55 -04:00
Michael Tryby
405822cdf6 Cleaning up build on gcc 2019-04-19 21:34:25 -04:00
Michael Tryby
e9650d2d6d Work in progress 
Fixing memory leaks
Unit tests passing
 2019-04-19 21:21:58 -04:00
Michael Tryby
7537be1ec9 Work in progress 
Working on demand lists
 2019-04-19 18:01:06 -04:00
Lew Rossman
ebb271c1db Merge pull request #461 from OpenWaterAnalytics/lrossman-dev 
Return object index from EN_addnode and EN_addlink (issue #432)
 2019-04-19 11:03:09 -04:00
Michael Tryby
55a28de9e0 Work in progress 2019-04-18 17:34:02 -04:00
Lew Rossman
a4ac34d5d6 Updated criteria for valid object ID name 2019-04-18 17:12:56 -04:00
Michael Tryby
76b6254f33 get/set demand name are passing 2019-04-18 17:07:50 -04:00