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

some minor cleanups

Browse Source 
this fixes a few warnings and removes now-unnecessary function arguments.
This commit is contained in:
Andreas Lauser 2017-10-10 14:07:07 +02:00
parent cede806bd5
commit ab93f58371
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -91,6 +91,10 @@ SET_BOOL_PROP(EclFlowProblem, UseVolumetricResidual, false);
// SWATINIT is done by the flow part of flow_ebos. this can be removed once the legacy // SWATINIT is done by the flow part of flow_ebos. this can be removed once the legacy
// code for fluid and satfunc handling gets fully retired. // code for fluid and satfunc handling gets fully retired.
SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false); SET_BOOL_PROP(EclFlowProblem, EnableSwatinit, false);
// Silence the deprecation warnings about the SimulatorParameter mechanism. This needs to
// be removed once the SimulatorParameter mechanism bites the dust!
SET_TYPE_PROP(EclFlowProblem, SimulatorParameter, Ewoms::EmptySimulationParameters);
}} }}
namespace Opm { namespace Opm {

12
opm/autodiff/FlowMainEbos.hpp
View File

@ -93,19 +93,17 @@ namespace Opm
/// simulator classes, based on user command-line input. The /// simulator classes, based on user command-line input. The
/// content of this function used to be in the main() function of /// content of this function used to be in the main() function of
/// flow.cpp. /// flow.cpp.
int execute(int argc, char** argv, int execute(int argc, char** argv)
std::shared_ptr<Opm::Deck> deck = std::shared_ptr<Opm::Deck>(),
std::shared_ptr<Opm::EclipseState> eclipseState = std::shared_ptr<Opm::EclipseState>() )
{ {
try { try {
setupParallelism(argc, argv); setupParallelism();
printStartupMessage(); printStartupMessage();
const bool ok = setupParameters(argc, argv); const bool ok = setupParameters(argc, argv);
if (!ok) { if (!ok) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
setupEbosSimulator( deck, eclipseState ); setupEbosSimulator();
setupOutput(); setupOutput();
setupLogging(); setupLogging();
printPRTHeader(); printPRTHeader();
@ -145,7 +143,7 @@ namespace Opm
} }
protected: protected:
void setupParallelism(int argc, char** argv) void setupParallelism()
{ {
// determine the rank of the current process and the number of processes // determine the rank of the current process and the number of processes
// involved in the simulation. MPI must have already been initialized here. // involved in the simulation. MPI must have already been initialized here.
@ -410,7 +408,7 @@ namespace Opm
detail::ParallelFileMerger(output_path, deck_filename.stem().string())); detail::ParallelFileMerger(output_path, deck_filename.stem().string()));
} }
void setupEbosSimulator( std::shared_ptr<Opm::Deck>& dck, std::shared_ptr<Opm::EclipseState>& eclipseState) void setupEbosSimulator()
{ {
std::string progName("flow_ebos"); std::string progName("flow_ebos");
std::string deckFile("--ecl-deck-file-name="); std::string deckFile("--ecl-deck-file-name=");

2
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -455,7 +455,7 @@ public:
{ return ebosSimulator_.gridManager().grid(); } { return ebosSimulator_.gridManager().grid(); }
protected: protected:
void handleAdditionalWellInflow(SimulatorTimer& timer, void handleAdditionalWellInflow(SimulatorTimer& /*timer*/,
WellsManager& /* wells_manager */, WellsManager& /* wells_manager */,
WellState& /* well_state */, WellState& /* well_state */,
const Wells* /* wells */) const Wells* /* wells */)