OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved ColumnExtract and initState.

Browse Source 
ColumnExtract -> opm/core/grid/ and initState -> opm/core/simulator/.
This commit is contained in:
Atgeirr Flø Rasmussen
2013-03-18 12:47:23 +01:00
parent d7353145c1
commit b32674f3ea
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists_files.cmake
View File

@@ -175,6 +175,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/doxygen_main.hpp
opm/core/grid.h
opm/core/grid/CellQuadrature.hpp
opm/core/grid/ColumnExtract.hpp
opm/core/grid/FaceQuadrature.hpp
opm/core/grid/GridManager.hpp
opm/core/grid/cart_grid.h
@@ -260,6 +261,8 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/simulator/SimulatorTimer.hpp
opm/core/simulator/TwophaseState.hpp
opm/core/simulator/WellState.hpp
opm/core/simulator/initState.hpp
opm/core/simulator/initState_impl.hpp
opm/core/tof/DGBasis.hpp
opm/core/tof/TofReorder.hpp
opm/core/tof/TofDiscGalReorder.hpp
@@ -285,7 +288,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/transport/reorder/reordersequence.h
opm/core/transport/reorder/tarjan.h
opm/core/utility/Average.hpp
opm/core/utility/ColumnExtract.hpp
opm/core/utility/DataMap.hpp
opm/core/utility/ErrorMacros.hpp
opm/core/utility/Factory.hpp
@@ -301,8 +303,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/utility/WachspressCoord.hpp
opm/core/utility/buildUniformMonotoneTable.hpp
opm/core/utility/have_boost_redef.hpp
opm/core/utility/initState.hpp
opm/core/utility/initState_impl.hpp
opm/core/utility/linInt.hpp
opm/core/utility/linearInterpolation.hpp
opm/core/utility/miscUtilities.hpp

2
examples/compute_tof.cpp
View File

@@ -30,7 +30,6 @@
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
@@ -42,6 +41,7 @@
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/tof/TofReorder.hpp>
#include <opm/core/tof/TofDiscGalReorder.hpp>

2
examples/compute_tof_from_files.cpp
View File

@@ -29,7 +29,6 @@
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
#include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp>
@@ -41,6 +40,7 @@
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/pressure/IncompTpfa.hpp>
#include <opm/core/tof/TofReorder.hpp>
#include <opm/core/tof/TofDiscGalReorder.hpp>

2
examples/sim_2p_comp_reorder.cpp
View File

@@ -28,7 +28,7 @@
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/miscUtilities.hpp>

2
examples/sim_2p_incomp.cpp
View File

@@ -29,7 +29,7 @@
#include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/miscUtilities.hpp>

2
examples/wells_example.cpp
View File

@@ -3,7 +3,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/initState.hpp>
#include <opm/core/simulator/initState.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/wells/WellsManager.hpp>
#include <opm/core/grid/GridManager.hpp>

0
opm/core/utility/ColumnExtract.hpp → opm/core/grid/ColumnExtract.hpp
View File

2
opm/core/simulator/SimulatorCompressibleTwophase.cpp
View File

@@ -43,7 +43,7 @@
#include <opm/core/props/BlackoilPropertiesInterface.hpp>
#include <opm/core/props/rock/RockCompressibility.hpp>
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/grid/ColumnExtract.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>

2
opm/core/utility/initState.hpp → opm/core/simulator/initState.hpp
View File

@@ -114,6 +114,6 @@ namespace Opm
} // namespace Opm
#include <opm/core/utility/initState_impl.hpp>
#include <opm/core/simulator/initState_impl.hpp>
#endif // OPM_INITSTATE_HEADER_INCLUDED

0
opm/core/utility/initState_impl.hpp → opm/core/simulator/initState_impl.hpp
View File

2
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
View File

@@ -21,7 +21,7 @@
#include <opm/core/props/IncompPropertiesInterface.hpp>
#include <opm/core/grid.h>
#include <opm/core/transport/reorder/reordersequence.h>
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/grid/ColumnExtract.hpp>
#include <opm/core/utility/RootFinders.hpp>
#include <opm/core/utility/miscUtilities.hpp>
#include <opm/core/pressure/tpfa/trans_tpfa.h>

2
tests/test_column_extract.cpp
View File

@@ -8,7 +8,7 @@
#define BOOST_TEST_MODULE ColumnExtractTest
#include <boost/test/unit_test.hpp>
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/grid/ColumnExtract.hpp>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>