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

Merge pull request #468 from iLoop2/OPM-203

Browse Source 
Added suport for converting of Metric grid values
This commit is contained in:
Joakim Hove
2015-05-29 09:22:05 +02:00
parent 1bbda0f073 bb97d3f7bb
commit 91826a3ffa
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -606,9 +606,9 @@ namespace Opm {
}
void EclipseGrid::fwriteEGRID( const std::string& filename ) const {
void EclipseGrid::fwriteEGRID( const std::string& filename, bool output_metric ) const {
assertCellInfo();
ecl_grid_fwrite_EGRID( m_grid.get() , filename.c_str() );
ecl_grid_fwrite_EGRID( m_grid.get() , filename.c_str(), output_metric );
}

2
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp
View File

@@ -104,7 +104,7 @@ namespace Opm {
void exportACTNUM( std::vector<int>& actnum) const;
void resetACTNUM( const int * actnum);
bool equal(const EclipseGrid& other) const;
void fwriteEGRID( const std::string& filename ) const;
void fwriteEGRID( const std::string& filename, bool output_metric ) const;
const ecl_grid_type * c_ptr() const;
private:
std::shared_ptr<ecl_grid_type> m_grid;

2
opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
View File

@@ -668,7 +668,7 @@ BOOST_AUTO_TEST_CASE(Fwrite) {
Opm::DeckConstPtr deck = parser->parseString(deckData) ;
Opm::EclipseGrid grid1(deck );
grid1.fwriteEGRID( "TEST.EGRID" );
grid1.fwriteEGRID( "TEST.EGRID" , true);
Opm::EclipseGrid grid2( "TEST.EGRID" );