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

Remove EOS template parameter from compositional fluid model #3166

Merged
merged 42 commits into from
Jul 3, 2024

Conversation

dkachuma
Copy link
Contributor

@dkachuma dkachuma commented Jun 12, 2024

The purpose of this PR is to remove the equation of state template parameter from CompositonalFluidModel. The reason for this is to reduce the number of types listed in MultiFluidSelector.hpp. It also simplifies user input.

Removing the EOS template parameter from CompositonalFluidModel cuts the number of types from 4 to 2. Instead of the EOS being implicitly determined by the object type, there is a user field equationsOfState (similar to CompositonalFluidModelPVTPackage) which determines the EOS to be used. The downside is that the EOS parameters have to be passed to the compute kernels. The selection is now done with if-else statements (e.g. FugacityCalculator.hpp).

@dkachuma dkachuma changed the title Add EOS parameters Remove EOS template parameter from compositional fluid model Jun 18, 2024
@dkachuma dkachuma self-assigned this Jun 18, 2024
@dkachuma dkachuma marked this pull request as ready for review June 27, 2024 00:16
@dkachuma dkachuma marked this pull request as draft June 27, 2024 00:20
@dkachuma dkachuma marked this pull request as ready for review June 27, 2024 00:35
@dkachuma dkachuma mentioned this pull request Jun 27, 2024
23 tasks
@dkachuma dkachuma added ci: run CUDA builds Allows to triggers (costly) CUDA jobs type: cleanup / refactor Non-functional change (NFC) labels Jun 27, 2024
@dkachuma dkachuma requested a review from paveltomin June 27, 2024 00:44
Copy link

codecov bot commented Jun 27, 2024

Codecov Report

Attention: Patch coverage is 83.85965% with 46 lines in your changes missing coverage. Please review.

Project coverage is 55.75%. Comparing base (8ef428e) to head (8fbfdae).
Report is 1 commits behind head on develop.

Files Patch % Lines
...ompositional/models/NegativeTwoPhaseFlashModel.cpp 11.11% 16 Missing ⚠️
...ompositional/models/NegativeTwoPhaseFlashModel.hpp 0.00% 15 Missing ⚠️
...ultifluid/compositional/models/EquationOfState.hpp 38.09% 13 Missing ⚠️
.../compositional/functions/NegativeTwoPhaseFlash.hpp 98.66% 2 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #3166   +/-   ##
========================================
  Coverage    55.74%   55.75%           
========================================
  Files         1038     1041    +3     
  Lines        88470    88537   +67     
========================================
+ Hits         49318    49361   +43     
- Misses       39152    39176   +24     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rrsettgast rrsettgast added the ci: run integrated tests Allows to run the integrated tests in GEOS CI label Jul 3, 2024
@rrsettgast rrsettgast merged commit 390b356 into develop Jul 3, 2024
26 checks passed
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 ci: run integrated tests Allows to run the integrated tests in GEOS CI flag: ready for review type: cleanup / refactor Non-functional change (NFC)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants