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

Moved opm/core/eclipse/* to opm/core/io/eclipse/*.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2013-03-07 22:59:06 +01:00
parent ac49972082
commit 25867007ed
32 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists_files.cmake
View File

@ -26,8 +26,6 @@
# originally generated with the command: # originally generated with the command:
# find opm -name '*.c*' -printf '\t%p\n' | sort # find opm -name '*.c*' -printf '\t%p\n' | sort
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
opm/core/eclipse/EclipseGridInspector.cpp
opm/core/eclipse/EclipseGridParser.cpp
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
opm/core/fluid/BlackoilPropertiesBasic.cpp opm/core/fluid/BlackoilPropertiesBasic.cpp
opm/core/fluid/BlackoilPropertiesFromDeck.cpp opm/core/fluid/BlackoilPropertiesFromDeck.cpp
@ -58,6 +56,8 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/grid/cpgpreprocess/processgrid.c opm/core/grid/cpgpreprocess/processgrid.c
opm/core/grid/cpgpreprocess/uniquepoints.c opm/core/grid/cpgpreprocess/uniquepoints.c
opm/core/GridManager.cpp opm/core/GridManager.cpp
opm/core/io/eclipse/EclipseGridInspector.cpp
opm/core/io/eclipse/EclipseGridParser.cpp
opm/core/linalg/call_umfpack.c opm/core/linalg/call_umfpack.c
opm/core/linalg/LinearSolverAGMG.cpp opm/core/linalg/LinearSolverAGMG.cpp
opm/core/linalg/LinearSolverFactory.cpp opm/core/linalg/LinearSolverFactory.cpp
@ -199,13 +199,13 @@ list (APPEND PUBLIC_HEADER_FILES
opm/core/transport/GravityColumnSolver.hpp opm/core/transport/GravityColumnSolver.hpp
opm/core/transport/NormSupport.hpp opm/core/transport/NormSupport.hpp
opm/core/transport/spu_explicit.h opm/core/transport/spu_explicit.h
opm/core/eclipse/SpecialEclipseFields.hpp
opm/core/eclipse/EclipseUnits.hpp
opm/core/eclipse/EclipseGridParserHelpers.hpp
opm/core/eclipse/CornerpointChopper.hpp
opm/core/eclipse/EclipseGridParser.hpp
opm/core/eclipse/EclipseGridInspector.hpp
opm/core/GridManager.hpp opm/core/GridManager.hpp
opm/core/io/eclipse/SpecialEclipseFields.hpp
opm/core/io/eclipse/EclipseUnits.hpp
opm/core/io/eclipse/EclipseGridParserHelpers.hpp
opm/core/io/eclipse/CornerpointChopper.hpp
opm/core/io/eclipse/EclipseGridParser.hpp
opm/core/io/eclipse/EclipseGridInspector.hpp
opm/core/linalg/blas_lapack.h opm/core/linalg/blas_lapack.h
opm/core/linalg/LinearSolverAGMG.hpp opm/core/linalg/LinearSolverAGMG.hpp
opm/core/linalg/LinearSolverFactory.hpp opm/core/linalg/LinearSolverFactory.hpp

2
examples/import_rewrite.cpp
View File

@ -2,7 +2,7 @@
#include "config.h" #include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <boost/filesystem/convenience.hpp> #include <boost/filesystem/convenience.hpp>

2
examples/refine_wells.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
// Double I and J coordinates of wells and completions. // Double I and J coordinates of wells and completions.
// Do not change any well productivity indices or any other data. // Do not change any well productivity indices or any other data.

2
examples/wells_example.cpp
View File

@ -1,5 +1,5 @@
#include <iostream> #include <iostream>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>

2
opm/core/GridManager.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include <opm/core/GridManager.hpp> #include <opm/core/GridManager.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/grid/cart_grid.h> #include <opm/core/grid/cart_grid.h>
#include <opm/core/grid/cornerpoint_grid.h> #include <opm/core/grid/cornerpoint_grid.h>

2
opm/core/fluid/BlackoilPropertiesFromDeck.hpp
View File

@ -25,7 +25,7 @@
#include <opm/core/fluid/RockFromDeck.hpp> #include <opm/core/fluid/RockFromDeck.hpp>
#include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp> #include <opm/core/fluid/blackoil/BlackoilPvtProperties.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp> #include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>

2
opm/core/fluid/IncompPropertiesFromDeck.hpp
View File

@ -24,7 +24,7 @@
#include <opm/core/fluid/RockFromDeck.hpp> #include <opm/core/fluid/RockFromDeck.hpp>
#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp> #include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/fluid/SaturationPropsFromDeck.hpp> #include <opm/core/fluid/SaturationPropsFromDeck.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
struct UnstructuredGrid; struct UnstructuredGrid;

2
opm/core/fluid/PvtPropertiesIncompFromDeck.cpp
View File

@ -20,7 +20,7 @@
#include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp> #include <opm/core/fluid/PvtPropertiesIncompFromDeck.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp> #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>

2
opm/core/fluid/PvtPropertiesIncompFromDeck.hpp
View File

@ -21,7 +21,7 @@
#define OPM_PVTPROPERTIESINCOMPFROMDECK_HEADER_INCLUDED #define OPM_PVTPROPERTIESINCOMPFROMDECK_HEADER_INCLUDED
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <tr1/array> #include <tr1/array>
namespace Opm namespace Opm

2
opm/core/fluid/RockCompressibility.cpp
View File

@ -18,7 +18,7 @@
*/ */
#include <opm/core/fluid/RockCompressibility.hpp> #include <opm/core/fluid/RockCompressibility.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

