Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add getters for pollutant surface buildup and ponded concentration in subcatchments #170

Merged
merged 16 commits into from
Jun 19, 2019

Conversation

katmratliff
Copy link
Contributor

  • adds getters for buildup and concPonded
  • removes pollutant_buildup from subcatchment statistics
  • updates tests_pollutants.py

@bemcdonnell
Copy link
Member

@katmratliff, I think it would be wise for us to track the git commit number in conjunction with the version of swmm we are packaging with pyswmm inside the __init__.py file:

https://github.com/OpenWaterAnalytics/pyswmm/blob/84368b0f05f67dec4e5b338c85e3e19ce8b9f5ab/pyswmm/__init__.py#L19

For example:

__version__ = '.'.join(map(str, VERSION_INFO))
__swmm_version__ = '5.2.0.dev3'
__swmm_sha__ = "awer89q34rnoiaerer"
__author__ = 'Bryant E. McDonnell (EmNet LLC) - [email protected]'

@katmratliff
Copy link
Contributor Author

@bemcdonnell great idea.

Copy link
Contributor

@Jiadalee Jiadalee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@katmratliff it seems there is a 'passing pointer to pointer into DLL' problem from line 1139 to line 1142. Can you show me an example of the wrong values? I can help test it in my side

Copy link
Contributor

@Jiadalee Jiadalee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi: it seems there is a 'passing pointer to pointer into DLL' problem from line 1139 to line 1142. Can you show me an example of the wrong values?

@Jiadalee
Copy link
Contributor

@katmratliff it seems there is a 'passing pointer to pointer into DLL' problem from line 1139 to line 1142. Can you show me an example of the wrong values? I can help to test it in my side

@katmratliff
Copy link
Contributor Author

Hi @Jiadalee, I assume you are talking about ll. 1139-1142 in swmm5.py? I'm not sure I understand what you mean by "can you show me an example of the wrong values?" This code has worked for me on windows and in linux, so more specific information about your problem would be helpful. Here is an example of how to access buildup and ponded concentration values:
https://github.com/katmratliff/pyswmm/blob/master/pyswmm/tests/test_pollutants.py

Note that you need to pass the specific pollutant name to return a numerical value.

@Jiadalee
Copy link
Contributor

Jiadalee commented Apr 1, 2019

Hi @katmratliff , no. I mean in this linkfile. It says'not yet functional (returns values that aren't right)'

@katmratliff
Copy link
Contributor Author

@Jiadalee you are looking at one commit when things were not fully functional yet - they should be now (or have been for me) with the most up-to-date version in my branch.

@Jiadalee
Copy link
Contributor

Jiadalee commented Apr 1, 2019

@katmratliff Gotta! So this problem has been fixed and test_pollutant.py is based on the this PR?

@katmratliff
Copy link
Contributor Author

Yes @Jiadalee if you download and use the code from my branch you can use the functionality that is in the test_pollutant.py file (i.e., you can access pollutant loading and ponded concentration values during a simulation).

@Jiadalee
Copy link
Contributor

Jiadalee commented Apr 1, 2019

@katmratliff Cool. Thanks. I starred your repo

@katmratliff
Copy link
Contributor Author

@bemcdonnell remind me what needs to be tested/done here to pull this in?

@bemcdonnell
Copy link
Member

@katmratliff, I think it's good. Maybe I forgot about it :(

@katmratliff
Copy link
Contributor Author

Thanks @bemcdonnell! 🎉

@katmratliff katmratliff merged commit faff598 into pyswmm:master Jun 19, 2019
katmratliff added a commit to katmratliff/pyswmm that referenced this pull request Jun 20, 2019
Merge pull request pyswmm#170 from katmratliff/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants