OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make this work with the latest master version of opm-parser

Browse Source
This commit is contained in:
Andreas Lauser 2017-02-24 16:14:33 +01:00
parent 956e7f5341
commit b15f99de5e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/material/fluidmatrixinteractions/EclEpsConfig.hpp
View File

@ -33,9 +33,11 @@
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#endif
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/Exceptions.hpp>
#endif
#include <opm/common/Unused.hpp>
#include <string>
#include <cassert>
@ -160,13 +162,13 @@ public:
*
* This requires that the opm-parser module is available.
*/
void initFromDeck(const Opm::Deck& deck,
void initFromDeck(const Opm::Deck& deck OPM_UNUSED,
const Opm::EclipseState& eclState,
Opm::EclTwoPhaseSystemType twoPhaseSystemType)
{
const auto& endscale = eclState.runspec().endpoint_scaling();
const auto& endscale = eclState.runspec().endpointScaling();
// find out if endpoint scaling is used in the first place
if( !endscale ) {
if (!endscale) {
// it is not used, i.e., just set all enable$Foo attributes to 0 and be done
// with it.
enableSatScaling_ = false;