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

adding WellModel as template class for BlackoilModelBase

Browse Source 
the compilation and running of flow are recovered.

Conflicts:
	opm/autodiff/BlackoilModelBase_impl.hpp
This commit is contained in:
Kai Bao
2016-04-18 12:14:01 +02:00
parent 586f2cc962
commit b464e4fb4a
3 changed files with 232 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/autodiff/BlackoilModel.hpp
View File

@@ -26,6 +26,7 @@
#include <opm/autodiff/BlackoilModelBase.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
#include <opm/autodiff/StandardWells.hpp>
#include <opm/autodiff/BlackoilModelParameters.hpp>
namespace Opm {
@@ -40,10 +41,10 @@ namespace Opm {
/// It uses automatic differentiation via the class AutoDiffBlock
/// to simplify assembly of the jacobian matrix.
template<class Grid>
class BlackoilModel : public BlackoilModelBase<Grid, BlackoilModel<Grid> >
class BlackoilModel : public BlackoilModelBase<Grid, BlackoilModel<Grid>, StandardWells>
{
public:
typedef BlackoilModelBase<Grid, BlackoilModel<Grid> > Base;
typedef BlackoilModelBase<Grid, BlackoilModel<Grid>, StandardWells> Base;
/// Construct the model. It will retain references to the
/// arguments of this functions, and they are expected to