OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2621 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Atgeirr Flø Rasmussen 2020-05-14 17:04:31 +02:00 committed by GitHub
commit 53e11899fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flow/flow_ebos_blackoil.cpp
View File

@ -47,7 +47,7 @@ void flowEbosBlackoilSetDeck(double setupTime, Deck *deck, EclipseState& eclStat
} }
std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>> std::unique_ptr<Opm::FlowMainEbos<TTAG(EclFlowProblem)>>
flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFiles) flowEbosBlackoilMainInit(int argc, char** argv)
{ {
// we always want to use the default locale, and thus spare us the trouble // we always want to use the default locale, and thus spare us the trouble
// with incorrect locale settings. // with incorrect locale settings.
@ -65,7 +65,7 @@ flowEbosBlackoilMainInit(int argc, char** argv, bool outputCout, bool outputFile
// ----------------- Main program ----------------- // ----------------- Main program -----------------
int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles) int flowEbosBlackoilMain(int argc, char** argv, bool outputCout, bool outputFiles)
{ {
auto mainfunc = flowEbosBlackoilMainInit(argc, argv, outputCout, outputFiles); auto mainfunc = flowEbosBlackoilMainInit(argc, argv);
return mainfunc->execute(argc, argv, outputCout, outputFiles); return mainfunc->execute(argc, argv, outputCout, outputFiles);
} }

2
python/CMakeLists.txt
View File

@ -1,4 +1,4 @@
if(NOT TARGET pybind11) if(NOT TARGET pybind11)
add_subdirectory( pybind11 ) add_subdirectory( pybind11 )
add_subdirectory( simulators )
endif() endif()
add_subdirectory( simulators )

2
python/simulators/CMakeLists.txt
View File

@ -1,4 +1,4 @@
pybind11_add_module(simulators simulators.cpp) pybind11_add_module(simulators simulators.cpp SYSTEM)
set_target_properties( simulators PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/python/opm2 ) set_target_properties( simulators PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/python/opm2 )