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

1264 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jamesuber
71b017e9ff minor fix to getqualinfo for trace sim type 2014-08-28 15:48:51 -04:00
Sam Hatchett
eae1c95873 Merge pull request #16 from samhatchett/next 
Next
 2014-04-12 21:35:43 -04:00
sam hatchett
1527868152 updating gitignore for xc5 2014-04-12 21:33:28 -04:00
Sam Hatchett
caa794447c updated hash methods. just increasing the size of the hash helps a lot with loading larger networks. perhaps hash could be extended to dynamically size based on network size. 2014-01-31 11:16:07 -05:00
Sam Hatchett
f3052ac873 Merge pull request #14 from sdteffen/usePUMPINDEX 
Simpler, faster code using PUMPINDEX()
 2014-01-27 07:31:49 -08:00
Sam Hatchett
3b5feb75b2 Merge pull request #13 from sdteffen/pumpEN_LINKPATTERN 
ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns.
 2014-01-27 07:31:39 -08:00
Steffen Macke
f718c83701 Simpler, faster code using PUMPINDEX() 2014-01-24 18:29:09 +01:00
Steffen Macke
48f9d3989d ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns. 2014-01-24 18:01:54 +01:00
Sam Hatchett
017e24be1c Merge pull request #12 from sdteffen/pumpEN_MINORLOSS 
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
 2014-01-06 10:11:37 -08:00
Sam Hatchett
d1b02129dc Merge pull request #11 from sdteffen/pumptype 
Added ENgetheadcurve(), ENgetpumptype() and related constants.
 2014-01-06 10:11:23 -08:00
Steffen Macke
1cd06a2bed Fix ENgetlinkvalue() for EN_MINORLOSS and pumps. 2014-01-04 08:26:55 -08:00
Steffen Macke
5caf7feda3 Added ENgetheadcurve(), ENgetpumptype() and related constants. 2014-01-04 08:13:50 -08:00
Sam Hatchett
55929ff443 Merge pull request #9 from WillFurnass/makefile_fix 
Fixed typo in makefiles
 2013-10-08 11:06:01 -07:00
Will Furnass
3a3d0bdc06 Fixed typo in makefiles (should be -Wl, not -W1) 2013-10-08 17:37:51 +01:00
Sam Hatchett
93036690a0 new API function -- get qual info 
… to retrieve chemName and units
 2013-10-04 16:38:29 -04:00
Sam Hatchett
6809053c0c Merge pull request #8 from samhatchett/next 
updated version number
 2013-09-30 13:35:26 -07:00
Sam Hatchett
2a6f5bafc4 updated version number 2013-09-30 16:34:30 -04:00
Sam Hatchett
c3adaa79e9 Merge pull request #7 from samhatchett/next 
Next
 2013-09-30 13:30:18 -07:00
Sam Hatchett
10a5ae4cf6 updated some variable names to make the code a bit more self-documenting 2013-09-30 16:28:12 -04:00
Sam Hatchett
d1d03bf446 header file declarations illuminated for better IDE code completion 2013-09-30 15:09:36 -04:00
sam hatchett
519daf8e3e adding debuggable conditionals, fixing lemontiger bug 
… reorientsegs was borked
 2013-09-27 22:19:54 -04:00