2
opm/core/fluid/RockFromDeck.hpp
View File

@ -21,7 +21,7 @@
#define OPM_ROCKFROMDECK_HEADER_INCLUDED #define OPM_ROCKFROMDECK_HEADER_INCLUDED
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <vector> #include <vector>
struct UnstructuredGrid; struct UnstructuredGrid;

2
opm/core/fluid/SatFuncGwseg.hpp
View File

@ -19,7 +19,7 @@
#ifndef SATFUNCGWSEG_HPP #ifndef SATFUNCGWSEG_HPP
#define SATFUNCGWSEG_HPP #define SATFUNCGWSEG_HPP
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp> #include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp> #include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>

2
opm/core/fluid/SatFuncSimple.hpp
View File

@ -19,7 +19,7 @@
#ifndef SATFUNCSIMPLE_HPP #ifndef SATFUNCSIMPLE_HPP
#define SATFUNCSIMPLE_HPP #define SATFUNCSIMPLE_HPP
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp> #include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp> #include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>

2
opm/core/fluid/SatFuncStone2.hpp
View File

@ -19,7 +19,7 @@
#ifndef SATFUNCSTONE2_HPP #ifndef SATFUNCSTONE2_HPP
#define SATFUNCSTONE2_HPP #define SATFUNCSTONE2_HPP
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/UniformTableLinear.hpp> #include <opm/core/utility/UniformTableLinear.hpp>
#include <opm/core/utility/NonuniformTableLinear.hpp> #include <opm/core/utility/NonuniformTableLinear.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>

2
opm/core/fluid/SaturationPropsFromDeck.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/fluid/SaturationPropsInterface.hpp> #include <opm/core/fluid/SaturationPropsInterface.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/fluid/SatFuncStone2.hpp> #include <opm/core/fluid/SatFuncStone2.hpp>
#include <opm/core/fluid/SatFuncSimple.hpp> #include <opm/core/fluid/SatFuncSimple.hpp>

2
opm/core/fluid/blackoil/BlackoilPvtProperties.cpp
View File

@ -26,7 +26,7 @@
#include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp> #include <opm/core/fluid/blackoil/SinglePvtLiveGas.hpp>
#include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp> #include <opm/core/fluid/blackoil/SinglePvtConstCompr.hpp>
#include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp> #include <opm/core/fluid/blackoil/phaseUsageFromDeck.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp> #include <opm/core/utility/linInt.hpp>

2
opm/core/fluid/blackoil/BlackoilPvtProperties.hpp
View File

@ -24,7 +24,7 @@
#include <opm/core/fluid/blackoil/SinglePvtInterface.hpp> #include <opm/core/fluid/blackoil/SinglePvtInterface.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <string> #include <string>
#include <tr1/memory> #include <tr1/memory>

2
opm/core/fluid/blackoil/phaseUsageFromDeck.hpp
View File

@ -21,7 +21,7 @@
#define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED #define OPM_PHASEUSAGEFROMDECK_HEADER_INCLUDED
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>

0
opm/core/eclipse/CornerpointChopper.hpp → opm/core/io/eclipse/CornerpointChopper.hpp
View File

