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 #3121

Draft
wants to merge 13 commits into
base: develop
Choose a base branch
from

Conversation

dkachuma
Copy link
Contributor

@dkachuma dkachuma commented May 10, 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. If too many types are listed here the CUDA builds fail to build CompositionalMultiphaseFVM::applyFaceDirichletBC (CompositionalMultiphaseFVM.cpp).

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 equationOfState (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).

Despite this, the build still fails when the LBC model is added. Follow up PR's to remove the viscosity template parameter as well.

@dkachuma dkachuma self-assigned this May 10, 2024
@dkachuma dkachuma added the type: cleanup / refactor Non-functional change (NFC) label May 10, 2024
@dkachuma dkachuma added flag: ready for review ci: run CUDA builds Allows to triggers (costly) CUDA jobs labels May 10, 2024
@dkachuma dkachuma marked this pull request as ready for review May 10, 2024 20:33
Copy link

codecov bot commented May 10, 2024

Codecov Report

Attention: Patch coverage is 99.15966% with 3 lines in your changes are missing coverage. Please review.

Project coverage is 53.99%. Comparing base (720eb22) to head (f33d63e).

Files Patch % Lines
.../compositional/functions/NegativeTwoPhaseFlash.hpp 98.66% 2 Missing ⚠️
...positional/CompositionalMultiphaseFluidUpdates.hpp 87.50% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3121      +/-   ##
===========================================
+ Coverage    53.66%   53.99%   +0.33%     
===========================================
  Files          996     1000       +4     
  Lines        84848    84933      +85     
===========================================
+ Hits         45534    45860     +326     
+ Misses       39314    39073     -241     

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

@dkachuma dkachuma removed the ci: run CUDA builds Allows to triggers (costly) CUDA jobs label May 11, 2024
@dkachuma dkachuma marked this pull request as draft May 11, 2024 00:04
@dkachuma dkachuma mentioned this pull request Jun 4, 2024
23 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant