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

63 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
b891ccbded project settings / prereq 2013-02-04 21:26:58 -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
Sam Hatchett
4f693792c8 housekeeping - JC will need to fix this 
moved visual studio project to its own build directory, added to
gitignore so we're not versioning the build products. i don't do
windows, so Jinduan will have to make sure everything still works with
this directory structure.
 2013-01-31 15:13:40 -05:00
Sam Hatchett
a95576cb1e project settings 2013-01-31 15:08:36 -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
Sam Hatchett
ca2bc04cba resurrecting xcodeproj, fix gitignore 2013-01-24 09:10:23 -05:00
JinduanChen
4ae2f0e76c Some housekeeping 2013-01-24 00:53:12 -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
ad97233410 project settings (mac) 2013-01-08 12:16:45 -05:00
Sam Hatchett
566eb53eb4 added getcurve function 2013-01-08 12:16:34 -05:00
Sam Hatchett
e3615b9244 removed nonessential build files 2013-01-08 11:34:22 -05:00
Sam Hatchett
6efc88963e removed msx mac build files 2013-01-08 11:33:40 -05:00
sam hatchett
d84d759e93 gitignore 2013-01-07 12:32:23 -05:00
Tom Taxon
34d271eb7c Moved EPANET and EPANET_MSX from packages/sim to tpl/epanet. 
Also added appropriate svn:ignore settings


git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@428 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2012-01-16 20:46:05 +00: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
594bda341f final tweaks for Xcode 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@415 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-10-04 20:44:23 +00:00
Hyoungmin Woo
8e3ddb1738 added MSX compilation under MacOSX Xcode 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@389 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-03-24 00:18:52 +00:00
Tom Taxon
85e1e67775 Added License file 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@378 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-01-21 16:27:27 +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
3f3b6efb93 fixing epanet repository 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@376 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-01-12 18:10:58 +00:00
Sam Hatchett
0c567015bb attempting to roll back to a working version 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@375 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2011-01-12 18:03:53 +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
Sam Hatchett
02a8fc4af8 change project root. this is mostly a test of scm. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@342 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 23:37:27 +00:00
Sam Hatchett
56816ee88e more intermediates. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@341 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 23:29:00 +00:00
Sam Hatchett
1bce67fea6 intermediate files 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@340 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 23:28:34 +00:00
Sam Hatchett
8f87b8afd2 woops - removing intermediate files? 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@339 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 23:00:41 +00:00
Sam Hatchett
8dd067b834 adding mac build files. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@338 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 22:46:07 +00:00
Sam Hatchett
e4e5e83b1d mac build files directory 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@337 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-21 19:44:17 +00:00
James Uber
5efa30508b update vc project file for epanet dll 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@330 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-09-18 08:26:04 +00:00
James Uber
95d57ceae2 After much thought and deliberation... a change in EPANET repo 
policy regarding Makefiles and their output targets.  
Used to create library and executable file names that included
the compiler (e.g., *_gcc_*) and the SVN rev (*_309_*).  This
was to allow development along the trunk while keeping clean track
of the SVN versions that objects were made from.  

Maybe a good idea in part, but no longer.  It collapsed under its
own complexity.  The need to keep track of all the specific
file names became more burdensome that the need to keep track
of which source actually built an object.

As of now, Makefiles produce unadorned file names:

Linux:
lib<name>.so
<name>
Cygwin:
cyg<name>.dll
cyg<name>.exe
libcyg<name>.dll.a
MSVC:
<name>.dll
<name>.exe
<name>.lib
MinGW:
Same as MSVC
Darwin:
Don't know about this, but I think they already were produced
with just dy extensions

Under this scheme MinGW looks just like MSVC, but I guess that's 
the whole point...



git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@314 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-08-18 08:17:28 +00:00
James Uber
c9920ba7db Changed EPANET makefiles to use -O3 optimization level. 
git-svn-id: https://epanet.svn.sourceforge.net/svnroot/epanet/BASE/trunk@303 c320cabd-cc23-0410-96d8-e60fbf53ed7f
 2009-08-10 06:59:52 +00:00