6
opm/core/eclipse/EclipseGridInspector.cpp → opm/core/io/eclipse/EclipseGridInspector.cpp
View File

@ -42,9 +42,9 @@
#include <cmath> #include <cmath>
#include <cfloat> #include <cfloat>
#include <algorithm> #include <algorithm>
#include <opm/core/eclipse/EclipseGridInspector.hpp> #include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/SpecialEclipseFields.hpp> #include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
namespace Opm namespace Opm
{ {

0
opm/core/eclipse/EclipseGridInspector.hpp → opm/core/io/eclipse/EclipseGridInspector.hpp
View File

6
opm/core/eclipse/EclipseGridParser.cpp → opm/core/io/eclipse/EclipseGridParser.cpp
View File

@ -43,9 +43,9 @@
#include <limits> #include <limits>
#include <numeric> #include <numeric>
#include <cfloat> #include <cfloat>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/EclipseGridParserHelpers.hpp> #include <opm/core/io/eclipse/EclipseGridParserHelpers.hpp>
#include <opm/core/eclipse/SpecialEclipseFields.hpp> #include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/grid/cpgpreprocess/preprocess.h> #include <opm/core/grid/cpgpreprocess/preprocess.h>

4
opm/core/eclipse/EclipseGridParser.hpp → opm/core/io/eclipse/EclipseGridParser.hpp
View File

@ -41,8 +41,8 @@
#include <map> #include <map>
#include <set> #include <set>
#include <tr1/memory> #include <tr1/memory>
#include <opm/core/eclipse/SpecialEclipseFields.hpp> #include <opm/core/io/eclipse/SpecialEclipseFields.hpp>
#include <opm/core/eclipse/EclipseUnits.hpp> #include <opm/core/io/eclipse/EclipseUnits.hpp>
#include <opm/core/utility/Factory.hpp> #include <opm/core/utility/Factory.hpp>
#include <opm/core/grid/cornerpoint_grid.h> #include <opm/core/grid/cornerpoint_grid.h>

0
opm/core/eclipse/EclipseGridParserHelpers.hpp → opm/core/io/eclipse/EclipseGridParserHelpers.hpp
View File

0
opm/core/eclipse/EclipseUnits.hpp → opm/core/io/eclipse/EclipseUnits.hpp
View File

4
opm/core/eclipse/SpecialEclipseFields.hpp → opm/core/io/eclipse/SpecialEclipseFields.hpp
View File

@ -41,8 +41,8 @@
#include <fstream> #include <fstream>
#include <limits> #include <limits>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/eclipse/EclipseGridParserHelpers.hpp> #include <opm/core/io/eclipse/EclipseGridParserHelpers.hpp>
#include <opm/core/eclipse/EclipseUnits.hpp> #include <opm/core/io/eclipse/EclipseUnits.hpp>
namespace Opm namespace Opm
{ {

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

@ -20,7 +20,7 @@
#include <opm/core/simulator/SimulatorTimer.hpp> #include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <ostream> #include <ostream>
#include <numeric> #include <numeric>

2
opm/core/utility/initState_impl.hpp
View File

@ -23,7 +23,7 @@
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/MonotCubicInterpolator.hpp> #include <opm/core/utility/MonotCubicInterpolator.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>

2
opm/core/wells/WellCollection.hpp
View File

@ -25,7 +25,7 @@
#include <vector> #include <vector>
#include <opm/core/wells/WellsGroup.hpp> #include <opm/core/wells/WellsGroup.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
namespace Opm namespace Opm
{ {

2
opm/core/wells/WellsGroup.hpp
View File

@ -22,7 +22,7 @@
#include <opm/core/wells/InjectionSpecification.hpp> #include <opm/core/wells/InjectionSpecification.hpp>
#include <opm/core/wells/ProductionSpecification.hpp> #include <opm/core/wells/ProductionSpecification.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/fluid/blackoil/BlackoilPhases.hpp> #include <opm/core/fluid/blackoil/BlackoilPhases.hpp>
#include <string> #include <string>

2
opm/core/wells/WellsManager.cpp
View File

@ -19,7 +19,7 @@
#include <opm/core/wells/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/newwells.h> #include <opm/core/newwells.h>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

2
tests/test_column_extract.cpp
View File

@ -10,7 +10,7 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <opm/core/utility/ColumnExtract.hpp> #include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/GridManager.hpp> #include <opm/core/GridManager.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp> #include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <cstddef> #include <cstddef>