sam hatchett
5b151dd09b added getter for curve id 2013-08-28 18:44:01 -04:00
sam hatchett
e16de988cf tank geometry and curve time series 2013-08-28 18:44:00 -04:00
jamesuber
d7d0472947 ENsetbasedemand() and ENsetnodevalue() - added ENsetbasedemand to allow changes to the base demands for each demand category. Changed behavior of ENsetnodevalue when used with EN_TANKLEVEL to also set the volume in addition to the initial volume (similar to how it sets the initial head and head. Without that, we can't reset the tank head and volume from RTX. 2013-08-25 23:57:15 -04:00
Sam Hatchett
e7f6a8a085 fixed the getstatistic api call -- should return floattype by ref 2013-07-23 14:56:12 -04:00
Sam Hatchett
652b73aced removed some old lemontiger declarations. 2013-07-23 09:26:11 -04:00
Sam Hatchett
9413dfe69f Merge branch 'lemontiger-rtx' into next 2013-07-22 16:56:05 -04:00
Sam Hatchett
99119ef992 bug fixes from master 2013-07-22 16:39:09 -04:00
Sam Hatchett
15d187433f needed mods 
- adding qtime setter
- formatting issues
 2013-07-19 17:36:04 -04:00
Sam Hatchett
ba82aee97d Merge branch 'rtx-1.1-lib-mods' into lemontiger-rtx 
Conflicts:
	build/Xcode/epanet/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
	src/epanet.c
	src/hydraul.c
	src/quality.c
	src/toolkit.h
	src/types.h
	src/vars.h
 2013-07-19 13:27:26 -04:00
Sam Hatchett
3e92016bee zones are now DMAs 2013-07-19 11:13:58 -04:00
Sam Hatchett
6674997789 Merge pull request #5 from eldemet/patch-1 
compiler issue - for loop var declaration
 2013-07-16 06:13:42 -07:00
eldemet
2b7f91980a Update epanet.c 
Problem when compiling the DLL using the MSVC++ 2010 Express. 

Proposed change: Define `int iPoint;' before the for-loop

Error message reference: 
1>epanet.c(1767): error C2143: syntax error : missing ';' before 'type'
1>epanet.c(1767): error C2143: syntax error : missing ';' before 'type'
1>epanet.c(1767): error C2143: syntax error : missing ')' before 'type'
1>epanet.c(1767): error C2143: syntax error : missing ';' before 'type'
1>epanet.c(1767): error C2065: 'iPoint' : undeclared identifier
1>epanet.c(1767): warning C4552: '<' : operator has no effect; expected operator with side-effect
1>epanet.c(1767): error C2065: 'iPoint' : undeclared identifier
1>epanet.c(1767): error C2059: syntax error : ')'
1>epanet.c(1767): error C2143: syntax error : missing ';' before '{'
1>epanet.c(1768): error C2065: 'iPoint' : undeclared identifier
1>epanet.c(1769): error C2065: 'iPoint' : undeclared identifier
1>epanet.c(1770): error C2065: 'iPoint' : undeclared identifier
1>epanet.c(1771): error C2065: 'iPoint' : undeclared identifier
 2013-07-16 15:14:38 +03:00
Sam Hatchett
5bffc18798 llvm compilation changes (enum scoping) 
- added useful setMultiplierForSource method to Aggregator.
 2013-07-15 13:47:01 -04:00
Sam Hatchett
b09492b7e2 Merge pull request #4 from thisIsMikeKane/patch-1 
Update output.c
 2013-07-09 07:04:27 -07:00
Mike Kane
43bb601022 Update output.c 
Fixed memory leak in saveoutput() where temporary array "x" was allocated but never freed
 2013-07-08 21:22:03 -04:00
jamesuber
7e731b78ab added method ENgetaveragepatternvalue. modified ENgetbasedemand and ENgetdemandpattern to use pattern index starting with 1, consistent with other API functions. 2013-06-05 11:33:17 -04:00
Sam Hatchett
a55f5e3e79 fixing coordinates (as in, disabling) 2013-06-04 17:33:44 -04:00
Sam Hatchett
067c0fd950 fixing coordinates bug, adding useful methods 2013-05-31 11:59:09 -04:00
Sam Hatchett
d72162114a double-typed en toolkit for compilation 2013-05-28 09:47:25 -04:00
Sam Hatchett
9da5f4f658 rtx mods, epanet gets coords 2013-05-24 15:54:02 -04:00
sam hatchett
4c1155745b setting float type by define 2013-05-23 19:53:26 -04:00
sam hatchett
2bc8d36a55 vars and project settings -- incorporating lemon tiger changes 2013-05-23 19:40:56 -04:00
sam hatchett
434d78c6ed Lemon Tiger changes 2013-05-23 19:36:03 -04:00
sam hatchett
18d9f16770 removed mac include (empty file) 2013-05-23 18:57:09 -04:00
Sam Hatchett
e0f262629c Create README.md 2013-05-14 17:37:18 -03:00
Sam Hatchett
ac272cfece Merge pull request #3 from yuniersoad/patch-1 
Fixing conversion error in ENgetnodevalue EN_TANKDIAM
 2013-05-14 12:59:21 -07:00
yuniersoad
e0582a8bff Fixing conversion error in ENgetnodevalue EN_TANKDIAM 
The Tank.A(area) is calculated as:
 Tank[j].A = PI*SQR(Tank[j].A/Ucf[ELEV])/4.0; //diameter is stored in Tank[j].A
so the right equation to get the diameter back is  sqrt(4.0/PI*Tank[index-Njuncs].A)*Ucf[ELEV];
 2013-05-14 19:38:40 +00:00
mickey
f883a5551b Instead of changing block out status checking routine, water quality module considers pipe 'closed' status in the routine bypassing flow information just like tank volume changes. 2013-03-11 11:54:03 -04:00
sam hatchett
8e499b0318 adding a very simple network 2013-03-09 09:46:31 -05:00