Merge remote-tracking branch 'upstream/master' into PR/cleanup-output-writers

This commit is contained in:
Robert Kloefkorn
2017-02-13 21:28:54 +01:00
44 changed files with 1933 additions and 35 deletions

View File

@@ -31,8 +31,7 @@
#include <opm/polymer/fullyimplicit/WellStateFullyImplicitBlackoilPolymer.hpp>
#include <opm/polymer/fullyimplicit/PolymerPropsAd.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/simulator/SimulatorTimerInterface.hpp>
#include <opm/common/data/SimulationDataContainer.hpp>
#include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
struct UnstructuredGrid;
struct Wells;