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

35 Commits

Author SHA1 Message Date
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
mickey
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
Sam Hatchett
2ad5765dd3 pretty output 2013-02-05 10:58:55 -05:00
Sam Hatchett
44e44e0809 testing code for sampletown 2013-02-05 09:49:59 -05:00
sam hatchett
7a0dd5ec6d removed files 2013-02-04 21:28:27 -05:00
sam hatchett
b4164f56b4 more stepwise mods 2013-02-04 21:17:58 -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
Sam Hatchett
ab87f72e29 this is the shape of the API 2013-02-01 18:11:39 -05:00
Sam Hatchett
4df40ebc3d new branch for lemon-tiger with no new api functions 2013-02-01 17:19:23 -05:00
Sam Hatchett
7a5e7feb2d cool, lemontiger works on mac 
- removed CLE_LT def -- what was that for?
 2013-01-31 15:40:12 -05:00
Sam Hatchett
d9eebbbcf0 whoops, dox misspelling 2013-01-31 15:30:46 -05:00
Sam Hatchett
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
JinduanChen
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
JinduanChen
9f8dcadb58 Solved the tank level issue. LemonTigerJ now gives right hyd/WQ results. 2013-01-24 00:48:19 -05:00
JinduanChen
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
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
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
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
Tom Taxon
a41cdbd540 Added a call to fflush on the hydraulic file when it is written to because it caused issues with the subsequent use of the hydraulic file related to MSX. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@423 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-12-06 18:06:01 +00:00
Tom Taxon
eb60c488db Added DLLEXPORT definition to Alloc routines so that MSX could see them 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@422 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-12-06 18:00:57 +00:00
Tom Taxon
242c03f579 Found and fixed an issue that occurred on 32-bit linux. When using 5 minutes for a quality timestep, the timestep computed was 299 seconds, not 300. I traced it to an apparent truncation issue in the hour() function in input3.c. The time string is converted into a double value representing the timestep which is then later converted into seconds and cast to a long. it appears that during the cast, the value is truncated to 299, not 300. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@421 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-12-06 17:57:57 +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
sam hatchett
523d34bd93 parity with OWA root 2.00.12 2014-09-18 17:27:54 -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