Commit Graph

86 Commits

Author SHA1 Message Date
Elad Salomons ab4622b276 Updated more float types in function APIs
Updated APIs calls to support EN_API_FLOAT_TYPE and few updates to the
DEF file
2016-10-10 11:45:02 +03:00
Elad Salomons 9942f6761d Updated def file and float types in function APIs
Added the new funcions to the DEF file.
Updated VB headers from Double to Single
Changed a few APIs calls to support EN_API_FLOAT_TYPE - this needs more
work for the rest of the new functions
2016-09-24 12:28:20 +03:00
Sam Hatchett a4d27ad489 mac rpath in cmake 2016-07-25 20:12:02 -04:00
eldemet 1d83b69427 deleted redundant bat files 2016-07-15 09:53:26 +03:00
eldemet c098ca286a Create Makefile.bat 2016-07-15 09:48:43 +03:00
Sam Hatchett 880f57d237 Merge branch 'dev-2.1-doxy-markup' into dev-2.1
updates comment blocks to oxygen-compatible, and adds release notes
(draft)
2016-07-13 13:16:53 -04:00
sam hatchett 1d8d2fb882 combining testing framework with python diff script 2015-12-17 13:22:28 -05:00
Sam Hatchett de211562f2 adds cmake build for ENBOF 2015-12-16 16:28:40 -05:00
Elad Salomons 19f04fb8b3 Add WIN build for linked EXE
Now the WIN build script supports two options: one is a standalone EXE
were the entire code base is compiled into one EXE file and the second
is an EXE which is linked to the DLL
2015-12-09 21:55:16 +02:00
Sam Hatchett 4ccab6a27e simplify cmake file 2015-12-07 17:18:30 -05:00
sam hatchett bcc1dcc806 Merge branch 'dev-2.1' into doxy-trial
# Conflicts fixed:
#	include/epanet2.h
#	src/epanet.c
2015-11-28 13:22:45 -05:00
sam hatchett 82e8d2a329 Merge remote-tracking branch 'origin/dev-2.1' into dev-2.1 2015-11-28 12:41:09 -05:00
Elad Salomons 096167af8b Change ENgetheadcurve to ENgetheadcurveindex
Closes #31
2015-11-28 00:21:36 +02:00
Sam Hatchett d191ec73d6 xcode build file update to use correct input files 2015-11-25 19:41:38 -05:00
Maurizio Cingi 60dc2870f5 adapted Linux/Makefile and created runepanet.sh.template 2015-11-25 12:03:51 +01:00
Maurizio Cingi 1905c1011c adapted Linux/Makefile and created runepanet.sh.template 2015-11-25 12:01:51 +01:00
mauriziocingi ea08fb9da1 undone Warnflag declaration due to cl.exe incompatibilities , now Warnflag is retuned with errorcode 2015-11-20 13:35:40 +01:00
mauriziocingi cca1cda37a added Warnflag in exported symbols 2015-11-04 13:55:01 +01:00
Sam Hatchett 41c47bcc09 support dox in Xcode build 2015-09-30 15:14:40 -04: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
Sam Hatchett b62f179e96 more build file targets related to float-precision builds, and comments about the use of that define 2015-09-15 11:42:07 -04:00
Sam Hatchett 7dfd7f748d fixes mac compilation, adds sample networks and debug schema 2015-09-15 10:46:37 -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 13f5741310 moving Xcode build files 2015-09-15 10:02:00 -04:00
Elad Salomons c12f901454 added ENsetcoord function
also minor fix to include files
2015-09-13 09:53:21 +03:00
Will Furnass a35a61ef6d Ensure that libm is linked to in cmake-driven builds 2015-07-31 18:50:26 +01:00
Will Furnass b245f4a5a7 Request use of C99 standard in Linux Makefiles 2015-07-31 18:22:24 +01: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
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 fb63b874f8 Moving def file into build 2015-06-14 07:55:42 +03:00
Elad Salomons 2c81796f71 One click compilation for Win DLL & EXE 2015-06-13 00:32:26 +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 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 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 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
Will Furnass 3a3d0bdc06 Fixed typo in makefiles (should be -Wl, not -W1) 2013-10-08 17:37:51 +01: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 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 5bffc18798 llvm compilation changes (enum scoping)
- added useful setMultiplierForSource method to Aggregator.
2013-07-15 13:47:01 -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 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