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

Added completion list to RegionCache.

Browse Source
This commit is contained in:
Joakim Hove
2016-10-12 11:36:48 +02:00
parent a8d82221a8
commit 64f5c9d13e
5 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opm/output/eclipse/RegionCache.hpp
View File

@@ -32,10 +32,14 @@ namespace out {
RegionCache() = default;
RegionCache(const EclipseState& state, const EclipseGrid& grid);
const std::vector<size_t>& cells( int region_id ) const;
const std::vector<std::pair<std::string,size_t>>& completions( int region_id ) const;
private:
std::vector<size_t> empty;
std::vector<size_t> cells_empty;
std::vector<std::pair<std::string,size_t>> completions_empty;
std::map<int , std::vector<size_t> > cell_map;
std::map<int , std::vector<std::pair<std::string,size_t>>> completion_map;
};
}
}

2
src/opm/output/eclipse/EclipseWriter.cpp
View File

@@ -417,7 +417,7 @@ EclipseWriter::Impl::Impl( const EclipseState& eclipseState,
EclipseGrid grid_)
: es( eclipseState )
, grid( std::move( grid_ ) )
, regionCache( *es , grid )
, regionCache( es , grid )
, outputDir( eclipseState.getIOConfig().getOutputDir() )
, baseName( uppercase( eclipseState.getIOConfig().getBaseName() ) )
, summary( eclipseState, eclipseState.getSummaryConfig() )

32
src/opm/output/eclipse/RegionCache.cpp
View File

@@ -18,6 +18,10 @@
*/
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/CompletionSet.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Completion.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
#include <opm/parser/eclipse/EclipseState/Eclipse3DProperties.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
@@ -34,13 +38,39 @@ namespace out {
for (auto region_id : region_values)
this->cell_map.emplace( region_id , fipnum.cellsEqual( region_id , grid ));
{
const auto& schedule = state.getSchedule();
const auto& wells = schedule.getWells();
for (const auto& well : wells) {
const auto& completions = well->getCompletions( );
for (const auto& c : completions) {
size_t global_index = grid.getGlobalIndex( c.getI() , c.getJ() , c.getK());
size_t active_index = grid.activeIndex( global_index );
int region_id =fipnum.iget( global_index );
auto& well_index_list = this->completion_map[ region_id ];
well_index_list.push_back( { well->name() , active_index } );
}
}
}
}
const std::vector<size_t>& RegionCache::cells( int region_id ) const {
const auto iter = this->cell_map.find( region_id );
if (iter == this->cell_map.end())
return this->empty;
return this->cells_empty;
else
return iter->second;
}
const std::vector<std::pair<std::string,size_t>>& RegionCache::completions( int region_id ) const {
const auto iter = this->completion_map.find( region_id );
if (iter == this->completion_map.end())
return this->completions_empty;
else
return iter->second;
}

2
tests/test_Summary.cpp
View File

@@ -182,7 +182,7 @@ struct setup {
ta( ERT::TestArea("test_summary") ),
solution( make_solution( es.getInputGrid() ) )
{
solution = make_solution( *es.getInputGrid());
solution = make_solution( es.getInputGrid());
}
};

6
tests/test_regionCache.cpp
View File

@@ -44,9 +44,9 @@ const char* path = "summary_deck.DATA";
BOOST_AUTO_TEST_CASE(create) {
ParseContext parseContext;
Parser parser;
std::shared_ptr<Deck> deck( parser.parseFile( path, parseContext ));
EclipseState es(*deck , parseContext );
const EclipseGrid& grid = *es.getInputGrid();
Deck deck( parser.parseFile( path, parseContext ));
EclipseState es(deck , parseContext );
const EclipseGrid& grid = es.getInputGrid();
out::RegionCache rc(es , grid);