Commit Graph

94 Commits

Author SHA1 Message Date
Elad Salomons f894ade5ee Fix case when no section at top of input file
This fixes issue #13
2015-09-20 22:44:31 +03:00
Elad Salomons 472d9dd35b Added curves SET functions
ENsetcurvevalue, ENsetcurve and ENaddcurve
This should close issue #9
2015-09-18 14:54:43 +03:00
Elad Salomons 02a42fe16b Added curve GET functions
ENgetcurveindex, ENgetcurveid, ENgetcurvelen and ENgetcurvevalue. This
is for issue #9
2015-09-18 13:03:53 +03:00
Elad Salomons c23c846cd8 replace strlcpy with strncpy 2015-09-15 22:38:13 +03:00
Sam Hatchett cb8dc35cae fixes version numbering 2015-09-15 10:46:18 -04:00
Sam Hatchett 3c8d8d7211 free allocated char* for hash table entry key 2015-09-15 10:33:20 -04:00
Sam Hatchett 3fde235ab7 fixing string copy action for hash table insertion 2015-09-15 10:12:07 -04:00
Elad Salomons 2c46a002ba Changed coordinates are saved to INP
Added a flag which controls the loading of coordinates at epanet.c line
213.
When set to TRUE coordinates are loaded and users can use the ENgetcoord
and ENsetcoord functions. Changes are then saved when ENsaveinpfile is
called.
When set to FALSE coordinates are not loaded and can't be retrieved or
changed. When saved, the COORD section is copied from the original INP
file.
2015-09-13 12:56:28 +03:00
Elad Salomons c12f901454 added ENsetcoord function
also minor fix to include files
2015-09-13 09:53:21 +03:00
Elad Salomons 4d6bcef623 rewrite the coordinate getter
currently controlled from input2.c lines 297-298. will need to add a
flag to not load the coordinates.
2015-09-12 16:34:52 +03:00
Elad Salomons 186f21f9a7 update coord struct 2015-09-12 11:54:57 +03:00
Elad Salomons f9ea14e57a Fix HEAD and HEADLOSS results in report file 2015-08-20 21:59:12 +03:00
Elad Salomons 6878e046ed Removed old and unused code
A bit of code cleaning
2015-08-07 12:37:05 +03:00
Elad Salomons d0c3f59f34 Added missing parameters in the REPORT section
The MESSAGES and FILE options were not saved
2015-08-05 14:15:27 +03:00
Elad Salomons cdbd08acca Added error code and description for wrong demand category index 2015-06-30 19:39:06 +03:00
Elad Salomons 91aa538adf minor fix to VB header module 2015-06-25 23:46:28 +03:00
Elad Salomons 82553cc422 Add header documentation for new functions 2015-06-15 21:01:50 +03:00
Elad Salomons fb63b874f8 Moving def file into build 2015-06-14 07:55:42 +03:00
Elad Salomons 40cbb5f95e Check for open file in ENgetcurve and minor fixes 2015-06-13 00:16:30 +03:00
Elad Salomons 82da5db7ec more c89 conformance
variables should be declared at the beginning of functions
2015-06-13 00:01:30 +03:00
Elad Salomons 79fb7ab9a4 update def file 2015-06-12 23:51:17 +03:00
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 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 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 265afcb01e Merge pull request #7 from OpenWaterAnalytics/elad_vb_mods
Elad vb mods
2015-05-27 16:46:57 -04:00
Elad Salomons 4a5a58a9a7 support for VB6 and VBA 2015-05-27 16:45:26 -04:00
Mariosmsk eae77fc651 Added missing ENgettimeparam EN_RULESTEP 2015-05-13 19:08:13 +03:00
jamesuber 71b017e9ff minor fix to getqualinfo for trace sim type 2014-08-28 15:48:51 -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
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
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 93036690a0 new API function -- get qual info
… to retrieve chemName and units
2013-10-04 16:38:29 -04:00
Sam Hatchett 2a6f5bafc4 updated version number 2013-09-30 16:34:30 -04: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 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
jamesuber d7d0472947 ENsetbasedemand() and ENsetnodevalue() - added ENsetbasedemand to allow changes to the base demands for each demand category. Changed behavior of ENsetnodevalue when used with EN_TANKLEVEL to also set the volume in addition to the initial volume (similar to how it sets the initial head and head. Without that, we can't reset the tank head and volume from RTX. 2013-08-25 23:57:15 -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 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
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