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

58 Commits

Author SHA1 Message Date
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
sam hatchett
18d9f16770 removed mac include (empty file) 2013-05-23 18:57:09 -04:00
mickey
f883a5551b Instead of changing block out status checking routine, water quality module considers pipe 'closed' status in the routine bypassing flow information just like tank volume changes. 2013-03-11 11:54:03 -04:00
sam hatchett
7a0dd5ec6d removed files 2013-02-04 21:28:27 -05:00
sam hatchett
b891ccbded project settings / prereq 2013-02-04 21:26:58 -05:00
sam hatchett
b4164f56b4 more stepwise mods 2013-02-04 21:17:58 -05:00
Sam Hatchett
ab87f72e29 this is the shape of the API 2013-02-01 18:11:39 -05:00
Sam Hatchett
4df40ebc3d new branch for lemon-tiger with no new api functions 2013-02-01 17:19:23 -05:00
Sam Hatchett
7a5e7feb2d cool, lemontiger works on mac 
- removed CLE_LT def -- what was that for?
 2013-01-31 15:40:12 -05:00
Sam Hatchett
4f693792c8 housekeeping - JC will need to fix this 
moved visual studio project to its own build directory, added to
gitignore so we're not versioning the build products. i don't do
windows, so Jinduan will have to make sure everything still works with
this directory structure.
 2013-01-31 15:13:40 -05:00
Sam Hatchett
a95576cb1e project settings 2013-01-31 15:08:36 -05:00
Sam Hatchett
ca2bc04cba resurrecting xcodeproj, fix gitignore 2013-01-24 09:10:23 -05:00
JinduanChen
4ae2f0e76c Some housekeeping 2013-01-24 00:53:12 -05:00
Mickey
21de4d7ad9 base sdk changed to 'current os x' 2013-01-21 17:53:48 -05:00
Sam Hatchett
ad97233410 project settings (mac) 2013-01-08 12:16:45 -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
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
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
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