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.

Sign up for GitHub

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

Jump to bottom

Properties module and fluid object #77

Merged
merged 13 commits into from
Apr 10, 2021
Merged

Properties module and fluid object #77

merged 13 commits into from
Apr 10, 2021

Conversation

j-c-cook
Copy link
Contributor

@j-c-cook j-c-cook commented Mar 2, 2021

Here's my draft of the Fluid object. I think it might be cleaner to pass the Fluid object to methods or objects that make use of the fluid properties.

@j-c-cook j-c-cook mentioned this pull request Mar 2, 2021
Closed
MassimoCimmino
MassimoCimmino reviewed Mar 20, 2021
View reviewed changes
doc/source/modules.rst Outdated Show resolved Hide resolved
pygfunction/properties.py Outdated Show resolved Hide resolved
pygfunction/properties.py Outdated Show resolved Hide resolved
pygfunction/properties.py Outdated Show resolved Hide resolved
fluid object not longer takes in m_dot, fluid object takes in tempera…
a91a78f 
…ture in celclius and print statements cleaned up
@j-c-cook
Copy link
Contributor Author

The most recent commit (a91a78f) does the following:

  • Removes m_dot from the fluid properties object
  • Takes in temperature in Celsius
  • changes print(fluid.__repr()__) to print(fluid) in the examples

@MassimoCimmino
Copy link
Owner

I submitted a PR on your fork #1 for this issue.

@j-c-cook j-c-cook marked this pull request as draft April 10, 2021 17:47
Jack Cook added 2 commits April 10, 2021 12:53
Merge pull request #1 from MassimoCimmino/issue75_FluidProperties
d5ff845 
Issue75 fluid properties
Add pure water functionality to Fluid object
6d073ff 
Coolprop provides access to incompresible mass-based binary
mixtures[1]. The string for the fluid mixture [2] appears as follows:
```
'INCOMP::Mixture-Percent%'
```
Where Mixture is replaced with a mixture to mix in with water [1] and
Percent is replaced with a value from 0-100. Although, there is an xmin
and xmax value for each mixture (shown in mixture table at [1]).

For pure water properties, the string becomes `'Water'` [3].

closes MassimoCimmino#75

[1]: http://www.coolprop.dreamhosters.com:8010/binaries/sphinx/fluid_properties/Incompressibles.html#pure
[2]: http://www.coolprop.dreamhosters.com:8010/binaries/sphinx/fluid_properties/Incompressibles.html#mixture-examples
[3]: http://www.coolprop.dreamhosters.com:8010/binaries/sphinx/fluid_properties/Incompressibles.html#mixture-examples
@j-c-cook j-c-cook force-pushed the issue75_FluidProperties branch from 7639104 to 6d073ff Compare April 10, 2021 18:33
@j-c-cook j-c-cook marked this pull request as ready for review April 10, 2021 18:36
@j-c-cook
Copy link
Contributor Author

I added the ability to access pure Water in the Fluid object and resolved conflicts from master. The conflicts were encountered because issue #81 was merged in pull request #82.

It appears to be ready to merge to me.

@MassimoCimmino MassimoCimmino merged commit d48f310 into MassimoCimmino:master Apr 10, 2021
@j-c-cook j-c-cook deleted the issue75_FluidProperties branch April 8, 2022 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MassimoCimmino MassimoCimmino MassimoCimmino approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@j-c-cook @MassimoCimmino