f3052ac873
Merge pull request #14 from sdteffen/usePUMPINDEX
...
Simpler, faster code using PUMPINDEX()
2014-01-27 07:31:49 -08:00
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
f718c83701
Simpler, faster code using PUMPINDEX()
2014-01-24 18:29:09 +01:00
48f9d3989d
ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns.
2014-01-24 18:01:54 +01:00
017e24be1c
Merge pull request #12 from sdteffen/pumpEN_MINORLOSS
...
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-06 10:11:37 -08:00
1cd06a2bed
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-04 08:26:55 -08:00
5caf7feda3
Added ENgetheadcurve(), ENgetpumptype() and related constants.
2014-01-04 08:13:50 -08:00
93036690a0
new API function -- get qual info
...
… to retrieve chemName and units
2013-10-04 16:38:29 -04:00
2a6f5bafc4
updated version number
2013-09-30 16:34:30 -04:00
10a5ae4cf6
updated some variable names to make the code a bit more self-documenting
2013-09-30 16:28:12 -04:00
519daf8e3e
adding debuggable conditionals, fixing lemontiger bug
...
… reorientsegs was borked
2013-09-27 22:19:54 -04:00
5b151dd09b
added getter for curve id
2013-08-28 18:44:01 -04:00
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
e7f6a8a085
fixed the getstatistic api call -- should return floattype by ref
2013-07-23 14:56:12 -04:00
9413dfe69f
Merge branch 'lemontiger-rtx' into next
2013-07-22 16:56:05 -04:00
99119ef992
bug fixes from master
2013-07-22 16:39:09 -04:00
15d187433f
needed mods
...
- adding qtime setter
- formatting issues
2013-07-19 17:36:04 -04:00
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
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
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
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
a55f5e3e79
fixing coordinates (as in, disabling)
2013-06-04 17:33:44 -04:00
067c0fd950
fixing coordinates bug, adding useful methods
2013-05-31 11:59:09 -04:00
9da5f4f658
rtx mods, epanet gets coords
2013-05-24 15:54:02 -04:00
4c1155745b
setting float type by define
2013-05-23 19:53:26 -04:00
2bc8d36a55
vars and project settings -- incorporating lemon tiger changes
2013-05-23 19:40:56 -04:00
434d78c6ed
Lemon Tiger changes
2013-05-23 19:36:03 -04:00
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
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
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
992866e602
Bug fixed - Wall reaction coefficient variable in water quality simulation is explicitly defined and added since epanet uses the roughness resistance variable as it and caused some error in step wise calculation.
2013-02-22 10:51:05 -05:00
2ad5765dd3
pretty output
2013-02-05 10:58:55 -05:00
44e44e0809
testing code for sampletown
2013-02-05 09:49:59 -05:00
7a0dd5ec6d
removed files
2013-02-04 21:28:27 -05:00
b4164f56b4
more stepwise mods
2013-02-04 21:17:58 -05:00
afc80b6b13
trying to incorporate some of the stepwise solution functionality into the regular epanet toolkit functions.
2013-02-04 16:29:04 -05:00
ab87f72e29
this is the shape of the API
2013-02-01 18:11:39 -05:00
4df40ebc3d
new branch for lemon-tiger with no new api functions
2013-02-01 17:19:23 -05:00
7a5e7feb2d
cool, lemontiger works on mac
...
- removed CLE_LT def -- what was that for?
2013-01-31 15:40:12 -05:00
d9eebbbcf0
whoops, dox misspelling
2013-01-31 15:30:46 -05:00
e5eeccbd1e
apple define, some cleanup
...
- apple / *nix defines out the DLL[EX/IM]PORT directives
- we should be using dox markup (see ENrunnexHQ for example)
2013-01-31 15:30:07 -05:00
719114cb2e
Compile LemonTiger as a Win32 DLL. Use "LemonTiger.h" to access its functions. Added one new function - ENrunnextHQ().
2013-01-28 15:14:10 -05:00
9f8dcadb58
Solved the tank level issue. LemonTigerJ now gives right hyd/WQ results.
2013-01-24 00:48:19 -05:00
c622ad66b4
Added one test case and three api functions. The test will run but WQ result is not accurate.
2013-01-23 00:35:11 -05:00
2e22456896
Set up the environment for building with VS 2012
2013-01-22 11:27:12 -05:00
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
566eb53eb4
added getcurve function
2013-01-08 12:16:34 -05:00
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
7766a874cb
Fixed so that the extern "C" was not just for linux
...
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@425 c320cabd-cc23-0410-96d8-e60fbf53ed7f
2011-12-06 19:00:39 +00:00
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