adjustments for imported files

- adjust include paths
- add new test to build system
- add new example to build system
This commit is contained in:
Arne Morten Kvarving
2017-02-10 13:01:50 +01:00
parent 109780f62f
commit 86fbb36fd2
14 changed files with 31 additions and 18 deletions

View File

@@ -25,7 +25,7 @@
#include <numeric>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/core/simulator/AdaptiveSimulatorTimer.hpp>
#include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
namespace Opm
{

View File

@@ -26,7 +26,7 @@
#include <algorithm>
#include <numeric>
#include <opm/core/simulator/SimulatorTimerInterface.hpp>
#include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
namespace Opm
{

View File

@@ -27,7 +27,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/simulator/TimeStepControlInterface.hpp>
#include <opm/simulators/timestepping/TimeStepControlInterface.hpp>
namespace Opm {
@@ -108,5 +108,5 @@ namespace Opm {
};
}
#include <opm/core/simulator/AdaptiveTimeStepping_impl.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp>
#endif

View File

@@ -24,8 +24,8 @@
#include <utility>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/simulator/AdaptiveSimulatorTimer.hpp>
#include <opm/core/simulator/TimeStepControl.hpp>
#include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
#include <opm/simulators/timestepping/TimeStepControl.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/common/Exceptions.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>

View File

@@ -21,7 +21,7 @@
#define OPM_SIMULATORTIMER_HEADER_INCLUDED
#include <opm/parser/eclipse/EclipseState/Schedule/TimeMap.hpp>
#include <opm/core/simulator/SimulatorTimerInterface.hpp>
#include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>
#include <iosfwd>
#include <vector>

View File

@@ -29,7 +29,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/core/simulator/TimeStepControl.hpp>
#include <opm/simulators/timestepping/TimeStepControl.hpp>
namespace Opm
{

View File

@@ -25,7 +25,7 @@
#include <boost/any.hpp>
#include <boost/range/iterator_range.hpp>
#include <opm/core/simulator/TimeStepControlInterface.hpp>
#include <opm/simulators/timestepping/TimeStepControlInterface.hpp>
namespace Opm
{