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 #951 from andlaus/improve_SimulatorReport

Browse Source 
extend and clean up the SimulatorReport
This commit is contained in:
Atgeirr Flø Rasmussen
2016-11-30 19:34:11 +01:00
committed by GitHub
parent f6cf4bfc56 8c5f92dbc4
commit 63b0498843
18 changed files with 244 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
opm/autodiff/StandardWellsDense.hpp
View File

@@ -177,14 +177,14 @@ enum WellVariablePositions {
template <typename Simulator>
IterationReport assemble(Simulator& ebosSimulator,
SimulatorReport assemble(Simulator& ebosSimulator,
const int iterationIdx,
const double dt,
WellState& well_state) {
IterationReport iter_report = {false, false, 0, 0};
SimulatorReport report;
if ( ! localWellsActive() ) {
return iter_report;
return report;
}
resetWellControlFromState(well_state);
@@ -199,7 +199,7 @@ enum WellVariablePositions {
if (param_.solve_welleq_initially_ && iterationIdx == 0) {
// solve the well equations as a pre-processing step
iter_report = solveWellEq(ebosSimulator, dt, well_state);
report = solveWellEq(ebosSimulator, dt, well_state);
}
assembleWellEq(ebosSimulator, dt, well_state, false);
@@ -207,7 +207,8 @@ enum WellVariablePositions {
if (param_.compute_well_potentials_) {
//wellModel().computeWellPotentials(mob_perfcells, b_perfcells, state0, well_state);
}
return iter_report;
report.converged = true;
return report;
}
template <typename Simulator>
@@ -660,9 +661,8 @@ enum WellVariablePositions {
}
}
template <typename Simulator>
IterationReport solveWellEq(Simulator& ebosSimulator,
SimulatorReport solveWellEq(Simulator& ebosSimulator,
const double dt,
WellState& well_state)
{
@@ -695,9 +695,10 @@ enum WellVariablePositions {
well_state = well_state0;
}
const bool failed = false; // Not needed in this method.
const int linear_iters = 0; // Not needed in this method
return IterationReport{failed, converged, linear_iters, it};
SimulatorReport report;
report.converged = converged;
report.total_well_iterations = it;
return report;
}
void printIf(int c, double x, double y, double eps, std::string type) {
@@ -1171,9 +1172,9 @@ enum WellVariablePositions {
// We disregard terminal_ouput here as with it only messages
// for wells on one process will be printed.
std::ostringstream ss;
ss << "Switching control mode for well " << wells().name[w]
<< " from " << modestring[well_controls_iget_type(wc, current)]
<< " to " << modestring[well_controls_iget_type(wc, ctrl_index)] << std::endl;
ss << " Switching control mode for well " << wells().name[w]
<< " from " << modestring[well_controls_iget_type(wc, current)]
<< " to " << modestring[well_controls_iget_type(wc, ctrl_index)];
OpmLog::info(ss.str());
xw.currentControls()[w] = ctrl_index;
current = xw.currentControls()[w];