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 rebase

Browse Source
This commit is contained in:
Tor Harald Sandve
2017-08-08 08:10:55 +02:00
parent 2bf8d48272
commit 6bca2ea69c
2 changed files with 5 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@@ -55,6 +55,8 @@ public:
typedef typename GET_PROP_TYPE(TypeTag, Indices) BlackoilIndices;
typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector ;
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef Ewoms::BlackOilPolymerModule<TypeTag> PolymerModule;
@@ -516,7 +518,7 @@ protected:
// to calculate averages over regions that might cross process
// borders. This needs to be done by all processes and therefore
// outside of the next if statement.
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
rateConverter_.template defineState<ElementContext>(ebosSimulator_);
}
}
else
@@ -524,7 +526,7 @@ protected:
{
if ( global_number_resv_wells )
{
rateConverter_->template defineState<ElementContext>(ebosSimulator_);
rateConverter_.template defineState<ElementContext>(ebosSimulator_);
}
}