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

Renamed python/cxx/common -> python/cxx/export

Browse Source
This commit is contained in:
Joakim Hove 2019-09-13 09:40:13 +02:00
parent f264c358e7
commit d2ff536cf3
19 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -249,8 +249,8 @@ if (OPM_ENABLE_PYTHON)
python/cxx/parsecontext.cpp
python/cxx/parser.cpp
python/cxx/schedule.cpp
python/cxx/common.cpp
python/cxx/common.hpp
python/cxx/export.cpp
python/cxx/export.hpp
python/cxx/common_state.cpp
python/cxx/common_state.hpp
python/cxx/table_manager.cpp

36
python/cxx/common.hpp
View File

@ -1,36 +0,0 @@
#ifndef SUNBEAM_HPP
#define SUNBEAM_HPP
#include <pybind11/pybind11.h>
namespace Opm { }
namespace py = pybind11;
using namespace Opm;
const py::return_value_policy ref_internal = py::return_value_policy::reference_internal;
const py::return_value_policy python_owner = py::return_value_policy::take_ownership;
const py::return_value_policy move = py::return_value_policy::move;
namespace python {
namespace common {
void export_all(py::module& module);
void export_Connection(py::module& module);
void export_Deck(py::module& module);
void export_DeckKeyword(py::module& module);
void export_Eclipse3DProperties(py::module& module);
void export_EclipseConfig(py::module& module);
void export_EclipseGrid(py::module& module);
void export_EclipseState(py::module& module);
void export_Group(py::module& module);
void export_GroupTree(py::module& module);
void export_ParseContext(py::module& module);
void export_Parser(py::module& module);
void export_Schedule(py::module& module);
void export_TableManager(py::module& module);
void export_Well(py::module& module);
}
}
#endif //SUNBEAM_HPP

2
python/cxx/connection.cpp
View File

@ -1,6 +1,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Connection.hpp>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/deck.cpp
View File

@ -2,7 +2,7 @@
#include <pybind11/pybind11.h>
#include "converters.hpp"
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/deck_keyword.cpp
View File

@ -5,7 +5,7 @@
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Utility/Typetools.hpp>
#include "common.hpp"
#include "export.hpp"
#include "converters.hpp"

2
python/cxx/eclipse_3d_properties.cpp
View File

@ -1,7 +1,7 @@
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <pybind11/stl.h>
#include "common.hpp"
#include "export.hpp"
#include "converters.hpp"
namespace {

2
python/cxx/eclipse_config.cpp
View File

@ -5,7 +5,7 @@
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <opm/parser/eclipse/EclipseState/SimulationConfig/SimulationConfig.hpp>
#include "common.hpp"
#include "export.hpp"
void python::common::export_EclipseConfig(py::module& module)

2
python/cxx/eclipse_grid.cpp
View File

@ -4,7 +4,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaceDir.hpp>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/eclipse_state.cpp
View File

@ -1,7 +1,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
#include "common.hpp"
#include "export.hpp"
namespace {

4
python/cxx/common.cpp → python/cxx/export.cpp
View File

@ -1,6 +1,5 @@
#include <pybind11/pybind11.h>
#include "common.hpp"
#include "export.hpp"
void python::common::export_all(py::module& module) {
@ -20,6 +19,7 @@ void python::common::export_all(py::module& module) {
export_EclipseGrid(module);
}
PYBIND11_MODULE(libopmcommon_python, module) {
python::common::export_all(module);
}

33
python/cxx/export.hpp Normal file
View File

@ -0,0 +1,33 @@
#ifndef SUNBEAM_HPP
#define SUNBEAM_HPP
#include <pybind11/pybind11.h>
namespace Opm {}
namespace py = pybind11;
using namespace Opm;
const py::return_value_policy ref_internal = py::return_value_policy::reference_internal;
const py::return_value_policy python_owner = py::return_value_policy::take_ownership;
const py::return_value_policy move = py::return_value_policy::move;
namespace python::common {
void export_all(py::module& module);
void export_Connection(py::module& module);
void export_Deck(py::module& module);
void export_DeckKeyword(py::module& module);
void export_Eclipse3DProperties(py::module& module);
void export_EclipseConfig(py::module& module);
void export_EclipseGrid(py::module& module);
void export_EclipseState(py::module& module);
void export_Group(py::module& module);
void export_GroupTree(py::module& module);
void export_ParseContext(py::module& module);
void export_Parser(py::module& module);
void export_Schedule(py::module& module);
void export_TableManager(py::module& module);
void export_Well(py::module& module);
}
#endif //SUNBEAM_HPP

2
python/cxx/group.cpp
View File

@ -1,6 +1,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group2.hpp>
#include <pybind11/stl.h>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/group_tree.cpp
View File

@ -1,7 +1,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Group/GTNode.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include "common.hpp"
#include "export.hpp"
#include "converters.hpp"
namespace {

2
python/cxx/parsecontext.cpp
View File

@ -3,7 +3,7 @@
#include <pybind11/stl.h>
#include "common_state.hpp"
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/parser.cpp
View File

@ -8,7 +8,7 @@
#include <pybind11/stl.h>
#include "common_state.hpp"
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/schedule.cpp
View File

@ -4,7 +4,7 @@
#include <pybind11/stl.h>
#include <pybind11/chrono.h>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/table_manager.cpp
View File

@ -1,6 +1,6 @@
#include <opm/parser/eclipse/EclipseState/Tables/TableManager.hpp>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/cxx/well.cpp
View File

@ -1,6 +1,6 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well2.hpp>
#include <pybind11/stl.h>
#include "common.hpp"
#include "export.hpp"
namespace {

2
python/setup.py
View File

@ -65,7 +65,7 @@ ext_modules = [
'cxx/common_state.cpp',
'cxx/table_manager.cpp',
'cxx/well.cpp',
'cxx/common.cpp'
'cxx/export.cpp'
],
libraries=['opmcommon', 'boost_filesystem', 'boost_regex', 'ecl'],
language='c++',