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

changes to avoid warnings in compilation

Browse Source
This commit is contained in:
Jostein Alvestad
2019-10-13 19:07:47 +02:00
committed by Joakim Hove
parent 7973585db0
commit 84300d19f3
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/opm/output/eclipse/AggregateUDQData.cpp
View File

@@ -54,7 +54,14 @@ namespace {
{
return inteHead[20];
}
// maximum number of wells
/*std::size_t nwmaxz(const std::vector<int>& inteHead)
{
return inteHead[163];
}*/
namespace iUdq {

1
src/opm/output/eclipse/CreateDoubHead.cpp
View File

@@ -82,6 +82,7 @@ createDoubHead(const EclipseState& es,
const double nextTimeStep)
{
const auto& usys = es.getDeckUnitSystem();
//const auto& rspec = es.runspec();
const auto tconv = getTimeConv(usys);
auto dh = DoubHEAD{}

8
src/opm/output/eclipse/CreateInteHead.cpp
View File

@@ -190,7 +190,7 @@ namespace {
}
Opm::RestartIO::InteHEAD::UdqParam
/*Opm::RestartIO::InteHEAD::UdqParam
getUdqParam(const ::Opm::Runspec& rspec, const ::Opm::UDQConfig& udqcfg )
{
const auto& udq_par = rspec.udqParams();
@@ -209,7 +209,7 @@ namespace {
const auto max_characters_per_line = rspec.actdims().max_characters();
return { static_cast<int>(no_act), max_lines_pr_action, static_cast<int>(max_cond_per_action), static_cast<int>(max_characters_per_line)};
}
}*/
Opm::RestartIO::InteHEAD::WellSegDims
getWellSegDims(const ::Opm::Runspec& rspec,
@@ -280,8 +280,8 @@ createInteHead(const EclipseState& es,
{
const auto nwgmax = maxGroupSize(sched, lookup_step);
const auto ngmax = numGroupsInField(sched, lookup_step);
const auto& udqCfg = sched.getUDQConfig(lookup_step);
const auto& acts = sched.actions(lookup_step);
//const auto& udqCfg = sched.getUDQConfig(lookup_step);
//const auto& acts = sched.actions(lookup_step);
const auto& rspec = es.runspec();
const auto& tdim = es.getTableManager();
const auto& rdim = tdim.getRegdims();

9
tests/test_InteHEAD.cpp
View File

@@ -157,22 +157,23 @@ BOOST_AUTO_TEST_CASE(WellTableDimensions)
{
const auto numWells = 17;
const auto maxPerf = 29;
const auto maxWellInGroup = 3;
const auto maxWellsInGroup = 3;
const auto maxGroupInField = 14;
const auto maxWellInField = 20;
const auto maxWellsInField = 25;
const auto ih = Opm::RestartIO::InteHEAD{}
.wellTableDimensions({
numWells, maxPerf, maxWellInGroup, maxGroupInField, maxWellInField
numWells, maxPerf, maxWellsInGroup, maxGroupInField, maxWellsInField
});
const auto& v = ih.data();
const auto nwgmax = std::max(maxWellInGroup, maxGroupInField);
const auto nwgmax = std::max(maxWellsInGroup, maxGroupInField);
BOOST_CHECK_EQUAL(v[VI::intehead::NWELLS], numWells);
BOOST_CHECK_EQUAL(v[VI::intehead::NCWMAX], maxPerf);
BOOST_CHECK_EQUAL(v[VI::intehead::NWGMAX], nwgmax);
BOOST_CHECK_EQUAL(v[VI::intehead::NGMAXZ], maxGroupInField + 1);
BOOST_CHECK_EQUAL(v[VI::intehead::NWMAXZ], maxWellsInField);
}
BOOST_AUTO_TEST_CASE(CalendarDate)