jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
817 Commits 1 Branch 0 Tags
e5ec4eecabb40bc001683c974bc7d6482d4e7445
Commit Graph

197 Commits

Author SHA1 Message Date
Elad Salomons 82da5db7ec more c89 conformance 
variables should be declared at the beginning of functions
 2015-06-13 00:01:30 +03:00
Sam Hatchett 23865315aa removing utility code from library source 
main function should only be in standalone app. also removing inline
defs for compile-time directives
 2015-06-12 11:22:04 -04:00
Sam Hatchett 2563ae62c6 Merge remote-tracking branch 'origin/owa_next' 
# Conflicts:
#	build/Linux/Makefile
#	build/Linux/Makefile_Rev
#	src/epanet.c
#	src/output.c
#	src/toolkit.h
 2015-06-09 13:34:13 -04:00
Mariosmsk eae77fc651 Added missing ENgettimeparam EN_RULESTEP 2015-05-13 19:08:13 +03:00
jamesuber 71b017e9ff minor fix to getqualinfo for trace sim type 2014-08-28 15:48:51 -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
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 93036690a0 new API function -- get qual info 
… to retrieve chemName and units
 2013-10-04 16:38:29 -04: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 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
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 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
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
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 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 434d78c6ed Lemon Tiger changes 2013-05-23 19:36:03 -04: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 bd62f399f9 fake data was being written to the binary file. if a link element is nominally closed, even if there's actually flow calculated there, the flow is disregarded upon writing results. so when the flow is read back in, it's zero -- which is different than it would have been if it had stayed in memory. i wonder what that does to mass balance? 
this version works, at least with Net3, simplenet, and SampleTown -- but the results are non-canonical, as the current workaround for the issue above writes tiny flow values to the binary file for closed elements. presumably we should check for closed status in the transport() function.
 2013-03-09 09:46:12 -05:00
sam hatchett afc80b6b13 trying to incorporate some of the stepwise solution functionality into the regular epanet toolkit functions. 2013-02-04 16:29:04 -05:00
JinduanChen 9f8dcadb58 Solved the tank level issue. LemonTigerJ now gives right hyd/WQ results. 2013-01-24 00:48:19 -05:00
JinduanChen 2e22456896 Set up the environment for building with VS 2012 2013-01-22 11:27:12 -05:00
Sam Hatchett f8e843d584 adding rtx modifications 
- get volume curves
- get relative error / n iterations from last solution
- get more tank characteristics
- modify sim duration during active simulation
 2013-01-08 12:41:48 -05:00
Sam Hatchett 566eb53eb4 added getcurve function 2013-01-08 12:16:34 -05:00
Tom Taxon e37bfd44eb Removed extra text inadvertently added 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@426 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-12-08 19:57:55 +00:00
Tom Taxon 3336c4119c All files in this commit: Added ifdef for Apple compilation - it does not have a malloc.h include file. 
epanet.c
reset file variables to NULL so if the code is executed again without termination, the variables will be in a valid initial state.

Added retrieval of EN_STARTTIME to ENgettimeparam.
Added retrieval of EN_TANKVOLUME to ENgetnodevalue
Added retrieval of EN_LINKQUAL to ENgetlinkvalue
Fixed the check for identical filenames so it now allows for an empty (not generated) report file and outfile.
Added ENgetbasedemand and ENgetdemandpattern functions

input2.c
Fixed some compiler warnings


git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@424 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-12-06 18:25:02 +00:00
Sam Hatchett 80b484df16 roll back to known version. i messed this up unintentionally with a previous commit 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@377 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-01-12 18:24:05 +00:00
Sam Hatchett e0b9ee5feb changed old RTX to "KF-DAL", the Kalman Filter Demand Allocation Library 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@348 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2010-07-28 14:40:30 +00:00
James Uber f658e02f8b Makefile changed to build executable using all *.o instead of using DLL, 
because of changes in epanet.c at 2.00.12.
epanet.c changed to comment out definition of DLL, allowing DLL, SOL, or 
CLE to be defined at compilation.


git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@220 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2008-12-07 01:37:51 +00:00
Feng Shang 5abc3875fa A big that exists only in 2.00.12 is fixed. It is at function ENgetnodevalue for EN_SOURCEQUAL. A break statement rather than return should correspond to case. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@112 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2008-05-07 20:04:14 +00:00
Feng Shang c38b8d0ac8 Commit the EPANET2.00.12 to trunk, the changes are summarized at \EPANET\BASE\trunk\doc\changes.txt. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@95 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2008-03-06 20:06:03 +00:00
sam hatchett 48d806d9da remove CRT secure def for full OWA parity 2014-09-18 17:28:57 -04:00
Michael Tryby 6d3e790b58 Suppressing secure string related deprecation warnings 2014-05-20 17:06:53 -04:00
Michael Tryby 0cd38fd697 New features and bug fixes 2014-05-05 18:07:03 -04:00
Michael Tryby 993cfce8a4 Initial commit 2014-05-05 18:00:25 -04:00