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 documentation and change the name of ion_dspmde #858

Merged
merged 37 commits into from
Nov 30, 2022

Conversation

lbibl
Copy link
Contributor

@lbibl lbibl commented Nov 27, 2022

Changes proposed in this PR:

  • Added documentation for the formerly ion_dspmde_prop_pack.
  • rename "dspmde" to "multi-component aqueous solution (MCAS)".

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@codecov
Copy link

codecov bot commented Nov 28, 2022

Codecov Report

Merging #858 (cb25d4d) into main (80e27cd) will not change coverage.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main     #858   +/-   ##
=======================================
  Coverage   95.41%   95.41%           
=======================================
  Files         261      261           
  Lines       25196    25196           
=======================================
  Hits        24042    24042           
  Misses       1154     1154           
Impacted Files Coverage Δ
...owsheets/electrodialysis/electrodialysis_1stack.py 99.34% <100.00%> (ø)
...rtap/property_models/multicomp_aq_sol_prop_pack.py 92.30% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@lbibl lbibl marked this pull request as ready for review November 28, 2022 20:11
@lbibl lbibl self-assigned this Nov 28, 2022
@lbibl lbibl mentioned this pull request Nov 29, 2022
23 tasks
Copy link
Contributor

@TimBartholomew TimBartholomew left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@srikanthallu srikanthallu left a comment

Choose a reason for hiding this comment

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

LGTM

@bknueven bknueven enabled auto-merge (squash) November 30, 2022 16:46
@lbibl
Copy link
Contributor Author

lbibl commented Nov 30, 2022

Hi @bknueven , FYI it looks we pushed "merge main" at the same time a few min ago to address the conflicts. The latest commit is what I pushed and nothing really changed. It should be good to go after all checks. Thanks for merging this.

@bknueven bknueven merged commit 0331dcf into watertap-org:main Nov 30, 2022
@ksbeattie ksbeattie added the Priority:Normal Normal Priority Issue or PR label Dec 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:Normal Normal Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants