mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-09-05 04:40:19 -05:00
EclGenericThresholdPressure: remove deck member
This commit is contained in:
@@ -24,9 +24,6 @@
|
||||
#include <config.h>
|
||||
#include <ebos/eclgenericthresholdpressure.hh>
|
||||
|
||||
#include <opm/material/densead/Evaluation.hpp>
|
||||
#include <opm/material/densead/Math.hpp>
|
||||
#include <opm/input/eclipse/Deck/Deck.hpp>
|
||||
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
|
||||
#include <opm/input/eclipse/EclipseState/Grid/FieldPropsManager.hpp>
|
||||
#include <opm/input/eclipse/EclipseState/Tables/Eqldims.hpp>
|
||||
@@ -60,13 +57,11 @@ EclGenericThresholdPressure<Grid,GridView,ElementMapper,Scalar>::
|
||||
EclGenericThresholdPressure(const CartesianIndexMapper& cartMapper,
|
||||
const GridView& gridView,
|
||||
const ElementMapper& elementMapper,
|
||||
const EclipseState& eclState,
|
||||
const Deck& deck)
|
||||
const EclipseState& eclState)
|
||||
: cartMapper_(cartMapper)
|
||||
, gridView_(gridView)
|
||||
, elementMapper_(elementMapper)
|
||||
, eclState_(eclState)
|
||||
, deck_(deck)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,6 @@
|
||||
|
||||
namespace Opm {
|
||||
|
||||
class Deck;
|
||||
class DeckKeyword;
|
||||
class EclipseState;
|
||||
|
||||
template<class Grid, class GridView, class ElementMapper, class Scalar>
|
||||
@@ -46,8 +44,7 @@ public:
|
||||
EclGenericThresholdPressure(const CartesianIndexMapper& cartMapper,
|
||||
const GridView& gridView,
|
||||
const ElementMapper& elementMapper,
|
||||
const EclipseState& eclState,
|
||||
const Deck& deck);
|
||||
const EclipseState& eclState);
|
||||
|
||||
/*!
|
||||
* \brief Returns the theshold pressure [Pa] for the intersection between two elements.
|
||||
@@ -91,7 +88,6 @@ protected:
|
||||
const GridView& gridView_;
|
||||
const ElementMapper& elementMapper_;
|
||||
const EclipseState& eclState_;
|
||||
const Deck& deck_;
|
||||
std::vector<Scalar> thpresDefault_;
|
||||
std::vector<Scalar> thpres_;
|
||||
unsigned numEquilRegions_;
|
||||
|
||||
@@ -74,8 +74,7 @@ public:
|
||||
: BaseType(simulator.vanguard().cartesianIndexMapper(),
|
||||
simulator.vanguard().gridView(),
|
||||
simulator.model().elementMapper(),
|
||||
simulator.vanguard().eclState(),
|
||||
simulator.vanguard().deck())
|
||||
simulator.vanguard().eclState())
|
||||
, simulator_(simulator)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user