Merge develop to master #203

jennwuu · 2019-07-26T21:54:55Z

Closes #200
Closes #201

… update simulation datetime to reflect the new api changes

update lid control setters for before and during model simulation and…

…ion to -1 which is already handled in the swmm api

LID Support

Merging Abhi's Raingage API work

Docs update

Bug Fix Issue 164

h20melon and others added 30 commits October 19, 2018 20:09

added lid get parameters support

dbd7abe

added lid controls parameters

a16e092

fixing failed rebase

a168ef1

update pyswmm dll and add tests

925f876

add lid unit result output to include rates in lid unit layers

b4f61ff

add some lid tests

5f16b67

remove print statement

e8b4dac

remove test .so - to add later

8386cc3

remove botWidth

d65e17a

Merge branch 'master' of https://github.com/OpenWaterAnalytics/pyswmm

6b9b688

update dll

9f8fbf7

update project_findobject in swmm5.py and dll

c594886

update dll and update unit test numerical values

dfee209

update dll

a14a6d0

pollutant stats moved to the sm subpollutant struct in api

ddd175f

update unit tests

f707701

update lid classes and tests

4000045

update version # and setoverflow fnc to be compatible with python 2.7

cdd8323

delete accidently added files

563ebb4

Merge branch 'master' into master

d49109c

update lid control setters for before and during model simulation and…

ca796aa

… update simulation datetime to reflect the new api changes

fix merge request

0ceea56

Merge pull request #2 from jennwuu/update_lid_and_datetime

8914d37

update lid control setters for before and during model simulation and…

address issue #3 remove the second function call to set the other opt…

05f187f

…ion to -1 which is already handled in the swmm api

Merge remote-tracking branch 'owa/master'

68d0387

remove merged dll

151e8df

update windows dll and update pyswmm code

fd0ee5e

update lid unit test with pytest approx

885369a

update node unit test with pytest approx

e2ef909

update library files

18e8852

jennwuu and others added 22 commits July 25, 2019 21:37

update import unit test

4e17e17

typo

c5cd318

Merge pull request #152 from jennwuu/master

c821cd7

LID Support

rainfall api

57d11bb

Merge branch 'develop' into abi-master

19c00fa

added raingage abstractions with getter/setter

b7e6403

re-orged a bit

70f6041

Merge pull request #198 from bemcdonnell/abi-master

44194fa

Merging Abhi's Raingage API work

Update Docs

a072c12

More docs changes

1aae13d

Further Doc Updates - prepping for ReadTheDocs

af3f48f

Merge pull request #202 from OpenWaterAnalytics/docs_update

948ed44

Docs update

autopep8

158e651

update tutorial

ea7bbed

fix typo

8ca1de6

fix python code in tutorial

911c016

add line of space

912b163

correct evaporation spelling

da508f4

add tables to lid control code

c0a80e9

add some tables and update tutorial

ad88578

add more tables to lidgroups

1308fd6

remove redundant tables

ec76264

jennwuu requested a review from bemcdonnell July 26, 2019 21:54

bemcdonnell added this to the v0.5.0 milestone Jul 26, 2019

bemcdonnell added 2 commits July 26, 2019 17:25

Bug Fix Issue 164

0019edb

Merge pull request #204 from bemcdonnell/bug_fix164

a8ed4b8

Bug Fix Issue 164

bemcdonnell added the reso:completed label Jul 26, 2019

bemcdonnell merged commit b036905 into master Jul 26, 2019

bemcdonnell added reso:completed and removed reso:completed labels Jul 26, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge develop to master #203

Merge develop to master #203

jennwuu commented Jul 26, 2019 •

edited by bemcdonnell

Loading

Merge develop to master #203

Merge develop to master #203

Conversation

jennwuu commented Jul 26, 2019 • edited by bemcdonnell Loading

jennwuu commented Jul 26, 2019 •

edited by bemcdonnell

Loading