Merge pull request #962 from joakim-hove/remove-simulator-state

Replaced SimulatorState -> SimulationDatacontainer
This commit is contained in:
Joakim Hove 2016-03-29 13:16:19 +02:00
commit e843461b37
2 changed files with 1 additions and 2 deletions

View File

@ -76,7 +76,7 @@ try
all_cells.push_back(i); all_cells.push_back(i);
} }
Opm::TwophaseState state; Opm::TwophaseState state( grid.c_grid()->number_of_cells , grid.c_grid()->number_of_faces );
initStateFromDeck(*grid.c_grid(), incomp_properties, deck, gravity[2], state); initStateFromDeck(*grid.c_grid(), incomp_properties, deck, gravity[2], state);

View File

@ -19,7 +19,6 @@
#ifndef OPM_TIMESTEPCONTROLINTERFACE_HEADER_INCLUDED #ifndef OPM_TIMESTEPCONTROLINTERFACE_HEADER_INCLUDED
#define OPM_TIMESTEPCONTROLINTERFACE_HEADER_INCLUDED #define OPM_TIMESTEPCONTROLINTERFACE_HEADER_INCLUDED
#include <opm/core/simulator/SimulatorState.hpp>
namespace Opm namespace Opm
{ {