Commit Graph

174 Commits

Author SHA1 Message Date
Sam Hatchett 7dfd7f748d fixes mac compilation, adds sample networks and debug schema 2015-09-15 10:46:37 -04:00
Sam Hatchett cb8dc35cae fixes version numbering 2015-09-15 10:46:18 -04:00
Sam Hatchett 7336d7a69d resolve git conflict 2015-09-15 10:46:06 -04:00
Sam Hatchett c9839c0eb3 adding authors listing tool and initial AUTHORS file 2015-09-15 10:45:51 -04:00
Sam Hatchett 72a9ce3026 Merge branch 'patch-2-0-13' into dev-2.1 2015-09-15 10:33:50 -04:00
Sam Hatchett 3c8d8d7211 free allocated char* for hash table entry key 2015-09-15 10:33:20 -04:00
Sam Hatchett 3f2e9eebfe Merge branch 'hash-string-copy-fix' into dev-2.1 2015-09-15 10:30:40 -04:00
Sam Hatchett 79d215732c Merge branch 'coordinates-getter' into dev-2.1
Conflicts resolved in :
	build/Linux/Makefile
	build/Linux/Makefile_Rev
	build/Xcode/epanet.xcodeproj/project.pbxproj
	include/epanet2.h
2015-09-15 10:29:27 -04:00
Sam Hatchett 3fde235ab7 fixing string copy action for hash table insertion 2015-09-15 10:12:07 -04:00
Sam Hatchett 13f5741310 moving Xcode build files 2015-09-15 10:02:00 -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 913f48f11a minor fix to VB6 & VBA include file 2015-09-13 09:56:21 +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
Sam Hatchett 4248947f3a Merge pull request #20 from willfurnass/patch-2-0-13-building_on_linux
Building on Linux: #define DLL_EXPORT as the empty string and link to libm
2015-07-31 15:04:04 -04:00
Sam Hatchett 350d32c1ef Merge pull request #19 from willfurnass/add_missing_def_to_toolkit_h
Add EN_LINKPATTERN to epanet2.h as hotfix to master
2015-07-31 14:44:21 -04:00
Will Furnass a35a61ef6d Ensure that libm is linked to in cmake-driven builds 2015-07-31 18:50:26 +01:00
Will Furnass 0f65c830a3 #define DLL_EXPORT as the empty string by default 2015-07-31 18:49:16 +01:00
Will Furnass b245f4a5a7 Request use of C99 standard in Linux Makefiles 2015-07-31 18:22:24 +01:00
Will Furnass 9088eec6ee Add (missing) EN_LINKQUAL #define to epanet2.h 2015-07-31 18:21:04 +01:00
Elad Salomons a3c7eaae15 Minor addition to vb header files 2015-07-31 14:41:18 +03:00
Elad Salomons ef2763d155 Fix to VB.Net include file
By Lew Rossman
2015-07-22 20:13:19 +03:00
Elad Salomons fecac0a03f module file for VB.Net
prepared by Lew Rossman
2015-07-21 21:07:58 +03:00
Demetrios Eliades ce633b61bd Bug correction for Windows x64 compilation code.
There seems to be an issue when creating the def file, so this was
removed. Also an absolute path which was included by accident was
removed.
2015-07-04 15:18:55 +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
Demetrios Eliades 62730e6281 Make files with relative paths
Based on @eladsal's code.

Location of Microsoft SDK is now retrieved from the registry. Also x86
and x64-bit architectures are included.
2015-06-16 09:42:19 +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 336c87cc91 fix for include file 2015-06-13 00:52:38 +03:00
Elad Salomons 2c81796f71 One click compilation for Win DLL & EXE 2015-06-13 00:32:26 +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
Elad Salomons dd286afe12 update include files 2015-06-12 23:44:29 +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 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