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

65 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Hatchett
265afcb01e Merge pull request #7 from OpenWaterAnalytics/elad_vb_mods 
Elad vb mods
 2015-05-27 16:46:57 -04:00
Elad Salomons
2d60f11401 update gitignore 2015-05-27 16:45:37 -04:00
Elad Salomons
4a5a58a9a7 support for VB6 and VBA 2015-05-27 16:45:26 -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
Mariosmsk
eae77fc651 Added missing ENgettimeparam EN_RULESTEP 2015-05-13 19:08:13 +03: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
Steffen Macke
f718c83701 Simpler, faster code using PUMPINDEX() 2014-01-24 18:29:09 +01:00
Steffen Macke
48f9d3989d ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns. 2014-01-24 18:01:54 +01: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
Steffen Macke
1cd06a2bed Fix ENgetlinkvalue() for EN_MINORLOSS and pumps. 2014-01-04 08:26:55 -08:00
Steffen Macke
5caf7feda3 Added ENgetheadcurve(), ENgetpumptype() and related constants. 2014-01-04 08:13:50 -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
Will Furnass
3a3d0bdc06 Fixed typo in makefiles (should be -Wl, not -W1) 2013-10-08 17:37:51 +01: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
eldemet
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
Sam Hatchett
b09492b7e2 Merge pull request #4 from thisIsMikeKane/patch-1 
Update output.c
 2013-07-09 07:04:27 -07:00
Mike Kane
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
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
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
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