Commit Graph
100 Commits
Author SHA1 Message Date
Sam HatchettandGitHub 4d8d82ddc2 v2.2
* removing reference to strncpy

* Fixing memory problems with test_toolkit

Fixes memory leaks and some minor refactoring.

* Update test_toolkit.hpp

removing crtdbg.h from header

* Update CMakeLists.txt

Restoring test_net_builder to test_toolkit.exe

* Cleaning up include statements adding crtdbg.h

* Fixing index error in test

* Add more analysis options to the API (issue #425)

* Fixed epanet2_enums.h

* Eliminates use of temporary linked lists to process Patterns & Curves (issue #449)

* Update input2.c

* Bug fix for 2Comp and LIFO tank mixing models (issue #448)

* Triggering build to update benchmarks

* Added new reg tests

Updating reference build id

* Initial commit list

generic linked list

* Update test_list.cpp

Tests are passing

* Update list.h

Adding documentation

* Fix typo

* Fixing bug in head_list

* Fixing indentation

* Fixed memory leak

Fixed memory leak in test_head_list

* Clean up and inline comments

* Updating file headers

* Update list.c

Updating in line comments.

* Update test_list.cpp

* Fixing indent

Spaces not tabs

* Update list.c

Fixing indent

* Update test_list.cpp

Updating file header to reflect proper attribution

* Expanding test

Added test where data is a struct

* Fixing indent

* Work in progress

* Reorganized to contain list abstraction

* Update list.c

* Refactoring head_list and tail_list

Simplifying head and tail list. Adding delete_node() to list API.

* Update test_list.cpp

* Update test_list.cpp

Fixing bug on gcc

* Fixing bug

* Fixing bug on gcc

* Update CMakeLists.txt

Adding test_list to ctest

* Fixes memory leak in EN_addnode() (#455)


* Fixing memory leak in EN_addnode()

* Separating test_net_builder from test_toolkit

Making test_net_builder a standalone test

* Removing BOOST_TEST_MAIN

* Work in progress

* Updating unit tests

* Fixing compilation bug on gcc

* Work in progress

compiles with warnings, definitely not working

* Update demand.h

* Work in progress

Implementing demand_list

* Work in progress

Creating function for validateing element ID strings

* Work in progress

Refactoring cstr_copy and adding test

* Update cstr_helper.c

fixing indentation

* Update cstr_helper.c

Fixing indentation

* Update test_cstrhelper.cpp

Fixed mem leak

* Adding element id validity checks

* Adding element id validity check

Adding checks for element set id functions

* Fixing build warnings on gcc

* Update errror code from 250 to 252

* Work in progress

Implementing generic demand pattern lists. Compiles but does not run.

* Update demand.c

Work in progress

* Return object index from EN_addnode and EN_addlink (issue #432)

Adds an output argument to EN_addnode and EN_addlink that returns the index of the newly added object.
Also refactors the validity check on object ID names.

* Fixed compilation errors

* Update test_node.cpp

* Create test_demand_data.cpp

* test demand data passing

* Work in progress

Fixing problems when demand lists are null

* Passing open and close test

* get/set demand name are passing

* Updated criteria for valid object ID name

* Work in progress

* Work in progress

Working on demand lists

* Work in progress

Fixing memory leaks
Unit tests passing

* Cleaning up build on gcc

* Cleaning up gcc build

* Fixing bug

* Working on gcc bug

Tests are passing on Appveyor

* Update inpfile.c

Trying to isolate bug

* GCC Bug

* Refactored xstrcpy function

* Update inpfile.c

Testing linux build

* Update epanet.c

Trying to isolate bug

* updating get demand name and write demands

Everything passing locally

* Update test_project.cpp

Isolating bug on gcc

* Isolating bug

Not writing demand section of input file should eliminate it

* Update demand.c

Fixing bug in get_category_name when category_name is NULL

* Restoring write_demands section in saveinpfile

* Update test_demand_data.cpp

Adding index to addnode calls. Fixing indent

* Update demand.c

* Reverted handling of default pattern

When creating demands, no pattern is marked with a zero. Then when data is adjusted it gets updated to default.

* Update epanet.c

Updating EN_getnodevalue() and EN_setnodevalue() to process the primary demand located at the head of the demand list

* Update demand.c

* Work in progress

code cleanup, addressed issue raised in review, and implemented EN_adddemand()

* Adding key and search to list

* Adding remove node method to generic list

* Adding remove demand method to toolkit

* Fix bug and test remove demand

* Fix problems with setting tank parameters (issue #464 )

* Fixed NULL pointer error, if no label is provided after the rule keyword.

* Create Makefile2.bat

Co-Authored-By: Demetrios G. Eliades <eldemet@users.noreply.github.com>
Co-Authored-By: Elad Salomons <selad@optiwater.com>

* Create LICENSE

* Fixed NULL pointer error, if no label is provided after the rule keyword.
Add NULL guard in freerules function. Use strncat and strncpy to ensure
the buffer lengths are adhered to.

* For "conditional" do delete a node connected to a link

For "conditional" deletion the node is deleted only if all of its links have been explicitly deleted beforehand #473

Co-Authored-By: Lew Rossman <lrossman@outlook.com>

* Create CODE_OF_CONDUCT.md

* Refactors the API's demand editing functions

* Update test_demand.cpp

* Update CODE_OF_CONDUCT.md

* Update rules.c

Fix broken win build script

* Updates to doc files

* Documentation edits

* Update Makefile.bat

Updates on the Microsoft SDK 7.1 compilation script to generate runepanet.exe and to use the \include\epanet2.def

* Update Makefile2.bat

Modified epanet2.exe to runepanet.exe, for consistency.

* Delete epanet2.def

Deleted the redundant `epanet2.def` file in the WindSDK folder

* Minor format change to status report

* Removing status reports from CI testing

* rm WinSDK folder and update Makefiles

Co-Authored-By: Demetrios G. Eliades <eldemet@users.noreply.github.com>

* Restored CI testing of status reports

* Removes _DEBUG directives from all source files

This commit removes the #ifdef _DEBUG statements at the top of all source code files per issue #482. It also updates the doc files to stress that the speedup observed for hydraulic analysis with the MMD node re-ordering method only applies to single period runs.

* Fix refactor of types.h

* updates authors

* updates AUTHORS and generator script

* Update run\CMakeLists.txt

* add help file win_build.md

Co-Authored-By: Elad Salomons <selad@optiwater.com>

* move win_build.md to root dir and renaiming to BUILDING.md

* Move BuildAndTest.md to the tools directory

* Update BUILDING.md

* Update BUILDING.md

* Update BUILDING.md

* Fixes problem with findpattern() function (issue #498)

* Change default properties for new pipe created with EN_addlink (issue #500)

* Numerous updates to project documentation

* Adds tank overflow feature

* Updating docs for tank overflow feature

* Updating VB include files

* Update input3.c

* Identifies overflowing tank in Status Report

* Update Makefile.bat

* Update Makefile2.bat

#508

* rethinking the python wrapper (#511)

* renames certain function parameter declarations and removes double pointer call from the deleteproject function

* deprecates conditonal compilation, removes python-specific headers and function renaming

* fixes tests and docs

* fixes test

* PDA fixes

* Minor update to force new CI test

* Another minor change to force another CI test

* Fixes Overflow and PDA tests not being run

* Fix EN_getElseaction and EN_setelseaction

Co-Authored-By: Andreas Ashikkis <andreasashikkis@users.noreply.github.com>

* Add -MT switch for CMake Windows build

* Updates to the docs

* Update BUILDING.md

* Build script updates

* Fixes EN_setlinkvalue bug

* fix in EN_deleteLink

when pipes are deleted via deletelink it also deletes comment of last link

Co-Authored-By: Pavlos Pavlou <pavlou.v.pavlos@ucy.ac.cy>

* rm set to null in functions EN_deletenode, EN_deletelink

* trial actions config

* Update ccpp.yml

* welcome to the Actions beta

* fixes mkstemp file handle-leaking behavior (#529)

* reverts posix include (#533)

... because it is not needed

* Fixes bugs in pump and demand head loss gradients

* Removed dependence on unistd.h in project.c

Travis CI failed because system could not find unistd.h.

* getTmpName() and xstrcpy() made safer

* Fixed use of strncpy in xstrcpy()

* Refactor of hydcoeffs.c

Simplifies and unifies how limit on head gradient at low flow is handled.

* Update ReleaseNotes2_2.md

* Return error if node/link name is too long (#535)

* co-authored with @ehsan-shafiee

* removes errant slashes

* Throws correct error for ID name too long

* Revert "Throws correct error for ID name too long"

This reverts commit 57b4873f5882cb9fd983f7e1e5a703b9e442cd74.

* fixes #534 by bubbling error codes up from add node/link internal functions

* fixes tests on Mac at least

* fixes improper success code

* Error 252 (not 250) returned for ID name too long.

From errors.dat: DAT(252,"invalid ID name")

* Fixes problems with EN_addnode() (#543)

See issue #542 . Also modifies unit test test_node to check that fixup works.

* Adds EN_getresultindex function to the API

See issue #546 . Also fixes a small bug in project.c.

* Adds link vertex get/set functions to the API

* Fixes to EN_addlink and EN_deletelink

* Updates the docs

* Bug fix for EN_setcurve

Adjusts params of any pump that uses the curve whose data is modified by EN_setcurve or EN_setcurvevalue (issue #550 ).

* Bug fix for EN_getrule

Fixes possible seg fault condition in EN_getrule. Also defines EN_MISSING as an API constant since it can be assigned internally to several variables that are retrievable by the API.

* Updating the docs

* Adds error check to EN_setheadcurveindex

See issue #556 .

* Update epanet2.pas

* Incorrect characterd

There was a character ’ instead of ' which created an error when compiling LaTeX.

* fixes a crashing issue in freedata (#559)

The freedata function used cached values for sizes of certain arrays found in the parser struct. However, now that the network is mutable, those values can become invalid. Relying instead on the actual array lengths prevents freeing unallocated memory, or ignoring cleanup on newly created elements.

* Bug fix for valvecheck function

See issue #561

* Restored prior update to project.c that got overwritten

* Fixed editing errors made to project.c

* PDF Guide

PDF users' guide for EPANET, and some minor corrections to readme.md to fix some formatting issues.

* HTML Users Guide

* Fixes a "copy over" bug in input3.c

The copying of one input line token over another was causing a compilation error under Clang. With v2.2 this copying is no longer needed so the line of code in question was simply deleted.

This commit also deletes the HTML and Latex output generated by running Doxygen that got added from the previous update to dev since they don't really belong in a source code repo.

* Correction made to doc files

The output-format.dox file was deprecated and not included in the doxyfile so it was deleted. The description of the format of of the Energy Usage section of the binary output in toolkit-files.dox was corrected.

* Update ReleaseNotes2_2.md

I added the v2.2 contributing authors to the notes. I checked PR's from 2017 and beyond and these were the only names I could find. Please append any one I might have missed.

* Fixes problem with re-opening const. HP pumps

See latest comments in issue #528. Also, the setlinkflow() function was deleted as it was never called anywhere.

* Update README.md (#539)

* Update README.md

* Update README.md

Some section titles were re-named to conform to GitHub guidelines and the OWA info was moved to a CREDITS section.

* Update README.md

Added link to the Community Forum page.

* Replaced OWA copyright with "(see AUTHORS)".

* Update AUTHORS

Copied format used by the OWA-SWMM project.

* Update README.md

The Disclaimer section was edited to reflect that there actually is a "collaborative" connection between USEPA and OWA.

* updates CI badges

* cleanup of readme links and unused files

* possessive vs contraction

* adding contributor to notes
2019-12-10 10:19:36 -05:00
Sam HatchettandGitHub 36381129e6 Merge pull request #113 from OpenWaterAnalytics/add-license-1
Create LICENSE
2017-06-28 12:13:56 -04:00
Sam HatchettandGitHub c90d46c4d1 Create LICENSE 2017-06-28 12:13:44 -04:00
Sam Hatchett e34adc1685 update readme for v2.1 tag 2016-07-25 20:18:06 -04:00
Sam Hatchett b75055838e Merge branch 'dev-2.1' 2016-07-25 20:14:44 -04:00
Sam Hatchett e2a8e5a614 resolve conflict 2016-07-25 20:14:33 -04:00
Sam Hatchett a4d27ad489 mac rpath in cmake 2016-07-25 20:12:02 -04:00
Sam Hatchett ea6b3619f7 note about api float type 2016-07-21 11:39:16 -04:00
Sam HatchettandGitHub 997c8839e1 Merge pull request #63 from mauriziocingi/patch-1
Update epanet.c
2016-07-20 16:29:52 -04:00
Sam Hatchett 4e3efb1aba disable local file location 2016-07-14 15:28:11 -04:00
Sam Hatchett 528d972f54 updates and proper tagging for dox 2016-07-14 15:03:14 -04:00
Sam Hatchett 7f958d797d update doxyfile 2016-07-14 14:35:45 -04:00
Sam HatchettandGitHub 2c60a703b5 Update README.md 2016-07-13 13:20:56 -04:00
Sam HatchettandGitHub 2d39d1fee4 Update README.md 2016-07-13 13:19:18 -04: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 cdbe7e409a adding release notes, 2.1 2016-07-13 13:14:42 -04:00
Sam Hatchett 8d90000f3f Merge pull request #62 from OpenWaterAnalytics/dev-2.1-debug-python-test
Dev 2.1 debug python test
2015-12-17 13:52:52 -05:00
sam hatchett ff6225372a there are two hard problems.
naming things and counting things
2015-12-17 13:49:23 -05:00
sam hatchett 8fe3bbef23 fixes diff script 2015-12-17 13:46:32 -05:00
sam hatchett 81fa79745a fixing python printing 2015-12-17 13:36:53 -05:00
sam hatchett eb629b8392 better debug output 2015-12-17 13:33:33 -05:00
sam hatchett 71fa408f0b removes fake python comparator 2015-12-17 13:29:47 -05:00
sam hatchett d2625edab4 removes fake files 2015-12-17 13:24:00 -05:00
sam hatchett 1d8d2fb882 combining testing framework with python diff script 2015-12-17 13:22:28 -05:00
Sam Hatchett cb417ce08b Merge pull request #59 from bemcdonnell/dev-2.1
Minor updates to ENOutputWrapper.py; Adding OutDiff.py
2015-12-17 11:48:32 -05:00
Sam Hatchett 70e1eb5818 Merge pull request #58 from OpenWaterAnalytics/dev-2.1-test-network-script
Dev 2.1 test network script
2015-12-17 11:48:11 -05:00
Sam Hatchett 523dee5412 adds/fixes attribution 2015-12-16 16:28:40 -05:00
Sam Hatchett de211562f2 adds cmake build for ENBOF 2015-12-16 16:28:40 -05:00
Sam Hatchett 96cf6ece16 Revert "adds/fixes attribution"
This reverts commit 2f344d4884.
2015-12-15 20:41:54 -05:00
Sam Hatchett 6579a83ba3 fake files for test iteration 2015-12-15 20:39:03 -05:00
Sam Hatchett 92ea5a84a7 testing scripts and travis invocation 2015-12-15 20:38:53 -05:00
Sam Hatchett 2f344d4884 adds/fixes attribution 2015-12-15 16:40:01 -05:00
Sam Hatchett dd5d3d2e36 adds cmake build for ENBOF 2015-12-15 16:39:47 -05:00
Sam Hatchett ab470ba4e1 adding brief orientation for the contribution workflow 2015-12-10 22:15:22 -05:00
Sam Hatchett a86e330dbb Merge pull request #52 from bemcdonnell/dev-2.1
Adding Python wrapper for outputapi
2015-12-10 21:39:37 -05:00
Sam Hatchett 4ccab6a27e simplify cmake file 2015-12-07 17:18:30 -05:00
Sam Hatchett 9ff4afe6cb change badge ref for tests 2015-12-04 16:42:12 -05:00
Sam Hatchett 7351bd9a94 Merge pull request #51 from OpenWaterAnalytics/dev-2.1-travis-ci
adds travis-ci integration (basic build)
2015-12-04 16:41:26 -05:00
Sam Hatchett 5297407d3e Merge pull request #50 from michaeltryby/dev-2.1
Initial commit for EPANET binary output API
2015-12-04 16:38:45 -05:00
Sam Hatchett b937ff8e04 update readme with travis badge 2015-12-04 16:24:39 -05:00
Sam Hatchett 655f5021b5 experiment with travis ci 2015-12-04 16:04:19 -05:00
Sam Hatchett 6e7cf5f02a more dox, nesting pages
#33
2015-11-30 12:02:01 -05:00
sam hatchett 23ac6e5a55 clean up old comment block. 2015-11-28 18:59:49 -05:00
sam hatchett 90c2dfa0c4 complete function description. still needs user manual "application" examples 2015-11-28 18:58:49 -05:00
Sam Hatchett 92517b3944 declare curve-related functions in module 2015-11-28 17:10:26 -05:00
sam hatchett 5d2a1f82b5 finish moving defines to enums for better documentation 2015-11-28 13:28:32 -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 0745b6b448 adding main page content 2015-11-28 13:04:22 -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
Sam Hatchett d191ec73d6 xcode build file update to use correct input files 2015-11-25 19:41:38 -05:00
Sam Hatchett 8ef2f7e3e3 Merge pull request #39 from mauriziocingi/dev-2.1
organize the division between DLL and CLE
2015-11-25 19:28:51 -05:00
Sam Hatchett e28f24af3c migrating from defines to enums, and moving some documentation blocks into doxygen format 2015-11-25 19:26:47 -05:00
Sam Hatchett 3151805675 Merge pull request #37 from mauriziocingi/dev-2.1
added Warnflag in exported symbols
2015-11-18 08:17:57 -05:00
Sam Hatchett e484486915 moving more comments into dox, enum-wrapping and documenting property keys 2015-09-30 15:15:19 -04:00
Sam Hatchett 1c8b592e34 define module groups externally 2015-09-30 15:14:54 -04:00
Sam Hatchett 41c47bcc09 support dox in Xcode build 2015-09-30 15:14:40 -04:00
Sam Hatchett dd1f7be261 predefine DLLEXPORT to remove from docs 2015-09-29 17:21:41 -04:00
Sam Hatchett ebbe8e84e7 documenting some functions 2015-09-29 17:21:23 -04:00
Sam Hatchett 09cc193e73 grouping functions into modules and demonstrating fenced code documentation 2015-09-28 09:44:58 -04:00
Sam Hatchett 295f6f6f8b link to main header in main page 2015-09-23 16:22:34 -04:00
Sam Hatchett f6d3d08030 trying doxygen markup and config 2015-09-23 16:17:27 -04:00
Sam Hatchett c4abd61b1f cleans up the AUTHORS file generation script and mailmap
fixes #28
2015-09-16 16:07:03 -04: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 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
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
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
Sam Hatchett ee65efefc1 Update README.md 2015-06-09 13:25:00 -04:00
Sam Hatchett e2bf89b37f linking to the category 2015-06-08 16:53:42 -04:00
Sam Hatchett b52767fc0b Update README.md 2015-06-08 11:26:18 -04:00
Sam Hatchett 338f3b8e90 Update README.md 2015-06-04 15:02:53 -04:00
Sam Hatchett 7a534adf40 Update README.md 2015-06-04 15:01:42 -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
Sam Hatchett e732508b56 Merge pull request #5 from Mariosmsk/patch-1
Added missing ENgettimeparam EN_RULESTEP
2015-05-13 12:11:06 -04:00
Sam Hatchett eae1c95873 Merge pull request #16 from samhatchett/next
Next
2014-04-12 21:35:43 -04:00
sam hatchett 1527868152 updating gitignore for xc5 2014-04-12 21:33:28 -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
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
Sam Hatchett d1b02129dc Merge pull request #11 from sdteffen/pumptype
Added ENgetheadcurve(), ENgetpumptype() and related constants.
2014-01-06 10:11:23 -08:00