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

81 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
5bffc18798 llvm compilation changes (enum scoping) 
- added useful setMultiplierForSource method to Aggregator.
 2013-07-15 13:47:01 -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
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
Mickey
21de4d7ad9 base sdk changed to 'current os x' 2013-01-21 17:53:48 -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