OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

don't set the control from the schedule, unfix the restart issue

Browse Source
This commit is contained in:
Tor Harald Sandve 2019-09-30 15:22:31 +02:00
parent f71d6c8623
commit 88d8e2a68e
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -574,8 +574,8 @@ namespace Opm {
// for ecl compatible restart the current controls are not written
const auto& ioCfg = eclState().getIOConfig();
const auto ecl_compatible_rst = ioCfg.getEclCompatibleRST();
if (ecl_compatible_rst) {
const auto ecl_compatible_rst = ioCfg.getEclCompatibleRST();
if (true || ecl_compatible_rst) { // always set the control from the schedule
for (int w = 0; w <nw; ++w) {
const int nw_wells_ecl = wells_ecl_.size();
int index_well_ecl = 0;
@ -1472,8 +1472,8 @@ namespace Opm {
state.bhp()[ well_index ] = well.bhp;
state.temperature()[ well_index ] = well.temperature;
state.currentInjectionControls()[ well_index ] = static_cast<Opm::Well2::InjectorCMode>(well.injectionControl);
state.currentProductionControls()[ well_index ] = static_cast<Well2::ProducerCMode>(well.productionControl);
//state.currentInjectionControls()[ well_index ] = static_cast<Opm::Well2::InjectorCMode>(well.injectionControl);
//state.currentProductionControls()[ well_index ] = static_cast<Well2::ProducerCMode>(well.productionControl);
const auto wellrate_index = well_index * np;
for( size_t i = 0; i < phs.size(); ++i ) {
@ -1481,33 +1481,31 @@ namespace Opm {
state.wellRates()[ wellrate_index + i ] = well.rates.get( phs[ i ] );
}
#warning get out of memory issue on restart where the number of wells doesnt match. Not related to this PR
// const auto perforation_pressure = []( const data::Connection& comp ) {
// return comp.pressure;
// };
const auto perforation_pressure = []( const data::Connection& comp ) {
return comp.pressure;
};
// const auto perforation_reservoir_rate = []( const data::Connection& comp ) {
// return comp.reservoir_rate;
// };
const auto perforation_reservoir_rate = []( const data::Connection& comp ) {
return comp.reservoir_rate;
};
std::transform( well.connections.begin(),
well.connections.end(),
state.perfPress().begin() + wm.second[ 1 ],
perforation_pressure );
// std::transform( well.connections.begin(),
// well.connections.end(),
// state.perfPress().begin() + wm.second[ 1 ],
// perforation_pressure );
std::transform( well.connections.begin(),
well.connections.end(),
state.perfRates().begin() + wm.second[ 1 ],
perforation_reservoir_rate );
// std::transform( well.connections.begin(),
// well.connections.end(),
// state.perfRates().begin() + wm.second[ 1 ],
// perforation_reservoir_rate );
// int local_comp_index = 0;
// for (const data::Connection& comp : well.connections) {
// const int global_comp_index = wm.second[1] + local_comp_index;
// for (int phase_index = 0; phase_index < np; ++phase_index) {
// state.perfPhaseRates()[global_comp_index*np + phase_index] = comp.rates.get(phs[phase_index]);
// }
// ++local_comp_index;
// }
int local_comp_index = 0;
for (const data::Connection& comp : well.connections) {
const int global_comp_index = wm.second[1] + local_comp_index;
for (int phase_index = 0; phase_index < np; ++phase_index) {
state.perfPhaseRates()[global_comp_index*np + phase_index] = comp.rates.get(phs[phase_index]);
}
++local_comp_index;
}
if (handle_ms_well && !well.segments.empty()) {
// we need the well_ecl_ information

4
opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
View File

@ -392,8 +392,8 @@ namespace Opm
for( const auto& wt : this->wellMap() ) {
const auto w = wt.second[ 0 ];
auto& well = res.at( wt.first );
well.injectionControl = static_cast<int>(this->currentInjectionControls()[ w ]);
well.productionControl = static_cast<int>(this->currentProductionControls()[ w ]);
//well.injectionControl = static_cast<int>(this->currentInjectionControls()[ w ]);
//well.productionControl = static_cast<int>(this->currentProductionControls()[ w ]);
const int well_rate_index = w * pu.num_phases;
if ( pu.phase_used[Water] ) {

10
tests/test_ecl_output.cc
View File

@ -222,8 +222,9 @@ void test_readWriteWells()
w1.rates = r1;
w1.bhp = 1.23;
w1.temperature = 3.45;
w1.injectionControl = 1;
w1.productionControl = 1;
w1.control = 1;
//w1.injectionControl = 1;
//w1.productionControl = 1;
/*
@ -236,8 +237,9 @@ void test_readWriteWells()
w2.rates = r2;
w2.bhp = 2.34;
w2.temperature = 4.56;
w1.injectionControl = 2;
w1.productionControl = 2;
w2.control = 1;
//w1.injectionControl = 2;
//w1.productionControl = 2;
w2.connections.push_back( { 188, rc3, 36.22, 19.28, 0.0, 0.0, 0.0, 0.0 } );
Opm::data::Wells wellRates;