GEOS-DEV / GEOS

GEOS Simulation Framework
GNU Lesser General Public License v2.1
203 stars 80 forks source link

Remove EOS template parameter from compositional fluid model #3166

Closed dkachuma closed 1 day ago

dkachuma commented 3 weeks ago

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

codecov[bot] commented 1 week ago

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 :warning:
...ompositional/models/NegativeTwoPhaseFlashModel.hpp 0.00% 15 Missing :warning:
...ultifluid/compositional/models/EquationOfState.hpp 38.09% 13 Missing :warning:
.../compositional/functions/NegativeTwoPhaseFlash.hpp 98.66% 2 Missing :warning:
Additional details and impacted files ```diff @@ 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 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.