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

Use ComponentProperties in calculation functions #2799

Merged
merged 31 commits into from
Nov 29, 2023

Conversation

dkachuma
Copy link
Contributor

@dkachuma dkachuma commented Nov 3, 2023

  • Uses the newly created ComponentProperties which bundles the component properties into one object instead of passing the list of properties independently.
  • Changes NegativeTwoPhaseFlash to not be specific to the cubic EOS model.

#2465

@dkachuma dkachuma self-assigned this Nov 3, 2023
@dkachuma dkachuma mentioned this pull request Nov 3, 2023
24 tasks
@dkachuma dkachuma added the type: cleanup / refactor Non-functional change (NFC) label Nov 10, 2023
@dkachuma dkachuma marked this pull request as ready for review November 10, 2023 03:37
@@ -44,6 +48,8 @@ struct PengRobinsonEOS
? 0.37464 + 1.54226 * omega - 0.26992 * omega * omega
: 0.3796 + 1.485 * omega - 0.164423 * omega * omega + 0.016666 * omega * omega * omega;
}

static constexpr char const * catalogName(){ return "PengRobinson"; }
Copy link
Contributor

Choose a reason for hiding this comment

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

I am not sure one needs catalogName for those things, could you help me to understand it here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There was a point to this. I believe I have a coupled of commits missing. Let me check my local branch.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Added one remaining commit. The idea is the negative two phase flash is no longer tied to the cubic eos. So the names are moved into the cubic eos objects themselves. These are used down the line in CompositionalMultiphaseFluid to give names to catalog entries.

@dkachuma dkachuma requested a review from paveltomin November 10, 2023 21:20
@dkachuma dkachuma added the ci: run CUDA builds Allows to triggers (costly) CUDA jobs label Nov 13, 2023
@CusiniM CusiniM merged commit e064ae1 into develop Nov 29, 2023
20 checks passed
@CusiniM CusiniM deleted the refactor/dkachuma/use-component-properties branch November 29, 2023 17:36
ouassimkh pushed a commit that referenced this pull request Feb 16, 2024
* Create another copy of CompositionalMultiphaseFluid

* Create template parameterised Compositional multiphase fluid

* Create phase models

* Replace template parameter pack with individual parameters

* Rename CompositionalMultiphaseFluidPVT to CompositionalMultiphaseFluidPVTPackage

* Lump component molecular weight and component names into ComponentProperties

* Implement water phase index

* Use ComponentProperties

---------
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci: run CUDA builds Allows to triggers (costly) CUDA jobs flag: ready for review type: cleanup / refactor Non-functional change (NFC)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants