OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added change to rseg item 11

Browse Source
This commit is contained in:
Jostein Alvestad 2018-09-05 08:16:13 +02:00
parent 2889a829f8
commit 3fb7149226
3 changed files with 12 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/opm/output/eclipse/AggregateMSWData.cpp
View File

@ -495,6 +495,8 @@ namespace {
rSeg[5] = units.from_si(M::volume, welSegSet.volumeTopSegment());
rSeg[6] = rSeg[0];
rSeg[7] = rSeg[1];
// set item ind + 10 to 0.5 based on tests on E100
rSeg[10] = 0.5;
// segment pressure (to be added!!)
rSeg[ 39] = 0;
@ -527,6 +529,8 @@ namespace {
rSeg[iS + 6] = units.from_si(M::length, (welSegSet[ind].totalLength()));
rSeg[iS + 7] = units.from_si(M::length, (welSegSet[ind].depth()));
// set item ind + 10 to 0.5 based on tests on E100
rSeg[10] = 0.5;
// segment pressure (to be added!!)
rSeg[iS + 11] = 0;

37
src/opm/output/eclipse/RestartIO.cpp
View File

@ -591,6 +591,9 @@ void writeGroup(::Opm::RestartIO::ecl_rst_file_type * rst_file,
if (elm.second.target == data::TargetType::RESTART_AUXILIARY)
ecl_rst_file_add_kw( rst_file , ecl_kw(elm.first, elm.second.data, write_double).get());
}
}
// temporarily comment out jals original version
/*void writeSolution(::Opm::RestartIO::ecl_rst_file_type* rst_file, const data::Solution& solution, bool write_double) {
void writeSolution(::Opm::RestartIO::ecl_rst_file_type* rst_file, const data::Solution& solution, bool write_double) {
@ -616,10 +619,10 @@ void writeGroup(::Opm::RestartIO::ecl_rst_file_type * rst_file,
if (elm.second.target == data::TargetType::RESTART_AUXILIARY)
::Opm::RestartIO::ecl_rst_file_add_kw( rst_file , ecl_kw(elm.first, elm.second.data, write_double).get());
}
}
} */
void writeExtraData(::Opm::RestartIO::ecl_rst_file_type* rst_file, const RestartValue::ExtraVector& extra_data) {
void writeExtraData(::Opm::RestartIO::ecl_rst_file_type* rst_file, const RestartValue::ExtraVector& extra_data) {
for (const auto& extra_value : extra_data) {
const std::string& key = extra_value.first.key;
const std::vector<double>& data = extra_value.second;
@ -699,32 +702,6 @@ void checkSaveArguments(const EclipseState& es,
if (thpres.size() != num_regions * num_regions)
throw std::runtime_error("THPRES vector has invalid size - should have num_region * num_regions.");
const RestartValue& restart_value,
const EclipseGrid& grid) {
for (const auto& elm: restart_value.solution)
if (elm.second.data.size() != grid.getNumActive())
throw std::runtime_error("Wrong size on solution vector: " + elm.first);
/*if (es.getSimulationConfig().getThresholdPressure().size() > 0) {
// If the the THPRES option is active the restart_value should have a
// THPRES field. This is not enforced here because not all the opm
// simulators have been updated to include the THPRES values.
if (!restart_value.hasExtra("THPRES")) {
OpmLog::warning("This model has THPRES active - should have THPRES as part of restart data.");
return;
}
size_t num_regions = es.getTableManager().getEqldims().getNumEquilRegions();
const auto& thpres = restart_value.getExtra("THPRES");
if (thpres.size() != num_regions * num_regions)
throw std::runtime_error("THPRES vector has invalid size - should have num_region * num_regions.");
size_t num_regions = es.getTableManager().getEqldims().getNumEquilRegions();
const auto& thpres = restart_value.getExtra("THPRES");
if (thpres.size() != num_regions * num_regions)
throw std::runtime_error("THPRES vector has invalid size - should have num_region * num_regions.");*/
}
}
} // Anonymous namespace
@ -769,10 +746,10 @@ void save(const std::string& filename,
std::vector<int> inteHD = ::Opm::RestartIO::writeHeader(rst_file.get() , sim_step, report_step, seconds_elapsed, ert_phase_mask, units, schedule , grid, es);
::Opm::RestartIO::writeGroup(rst_file.get() , sim_step, seconds_elapsed, ert_phase_mask, units, schedule, grid, es, sumState, inteHD);
::Opm::RestartIO::writeMSWData(rst_file.get() , sim_step, seconds_elapsed, ert_phase_mask, units, schedule, grid, es, sumState, inteHD);
::Opm::RestartIO::writeWell( rst_file.get(), sim_step, es , grid, schedule, value.wells);
::Opm::RestartIO::writeWell( rst_file.get(), sim_step, units, es , grid, schedule, value.wells, sumState, inteHD);
::Opm::RestartIO::writeSolution( rst_file.get(), value, write_double );
if (!ecl_compatible_rst)
::Opm::RestartIO:: writeExtraData( rst_file.get(), value.extra );
::Opm::RestartIO::writeExtraData( rst_file.get(), value.extra );
}
}

2
tests/test_Restart.cpp
View File

@ -679,7 +679,7 @@ BOOST_AUTO_TEST_CASE(STORE_THPRES) {
restart_value2,
setup.es,
setup.grid,
setup.schedule);
setup.schedule, sumState);
{
ecl_file_type * rst_file = ecl_file_open("FILE2.UNRST", 0);