mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
BlackoilModelEnums: don't use high-level classes
I consider the blackoil model enums to be pretty low level while the "FluidProperties" code is IMO quite high level. this, using the latter to define the former constitutes a layering violation IMO. note that the fix is to simply use the enums from opm-core directly.
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <opm/autodiff/AutoDiffBlock.hpp>
|
||||
#include <opm/autodiff/AutoDiffHelpers.hpp>
|
||||
#include <opm/autodiff/BlackoilModelEnums.hpp>
|
||||
#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
|
||||
|
||||
struct UnstructuredGrid;
|
||||
@@ -70,9 +71,9 @@ namespace Opm {
|
||||
Eigen::Dynamic,
|
||||
Eigen::Dynamic,
|
||||
Eigen::RowMajor> DataBlock;
|
||||
enum { Water = BlackoilPropsAdInterface::Water,
|
||||
Oil = BlackoilPropsAdInterface::Oil,
|
||||
Gas = BlackoilPropsAdInterface::Gas };
|
||||
enum { Water = Opm::Water,
|
||||
Oil = Opm::Oil,
|
||||
Gas = Opm::Gas };
|
||||
|
||||
// Data
|
||||
const UnstructuredGrid& grid_;
|
||||
|
||||
Reference in New Issue
Block a user