adjustments for imported files

- adjust include paths - add new test to build system - add new example to build system
2024-12-22 23:43:28 -06:00 · 2017-02-10 13:01:50 +01:00 · 2017-02-10 13:01:50 +01:00 · 86fbb36fd2
commit 86fbb36fd2
parent 109780f62f
14 changed files with 31 additions and 18 deletions
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@ -67,6 +67,9 @@ list (APPEND MAIN_SOURCE_FILES
  opm/simulators/SimulatorIncompTwophase.cpp
  opm/simulators/WellSwitchingLogger.cpp
  opm/simulators/vtk/writeVtkData.cpp
+  opm/simulators/timestepping/TimeStepControl.cpp
+  opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
+  opm/simulators/timestepping/SimulatorTimer.cpp
  )


@ -89,6 +92,7 @@ list (APPEND TEST_SOURCE_FILES
  tests/test_multisegmentwells.cpp
  # tests/test_thresholdpressure.cpp
  tests/test_wellswitchlogger.cpp
+  tests/test_timer.cpp
  )

 list (APPEND TEST_DATA_FILES
@ -96,6 +100,7 @@ list (APPEND TEST_DATA_FILES
  tests/VFPPROD1
  tests/VFPPROD2
  tests/msw.data
+  tests/TESTTIMER.DATA
  )


@ -117,6 +122,7 @@ list (APPEND EXAMPLE_SOURCE_FILES
  examples/sim_poly2p_incomp_reorder.cpp
  examples/sim_poly_fi2p_comp_ad.cpp
  examples/flow_polymer.cpp
+  examples/wells_example.cpp
  )

 # programs listed here will not only be compiled, but also marked for
@ -259,5 +265,12 @@ list (APPEND PUBLIC_HEADER_FILES
  opm/simulators/thresholdPressures.hpp
  opm/simulators/WellSwitchingLogger.hpp
  opm/simulators/vtk/writeVtkData.hpp
+  opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
+  opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+  opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
+  opm/simulators/timestepping/TimeStepControl.hpp
+  opm/simulators/timestepping/TimeStepControlInterface.hpp
+  opm/simulators/timestepping/SimulatorTimer.hpp
+  opm/simulators/timestepping/SimulatorTimerInterface.hpp
  )

--- a/examples/wells_example.cpp
+++ b/examples/wells_example.cpp
@ -4,7 +4,7 @@
 #include <opm/core/utility/parameters/ParameterGroup.hpp>

 #include <opm/core/simulator/initState.hpp>
-#include <opm/core/simulator/SimulatorTimer.hpp>
+#include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/core/wells/WellsManager.hpp>
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/pressure/IncompTpfa.hpp>
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@ -48,7 +48,7 @@
 #include <opm/core/simulator/initState.hpp>
 #include <opm/core/simulator/initStateEquil.hpp>
 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/core/simulator/SimulatorTimer.hpp>
+#include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/parameters/ParameterGroup.hpp>
 #include <opm/simulators/thresholdPressures.hpp> // Note: the GridHelpers must be included before this (to make overloads available). \TODO: Fix.
--- a/opm/autodiff/SimulatorBase.hpp
+++ b/opm/autodiff/SimulatorBase.hpp
@ -40,8 +40,8 @@
 #include <opm/core/pressure/flow_bc.h>

 #include <opm/core/simulator/SimulatorReport.hpp>
-#include <opm/core/simulator/SimulatorTimer.hpp>
-#include <opm/core/simulator/AdaptiveSimulatorTimer.hpp>
+#include <opm/simulators/timestepping/SimulatorTimer.hpp>
+#include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>
@ -49,7 +49,7 @@
 #include <opm/core/props/rock/RockCompressibility.hpp>

 #include <opm/core/simulator/BlackoilState.hpp>
-#include <opm/core/simulator/AdaptiveTimeStepping.hpp>
+#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
 #include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>

 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
@ -32,7 +32,7 @@
 #include <opm/autodiff/RateConverter.hpp>
 #include <opm/autodiff/SimFIBODetails.hpp>

-#include <opm/core/simulator/AdaptiveTimeStepping.hpp>
+#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
 #include <opm/core/utility/initHydroCarbonState.hpp>
 #include <opm/core/utility/StopWatch.hpp>

--- a/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp
@ -42,14 +42,14 @@

 #include <opm/core/simulator/SimulatorReport.hpp>
 #include <opm/core/simulator/SimulatorTimer.hpp>
-//#include <opm/core/simulator/AdaptiveSimulatorTimer.hpp>
+//#include <opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp>
 #include <opm/core/utility/StopWatch.hpp>
 #include <opm/core/utility/miscUtilities.hpp>
 #include <opm/core/utility/miscUtilitiesBlackoil.hpp>

 #include <opm/core/props/rock/RockCompressibility.hpp>

-//#include <opm/core/simulator/AdaptiveTimeStepping.hpp>
+//#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
 //#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>

 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
--- a/opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
+++ b/opm/simulators/timestepping/AdaptiveSimulatorTimer.cpp
@ -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
 {
--- a/opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
+++ b/opm/simulators/timestepping/AdaptiveSimulatorTimer.hpp
@ -26,7 +26,7 @@
 #include <algorithm>
 #include <numeric>

-#include <opm/core/simulator/SimulatorTimerInterface.hpp>
+#include <opm/simulators/timestepping/SimulatorTimerInterface.hpp>

 namespace Opm
 {
--- a/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping.hpp
@ -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
--- a/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
+++ b/opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
@ -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>
--- a/opm/simulators/timestepping/SimulatorTimer.hpp
+++ b/opm/simulators/timestepping/SimulatorTimer.hpp
@ -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>
--- a/opm/simulators/timestepping/TimeStepControl.cpp
+++ b/opm/simulators/timestepping/TimeStepControl.cpp
@ -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
 {
--- a/opm/simulators/timestepping/TimeStepControl.hpp
+++ b/opm/simulators/timestepping/TimeStepControl.hpp
@ -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
 {
--- a/tests/test_timer.cpp
+++ b/tests/test_timer.cpp
@ -32,7 +32,7 @@
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
-#include <opm/core/simulator/SimulatorTimer.hpp>
+#include <opm/simulators/timestepping/SimulatorTimer.hpp>
 #include <opm/parser/eclipse/Units/Units.hpp>

 #include <string>