OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix build

Browse Source 
that was a case of semantically conflicting concurrent merges.
This commit is contained in:
Andreas Lauser
2016-10-30 20:09:58 +01:00
parent 22681c3610
commit 11f95f582e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
applications/ebos/eclproblem.hh
View File

@@ -253,6 +253,7 @@ class EclProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
typedef typename GridView::template Codim<0>::Entity Element; typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext; typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager EclMaterialLawManager; typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager EclMaterialLawManager;
typedef typename GET_PROP_TYPE(TypeTag, DofMapper) DofMapper;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw; typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams; typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation; typedef typename GET_PROP_TYPE(TypeTag, Evaluation) Evaluation;
@@ -298,7 +299,7 @@ public:
, deckUnits_(simulator) , deckUnits_(simulator)
, eclWriter_(simulator) , eclWriter_(simulator)
, summaryWriter_(simulator) , summaryWriter_(simulator)
, pffDofData_(simulator.gridView()) , pffDofData_(simulator.gridView(), simulator.model().dofMapper())
{ {
// add the output module for the Ecl binary output // add the output module for the Ecl binary output
simulator.model().addOutputModule(new Ewoms::EclOutputBlackOilModule<TypeTag>(simulator)); simulator.model().addOutputModule(new Ewoms::EclOutputBlackOilModule<TypeTag>(simulator));
@@ -1323,7 +1324,7 @@ private:
EclWriter<TypeTag> eclWriter_; EclWriter<TypeTag> eclWriter_;
EclSummaryWriter summaryWriter_; EclSummaryWriter summaryWriter_;
PffGridVector<GridView, Stencil, PffDofData_> pffDofData_; PffGridVector<GridView, Stencil, PffDofData_, DofMapper> pffDofData_;
}; };
} // namespace Ewoms } // namespace Ewoms