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

Fix merge conflict

Browse Source
This commit is contained in:
Tor Harald Sandve
2018-02-06 08:31:15 +01:00
parent 5822c362f5
commit 3f85198032
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -727,6 +727,15 @@ static const std::unordered_map< std::string, UnitSystem::measure> region_units
{"RWIP" , UnitSystem::measure::volume }
};
static const std::unordered_map< std::string, UnitSystem::measure> block_units = {
{"BPR" , UnitSystem::measure::pressure},
{"BPRESSUR" , UnitSystem::measure::pressure},
{"BSWAT" , UnitSystem::measure::identity},
{"BWSAT" , UnitSystem::measure::identity},
{"BSGAS" , UnitSystem::measure::identity},
{"BGSAS" , UnitSystem::measure::identity},
};
inline std::vector< const Well* > find_wells( const Schedule& schedule,
const smspec_node_type* node,
size_t timestep ) {

6
tests/test_Summary.cpp
View File

@@ -404,9 +404,9 @@ BOOST_AUTO_TEST_CASE(group_keywords) {
setup cfg( "test_Summary_group" );
out::Summary writer( cfg.es, cfg.config, cfg.grid, cfg.schedule, cfg.name );
writer.add_timestep( 0, 0 * day, cfg.es, cfg.schedule, cfg.wells , cfg.solution , {});
writer.add_timestep( 1, 1 * day, cfg.es, cfg.schedule, cfg.wells , cfg.solution , {});
writer.add_timestep( 2, 2 * day, cfg.es, cfg.schedule, cfg.wells , cfg.solution , {});
writer.add_timestep( 0, 0 * day, cfg.es, cfg.schedule, cfg.wells , {});
writer.add_timestep( 1, 1 * day, cfg.es, cfg.schedule, cfg.wells , {});
writer.add_timestep( 2, 2 * day, cfg.es, cfg.schedule, cfg.wells , {});
writer.write();
auto res = readsum( cfg.name );

1
tests/test_Wells.cpp
View File

@@ -127,4 +127,3 @@ BOOST_AUTO_TEST_CASE(get_completions) {
BOOST_CHECK_EQUAL( 0.0, wellRates.get("OP_2" , 10000 , data::Rates::opt::wat) );
BOOST_CHECK_EQUAL( 26.41 , wellRates.get( "OP_2" , 188 , data::Rates::opt::wat));
}