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

Outputwriter: use EclipseGrid

Browse Source 
- The outputwriter will now take a a separate EclipseGrid instance as
  input argument, it is assumed that calling scope has already made sure
  ACTNUM and ZCORN are correct.

- All active/inactive cell mappings are based on the grid argument, the
  naked int* with global / active cell mappings has been completely
  removed.
This commit is contained in:
Joakim Hove
2016-09-07 18:08:05 +02:00
parent ec43c9c86f
commit 204ca5932b
9 changed files with 97 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/output/eclipse/EclipseWriter.hpp
View File

@@ -46,9 +46,8 @@ public:
* \brief Sets the common attributes required to write eclipse
* binary files using ERT.
*/
EclipseWriter(std::shared_ptr< const EclipseState >,
int numCells,
const int* compressedToCartesianCellIdx);
EclipseWriter(std::shared_ptr< const EclipseState >, EclipseGrid grid);
@@ -99,8 +98,9 @@ public:
~EclipseWriter();
private:
void writeINITFile( const EclipseGrid& grid, const std::vector<data::CellData>& simProps, const NNC& nnc) const;
void writeINITFile( const std::vector<data::CellData>& simProps, const NNC& nnc) const;
void writeEGRIDFile( const NNC& nnc) const;
void init();
class Impl;
std::unique_ptr< Impl > impl;

4
opm/output/eclipse/Summary.hpp
View File

