265afcb01e
Merge pull request #7 from OpenWaterAnalytics/elad_vb_mods
...
Elad vb mods
2015-05-27 16:46:57 -04:00
4a5a58a9a7
support for VB6 and VBA
2015-05-27 16:45:26 -04:00
eae77fc651
Added missing ENgettimeparam EN_RULESTEP
2015-05-13 19:08:13 +03:00
f3052ac873
Merge pull request #14 from sdteffen/usePUMPINDEX
...
Simpler, faster code using PUMPINDEX()
2014-01-27 07:31:49 -08:00
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
f718c83701
Simpler, faster code using PUMPINDEX()
2014-01-24 18:29:09 +01:00
48f9d3989d
ENgetlinkvalue(EN_LINKPATTERN) allows to retrieve pump patterns.
2014-01-24 18:01:54 +01:00
017e24be1c
Merge pull request #12 from sdteffen/pumpEN_MINORLOSS
...
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-06 10:11:37 -08:00
1cd06a2bed
Fix ENgetlinkvalue() for EN_MINORLOSS and pumps.
2014-01-04 08:26:55 -08:00
5caf7feda3
Added ENgetheadcurve(), ENgetpumptype() and related constants.
2014-01-04 08:13:50 -08:00
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
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
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
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
566eb53eb4
added getcurve function
2013-01-08 12:16:34 -05:00
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
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
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
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
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
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
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
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
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
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
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
48d806d9da
remove CRT secure def for full OWA parity
2014-09-18 17:28:57 -04:00
523d34bd93
parity with OWA root 2.00.12
2014-09-18 17:27:54 -04:00
6d3e790b58
Suppressing secure string related deprecation warnings
2014-05-20 17:06:53 -04:00
0cd38fd697
New features and bug fixes
2014-05-05 18:07:03 -04:00
993cfce8a4
Initial commit
2014-05-05 18:00:25 -04:00
Sam Hatchett