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

Changed direct access to struct WellControls to rather use well_controls_get_xxx() api.

Browse Source
This commit is contained in:
Joakim Hove 2014-01-09 09:32:09 +01:00
parent 671122e2e6
commit 37274035bc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/sim_2p_comp_ad.cpp
View File

@ -27,6 +27,7 @@
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/grid/GridManager.hpp> #include <opm/core/grid/GridManager.hpp>
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/well_controls.h>
#include <opm/core/wells/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/simulator/initState.hpp> #include <opm/core/simulator/initState.hpp>
@ -165,8 +166,8 @@ try
if (!ok) { if (!ok) {
OPM_THROW(std::runtime_error, "Simple well init failed."); OPM_THROW(std::runtime_error, "Simple well init failed.");
} }
simple_wells->ctrls[0]->current = 0; well_controls_set_current( simple_wells->ctrls[0] , 0);
simple_wells->ctrls[1]->current = 0; well_controls_set_current( simple_wells->ctrls[1] , 0);
} }
// Linear solver. // Linear solver.

5
opm/autodiff/SimulatorIncompTwophaseAd.cpp
View File

@ -30,6 +30,7 @@
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/well_controls.h>
#include <opm/core/pressure/flow_bc.h> #include <opm/core/pressure/flow_bc.h>
#include <opm/core/simulator/SimulatorReport.hpp> #include <opm/core/simulator/SimulatorReport.hpp>
@ -297,8 +298,8 @@ namespace Opm
const int nw = wells->number_of_wells; const int nw = wells->number_of_wells;
for (int w = 0; w < nw; ++w) { for (int w = 0; w < nw; ++w) {
const WellControls* wc = wells->ctrls[w]; const WellControls* wc = wells->ctrls[w];
if (wc->current >= 0) { if (well_controls_get_current( wc ) >= 0) {
if (wc->type[wc->current] == BHP) { if (well_controls_get_current_type(wc) == BHP ) {
return false; return false;
} }
} }