jiang/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
141 Commits 1 Branch 0 Tags
336c87cc910c6d1f5247285d8112b21a1110cd6e
Commit Graph
90 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 263e9eb303 fix compilation defs 2015-06-12 10:35:57 -04:00
Sam Hatchett c9e1746a82 moves example networks 2015-06-12 10:35:12 -04:00
Sam Hatchett 16edcea410 fix duplicate symbols 2015-06-12 10:35:02 -04:00
Sam Hatchett 38bb3a57e0 remove old files 2015-06-12 10:34:50 -04:00
Sam Hatchett bee95a6ee2 c89 conformance 2015-06-12 10:34:40 -04:00
Sam Hatchett dfe879af19 standalone utility 2015-06-12 10:34:25 -04:00
Sam Hatchett 33edb5ba57 cmake 2015-06-12 10:34:12 -04:00
Sam Hatchett 2d064c60ec build files 2015-06-12 10:34:06 -04:00
Sam Hatchett 87a8aaaef8 better gitignore file 2015-06-12 10:06:29 -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
Sam Hatchett ee65efefc1 Update README.md 2015-06-09 13:25:00 -04:00
Sam Hatchett e2bf89b37f linking to the category 2015-06-08 16:53:42 -04:00
Sam Hatchett b52767fc0b Update README.md 2015-06-08 11:26:18 -04:00
Sam Hatchett 338f3b8e90 Update README.md 2015-06-04 15:02:53 -04:00
Sam Hatchett 7a534adf40 Update README.md 2015-06-04 15:01:42 -04:00
Sam Hatchett 265afcb01e Merge pull request #7 from OpenWaterAnalytics/elad_vb_mods 
Elad vb mods
 2015-05-27 16:46:57 -04:00
Sam Hatchett e732508b56 Merge pull request #5 from Mariosmsk/patch-1 
Added missing ENgettimeparam EN_RULESTEP
 2015-05-13 12:11:06 -04:00
Sam Hatchett eae1c95873 Merge pull request #16 from samhatchett/next 
Next
 2014-04-12 21:35:43 -04:00
sam hatchett 1527868152 updating gitignore for xc5 2014-04-12 21:33:28 -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
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
Sam Hatchett d1b02129dc Merge pull request #11 from sdteffen/pumptype 
Added ENgetheadcurve(), ENgetpumptype() and related constants.
 2014-01-06 10:11:23 -08:00
Sam Hatchett 55929ff443 Merge pull request #9 from WillFurnass/makefile_fix 
Fixed typo in makefiles
 2013-10-08 11:06:01 -07: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 6809053c0c Merge pull request #8 from samhatchett/next 
updated version number
 2013-09-30 13:35:26 -07:00
Sam Hatchett 2a6f5bafc4 updated version number 2013-09-30 16:34:30 -04:00
Sam Hatchett c3adaa79e9 Merge pull request #7 from samhatchett/next 
Next
 2013-09-30 13:30:18 -07: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 d1d03bf446 header file declarations illuminated for better IDE code completion 2013-09-30 15:09:36 -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
sam hatchett e16de988cf tank geometry and curve time series 2013-08-28 18:44:00 -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 652b73aced removed some old lemontiger declarations. 2013-07-23 09:26:11 -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
Sam Hatchett 3e92016bee zones are now DMAs 2013-07-19 11:13:58 -04:00
Sam Hatchett 6674997789 Merge pull request #5 from eldemet/patch-1 
compiler issue - for loop var declaration
 2013-07-16 06:13:42 -07:00
Sam Hatchett 5bffc18798 llvm compilation changes (enum scoping) 
- added useful setMultiplierForSource method to Aggregator.
 2013-07-15 13:47:01 -04:00
Sam Hatchett b09492b7e2 Merge pull request #4 from thisIsMikeKane/patch-1 
Update output.c
 2013-07-09 07:04:27 -07: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
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
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
Sam Hatchett ca2bc04cba resurrecting xcodeproj, fix gitignore 2013-01-24 09:10:23 -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
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
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
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