@@ -27,6 +27,8 @@
#include <ert/ecl/ecl_sum.h>
#include <ert/ecl/Smspec.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
#include <opm/output/Wells.hpp>
#include <opm/output/Cells.hpp>
@@ -46,7 +48,7 @@ class Summary {
void add_timestep( int report_step,
double secs_elapsed,
const std::vector<int>& indexMap,
const EclipseGrid& grid,
const EclipseState& es,
const std::unordered_map<int, std::vector<size_t>>& regionCells,
const data::Wells&,

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

@@ -60,26 +60,6 @@
namespace Opm {
namespace {
// throw away the data for all non-active cells and reorder to the Cartesian logic of
// eclipse
template <typename T>
std::vector<T> restrictAndReorderToActiveCells(const std::vector<T> &flow_data,
int numCells,
const int* compressedToCartesianCellIdx)
{
std::vector<T> eclData;
eclData.resize( numCells );
if (!compressedToCartesianCellIdx || (flow_data.size() == static_cast<size_t>(numCells)))
std::copy( flow_data.begin() , flow_data.end() , eclData.begin() );
else {
// activate those cells that are actually there
for (int i = 0; i < numCells; ++i)
eclData[i] = flow_data[ compressedToCartesianCellIdx[i] ];
}
return eclData;
}
inline void convertFromSiTo( std::vector< double >& siValues,
const UnitSystem& units,
@@ -330,9 +310,7 @@ class RFT {
RFT( const char* output_dir,
const char* basename,
bool format,
const int* compressed_to_cartesian,
size_t num_cells,
size_t cartesian_size );
const EclipseGrid& grid_);
void writeTimeStep( std::vector< const Well* >,
const EclipseGrid& grid,
@@ -344,33 +322,18 @@ class RFT {
const std::vector< double >& swat,
const std::vector< double >& sgas );
private:
std::vector< int > global_to_active;
ERT::FortIO fortio;
const EclipseGrid& grid;
};
RFT::RFT( const char* output_dir,
const char* basename,
bool format,
const int* compressed_to_cartesian,
size_t num_cells,
size_t cart_size ) :
global_to_active( cart_size, inactive_index ),
fortio(
FileName( output_dir, basename, ECL_RFT_FILE, format ).get(),
std::ios_base::out
)
const EclipseGrid& grid_ ) :
fortio(FileName( output_dir, basename, ECL_RFT_FILE, format ).get(),std::ios_base::out),
grid( grid_ )
{
if( !compressed_to_cartesian ) {
/* without a global to active mapping we assume identity mapping, i.e.
* 0 -> 0, 1 -> 1 etc.
*/
fun::iota range( num_cells );
std::copy( range.begin(), range.end(), this->global_to_active.begin() );
return;
}
for( size_t active_index = 0; active_index < num_cells; ++active_index )
global_to_active[ compressed_to_cartesian[ active_index ] ] = active_index;
}
inline ert_ecl_unit_enum to_ert_unit( UnitSystem::UnitType t ) {
@@ -438,9 +401,8 @@ inline std::string uppercase( std::string x ) {
class EclipseWriter::Impl {
public:
Impl( std::shared_ptr< const EclipseState > es,
int numCells,
const int* comp_to_cart);
Impl( std::shared_ptr< const EclipseState > es, EclipseGrid&& grid);
Impl( std::shared_ptr< const EclipseState > es, const EclipseGrid& grid);
std::shared_ptr< const EclipseState > es;
EclipseGrid grid;
@@ -450,40 +412,49 @@ class EclipseWriter::Impl {
out::Summary summary;
RFT rft;
time_t sim_start_time;
int numCells;
std::array< int, 3 > cartesianSize;
const int* compressed_to_cartesian;
std::vector< int > compressedToCartesian;
bool output_enabled;
int ert_phase_mask;
};
EclipseWriter::Impl::Impl( std::shared_ptr< const EclipseState > eclipseState,
int numCellsArg,
const int* compressed_to_cart)
EclipseGrid&& grid_)
: es( eclipseState )
, grid( *eclipseState->getInputGrid() )
, grid( std::move(grid_) )
, outputDir( eclipseState->getIOConfig()->getOutputDir() )
, baseName( uppercase( eclipseState->getIOConfig()->getBaseName() ) )
, summary( *eclipseState, eclipseState->getSummaryConfig() )
, rft( outputDir.c_str(), baseName.c_str(),
es->getIOConfig()->getFMTOUT(),
compressed_to_cart,
numCellsArg, es->getInputGrid()->getCartesianSize() )
grid)
, sim_start_time( es->getSchedule()->posixStartTime() )
, output_enabled( eclipseState->getIOConfig()->getOutputEnabled() )
, ert_phase_mask( ertPhaseMask( eclipseState->getTableManager() ) )
{
}
EclipseWriter::Impl::Impl( std::shared_ptr< const EclipseState > eclipseState,
const EclipseGrid& grid_)
: es( eclipseState )
, grid( grid_ )
, outputDir( eclipseState->getIOConfig()->getOutputDir() )
, baseName( uppercase( eclipseState->getIOConfig()->getBaseName() ) )
, summary( *eclipseState, eclipseState->getSummaryConfig() )
, rft( outputDir.c_str(), baseName.c_str(),
es->getIOConfig()->getFMTOUT(),
grid)
, sim_start_time( es->getSchedule()->posixStartTime() )
, numCells( numCellsArg )
, compressed_to_cartesian( compressed_to_cart )
, compressedToCartesian( numCells , int(-1) )
, output_enabled( eclipseState->getIOConfig()->getOutputEnabled() )
, ert_phase_mask( ertPhaseMask( eclipseState->getTableManager() ) )
{
}
void EclipseWriter::writeINITFile(const EclipseGrid& grid, const std::vector<data::CellData>& simProps, const NNC& nnc) const {
const auto& compressedToCartesian = this->impl->compressedToCartesian;
void EclipseWriter::writeINITFile(const std::vector<data::CellData>& simProps, const NNC& nnc) const {
const auto& es = *this->impl->es;
const auto& units = es.getUnits();
const EclipseGrid& grid = this->impl->grid;
const IOConfig& ioConfig = es.cfg().io();
FileName initFile( this->impl->outputDir,
@@ -509,12 +480,12 @@ void EclipseWriter::writeINITFile(const EclipseGrid& grid, const std::vector<dat
auto ecl_data = opm_data;
for (size_t global_index = 0; global_index < opm_data.size(); global_index++)
if (!this->impl->grid.cellActive( global_index ))
if (!grid.cellActive( global_index ))
ecl_data[global_index] = 0;
ecl_init_file_fwrite_header( fortio.get(),
this->impl->grid.c_ptr(),
grid.c_ptr(),
NULL,
this->impl->ert_phase_mask,
this->impl->sim_start_time);
@@ -540,8 +511,8 @@ void EclipseWriter::writeINITFile(const EclipseGrid& grid, const std::vector<dat
{"PERMZ" , UnitSystem::measure::permeability }};
for (const auto& kw_pair : doubleKeywords) {
const auto& opm_data = properties.getDoubleGridProperty(kw_pair.first).getData();
auto ecl_data = restrictAndReorderToActiveCells( opm_data , compressedToCartesian.size(), compressedToCartesian.data());
const auto& opm_property = properties.getDoubleGridProperty(kw_pair.first);
auto ecl_data = opm_property.compressedCopy( grid );
convertFromSiTo( ecl_data,
units,
@@ -555,8 +526,7 @@ void EclipseWriter::writeINITFile(const EclipseGrid& grid, const std::vector<dat
// Write properties which have been initialized by the simulator.
{
for (const auto& prop : simProps) {
const auto& opm_data = prop.data;
auto ecl_data = restrictAndReorderToActiveCells( opm_data, compressedToCartesian.size(), compressedToCartesian.data());
auto ecl_data = grid.compressedVector( prop.data );
convertFromSiTo( ecl_data,
units,
@@ -581,7 +551,7 @@ void EclipseWriter::writeINITFile(const EclipseGrid& grid, const std::vector<dat
properties.getKeyword("FIPNUM");
for (const auto& property : properties) {
auto ecl_data = restrictAndReorderToActiveCells( property.getData() , compressedToCartesian.size(), compressedToCartesian.data());
auto ecl_data = property.compressedCopy( grid );
writeKeyword( fortio , property.getKeywordName() , ecl_data );
}
}
@@ -608,8 +578,8 @@ void EclipseWriter::writeEGRIDFile( const NNC& nnc ) const {
ECL_EGRID_FILE,
ioConfig->getFMTOUT() );
const EclipseGrid& grid = this->impl->grid;
{
const EclipseGrid& grid = this->impl->grid;
int idx = 0;
auto* ecl_grid = const_cast< ecl_grid_type* >( grid.c_ptr() );
for (const NNCdata& n : nnc.nncdata())
@@ -627,10 +597,9 @@ void EclipseWriter::writeInitAndEgrid(const std::vector<data::CellData>& simProp
{
const auto& es = *this->impl->es;
const IOConfig& ioConfig = es.cfg().io();
const EclipseGrid& grid = this->impl->grid;
if( ioConfig.getWriteINITFile() )
writeINITFile( grid , simProps , nnc );
writeINITFile( simProps , nnc );
if( ioConfig.getWriteEGRIDFile( ) )
writeEGRIDFile( nnc );
@@ -710,7 +679,7 @@ void EclipseWriter::writeTimeStep(int report_step,
{
ecl_rsthead_type rsthead_data = {};
rsthead_data.sim_time = current_posix_time;
rsthead_data.nactive = this->impl->numCells;
rsthead_data.nactive = grid.getNumActive(),
rsthead_data.nx = grid.getNX();
rsthead_data.ny = grid.getNY();
rsthead_data.nz = grid.getNZ();
@@ -765,12 +734,8 @@ void EclipseWriter::writeTimeStep(int report_step,
else
sol.addFromCells<double>( cells );
{
const auto& compressedToCartesian = this->impl->compressedToCartesian;
for (const auto& prop : simProps) {
const auto& opm_data = prop.data;
auto ecl_data = restrictAndReorderToActiveCells( opm_data,
compressedToCartesian.size(),
compressedToCartesian.data());
auto ecl_data = grid.compressedVector( prop.data );
convertFromSiTo( ecl_data,
units,
prop.dim );
@@ -799,7 +764,7 @@ void EclipseWriter::writeTimeStep(int report_step,
this->impl->summary.add_timestep( report_step,
secs_elapsed,
this->impl->compressedToCartesian,
this->impl->grid,
*this->impl->es,
this->impl->regionCells,
wells ,
@@ -807,45 +772,25 @@ void EclipseWriter::writeTimeStep(int report_step,
this->impl->summary.write();
}
EclipseWriter::EclipseWriter( std::shared_ptr< const EclipseState > es,
int numCells,
const int* compressedToCartesianCellIdx) :
impl( new Impl( es, numCells, compressedToCartesianCellIdx) )
EclipseWriter::EclipseWriter( std::shared_ptr< const EclipseState > es, EclipseGrid grid)
: impl( new Impl( es, std::move(grid) ) )
{
// update the ACTNUM array using the processed cornerpoint grid
auto& grid = this->impl->grid;
if( !this->impl->output_enabled )
return;
{
std::vector< int > actnumData( grid.getCartesianSize(), 1 );
if ( compressedToCartesianCellIdx ) {
actnumData.assign( actnumData.size(), 0 );
for( int active_index = 0; active_index < numCells; active_index++ ) {
int global_index = compressedToCartesianCellIdx[ active_index ];
actnumData[global_index] = 1;
this->impl->compressedToCartesian[ active_index ] = global_index;
}
} else {
for( int active_index = 0; active_index < numCells; active_index++ ) {
int global_index = active_index;
actnumData[global_index] = 1;
this->impl->compressedToCartesian[ active_index ] = global_index;
}
const auto& outputDir = this->impl->outputDir;
// make sure that the output directory exists, if not try to create it
if ( !util_entry_exists( outputDir.c_str() ) ) {
util_make_path( outputDir.c_str() );
}
grid.resetACTNUM( &actnumData[0] );
}
if( !this->impl->output_enabled ) return;
const auto& outputDir = this->impl->outputDir;
// make sure that the output directory exists, if not try to create it
if ( !util_entry_exists( outputDir.c_str() ) ) {
util_make_path( outputDir.c_str() );
}
if( !util_is_directory( outputDir.c_str() ) ) {
throw std::runtime_error( "The path specified as output directory '"
+ outputDir + "' is not a directory");
if( !util_is_directory( outputDir.c_str() ) ) {
throw std::runtime_error( "The path specified as output directory '"
+ outputDir + "' is not a directory");
}
}
/*
@@ -853,13 +798,14 @@ EclipseWriter::EclipseWriter( std::shared_ptr< const EclipseState > es,
evaluation of region properties.
*/
{
const auto& properties = es->get3DProperties();
const auto& properties = this->impl->es->get3DProperties();
const auto& fipnum = properties.getIntGridProperty("FIPNUM");
const auto& region_values = properties.getRegions( "FIPNUM" );
for (auto region_id : region_values)
this->impl->regionCells.emplace( region_id , fipnum.cellsEqual( region_id , this->impl->compressedToCartesian ));
this->impl->regionCells.emplace( region_id , fipnum.cellsEqual( region_id , this->impl->grid ));
}
}
EclipseWriter::~EclipseWriter() {}

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

@@ -123,7 +123,7 @@ struct fn_args {
const data::Wells& wells;
const data::Solution& state;
const std::unordered_map<int , std::vector<size_t>>& regionCells;
const std::vector<int>& compressedToCartesian;
const GridDims& grid;
};
/* Since there are several enums in opm scattered about more-or-less
@@ -548,7 +548,8 @@ Summary::Summary( const EclipseState& st,
const auto handle = funs.find( keyword )->second;
const std::vector< const Well* > dummy_wells;
const std::unordered_map<int,std::vector<size_t>> dummy_cells;
const fn_args no_args{ dummy_wells, 0, 0, 0, {} , {}, dummy_cells , {} };
GridDims dummy_grid(1,1,1);
const fn_args no_args{ dummy_wells, 0, 0, 0, {} , {}, dummy_cells , dummy_grid };
const auto val = handle( no_args );
const auto* unit = st.getUnits().name( val.unit );
@@ -561,7 +562,7 @@ Summary::Summary( const EclipseState& st,
void Summary::add_timestep( int report_step,
double secs_elapsed,
const std::vector<int>& indexMap,
const EclipseGrid& grid,
const EclipseState& es,
const std::unordered_map<int, std::vector<size_t>>& regionCells,
const data::Wells& wells ,
@@ -578,7 +579,7 @@ void Summary::add_timestep( int report_step,
const auto* genkey = smspec_node_get_gen_key1( f.first );
const auto schedule_wells = find_wells( schedule, f.first, timestep );
const auto val = f.second( { schedule_wells, duration, timestep, num, wells , state , regionCells , indexMap} );
const auto val = f.second( { schedule_wells, duration, timestep, num, wells , state , regionCells , grid} );
const auto num_val = val.value > 0 ? val.value : 0.0;
const auto unit_applied_val = es.getUnits().from_si( val.unit, num_val );

2
tests/test_EclipseWriter.cpp
View File

@@ -278,7 +278,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriterIntegration)
{
ERT::TestArea ta("test_ecl_writer");
EclipseWriter eclWriter( es, 3 * 3 * 3, nullptr);
EclipseWriter eclWriter( es, eclGrid);
auto start_time = util_make_datetime( 0, 0, 0, 10, 10, 2008 );
auto first_step = util_make_datetime( 0, 0, 0, 10, 11, 2008 );

3
tests/test_RFT.cpp
View File

@@ -117,8 +117,9 @@ BOOST_AUTO_TEST_CASE(test_RFT) {
*/
const auto numCells = eclipseState->getInputGrid()->getCartesianSize( );
const auto& grid = *eclipseState->getInputGrid();
EclipseWriter eclipseWriter( eclipseState, numCells, nullptr );
EclipseWriter eclipseWriter( eclipseState, grid);
time_t start_time = eclipseState->getSchedule()->posixStartTime();
/* step time read from deck and hard-coded here */
time_t step_time = util_make_datetime( 0, 0, 0, 10, 10, 2008 );

2
tests/test_Restart.cpp
View File

@@ -229,7 +229,7 @@ first_sim(test_work_area_type * test_area) {
const auto& grid = *eclipseState->getInputGrid();
auto num_cells = grid.getNX() * grid.getNY() * grid.getNZ();
EclipseWriter eclWriter( eclipseState, num_cells, nullptr );
EclipseWriter eclWriter( eclipseState, grid);
auto start_time = util_make_datetime( 0, 0, 0, 1, 11, 1979 );
auto first_step = util_make_datetime( 0, 0, 0, 10, 10, 2008 );

46
tests/test_Summary.cpp
View File

@@ -155,7 +155,6 @@ struct setup {
EclipseState es;
SummaryConfig config;
const EclipseGrid& grid;
const std::vector<int> am;
data::Wells wells;
std::string name;
ERT::TestArea ta;
@@ -170,7 +169,6 @@ struct setup {
es( *deck, ParseContext() ),
config( *deck, es , parseContext ),
grid( *es.getInputGrid() ),
am( grid.getActiveMap() ),
wells( result_wells() ),
name( fname ),
ta( ERT::TestArea("test_summary") )
@@ -180,7 +178,7 @@ struct setup {
const auto& region_values = properties.getRegions( "FIPNUM" );
for (auto region_id : region_values)
cells.emplace( region_id , fipnum.cellsEqual( region_id , am ));
cells.emplace( region_id , fipnum.cellsEqual( region_id , grid ));
solution = make_solution( *es.getInputGrid());
}
@@ -200,9 +198,9 @@ BOOST_AUTO_TEST_CASE(well_keywords) {
cfg.name = "PATH/CASE";
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 0, 0 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 0, 0 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -323,9 +321,9 @@ BOOST_AUTO_TEST_CASE(group_keywords) {
setup cfg( "test_Summary_group" );
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 0, 0 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 0, 0 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -395,9 +393,9 @@ BOOST_AUTO_TEST_CASE(completion_kewords) {
setup cfg( "test_Summary_completion" );
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 0, 0 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 0, 0 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -435,9 +433,9 @@ BOOST_AUTO_TEST_CASE(field_keywords) {
setup cfg( "test_Summary_field" );
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 0, 0 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 0, 0 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 1 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -512,9 +510,9 @@ BOOST_AUTO_TEST_CASE(report_steps_time) {
setup cfg( "test_Summary_report_steps_time" );
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 1, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -534,9 +532,9 @@ BOOST_AUTO_TEST_CASE(skip_unknown_var) {
setup cfg( "test_Summary_skip_unknown_var" );
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 1, 2 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.am, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 2 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.grid, cfg.es, cfg.cells, cfg.wells , cfg.solution);
writer.write();
auto res = readsum( cfg.name );
@@ -554,9 +552,9 @@ BOOST_AUTO_TEST_CASE(region_vars) {
{
out::Summary writer( cfg.es, cfg.config, cfg.name );
writer.add_timestep( 1, 2 * day, cfg.am , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.am , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.am , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.add_timestep( 1, 2 * day, cfg.grid , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.add_timestep( 1, 5 * day, cfg.grid , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.add_timestep( 2, 10 * day, cfg.grid , cfg.es, cfg.cells, cfg.wells, cfg.solution);
writer.write();
}

2
tests/test_writenumwells.cpp
View File

@@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(EclipseWriteRestartWellInfo) {
auto es = Parser::parse( eclipse_data_filename, ParseContext() );
auto eclipseState = std::make_shared< EclipseState >( es );
const auto num_cells = eclipseState->getInputGrid()->getCartesianSize();
EclipseWriter eclipseWriter( eclipseState, num_cells, nullptr );
EclipseWriter eclipseWriter( eclipseState, *eclipseState->getInputGrid());
int countTimeStep = eclipseState->getSchedule()->getTimeMap()->numTimesteps();