From d294bbabac70c1d037410c566cd59774dc749d91 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 23 Nov 2022 12:50:21 +0100 Subject: [PATCH] EclGenericThresholdPressure: remove deck member --- ebos/eclgenericthresholdpressure.cc | 7 +------ ebos/eclgenericthresholdpressure.hh | 6 +----- ebos/eclthresholdpressure.hh | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ebos/eclgenericthresholdpressure.cc b/ebos/eclgenericthresholdpressure.cc index 4f467f61f..2079846c5 100644 --- a/ebos/eclgenericthresholdpressure.cc +++ b/ebos/eclgenericthresholdpressure.cc @@ -24,9 +24,6 @@ #include #include -#include -#include -#include #include #include #include @@ -60,13 +57,11 @@ EclGenericThresholdPressure:: 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) { } diff --git a/ebos/eclgenericthresholdpressure.hh b/ebos/eclgenericthresholdpressure.hh index f2879c45a..404d932b3 100644 --- a/ebos/eclgenericthresholdpressure.hh +++ b/ebos/eclgenericthresholdpressure.hh @@ -34,8 +34,6 @@ namespace Opm { -class Deck; -class DeckKeyword; class EclipseState; template @@ -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 thpresDefault_; std::vector thpres_; unsigned numEquilRegions_; diff --git a/ebos/eclthresholdpressure.hh b/ebos/eclthresholdpressure.hh index 54927a606..1d2d75ed2 100644 --- a/ebos/eclthresholdpressure.hh +++ b/ebos/eclthresholdpressure.hh @@ -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) { }