From 3da0c228b9f8ec78fd5a0d4cc3a50205f706d9cd Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 2 Jun 2014 16:48:37 +0200 Subject: [PATCH] Using size_t instead of int for EclipseGrid::getN? --- .../eclipse/EclipseState/Grid/EclipseGrid.cpp | 20 +++++++++---------- .../eclipse/EclipseState/Grid/EclipseGrid.hpp | 10 +++++----- .../EclipseGridCreateFromDeck.cpp | 20 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp index c7c2340d4..7c10ae179 100644 --- a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp +++ b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp @@ -54,24 +54,24 @@ namespace Opm { } - int EclipseGrid::getNumActive( ) const { - return ecl_grid_get_nactive( m_grid.get() ); + size_t EclipseGrid::getNumActive( ) const { + return static_cast(ecl_grid_get_nactive( m_grid.get() )); } - int EclipseGrid::getNX( ) const { - return ecl_grid_get_nx( m_grid.get() ); + size_t EclipseGrid::getNX( ) const { + return static_cast(ecl_grid_get_nx( m_grid.get() )); } - int EclipseGrid::getNY( ) const { - return ecl_grid_get_ny( m_grid.get() ); + size_t EclipseGrid::getNY( ) const { + return static_cast(ecl_grid_get_ny( m_grid.get() )); } - int EclipseGrid::getNZ( ) const { - return ecl_grid_get_nz( m_grid.get() ); + size_t EclipseGrid::getNZ( ) const { + return static_cast(ecl_grid_get_nz( m_grid.get() )); } - int EclipseGrid::getCartesianSize( ) const { - return ecl_grid_get_global_size( m_grid.get() ); + size_t EclipseGrid::getCartesianSize( ) const { + return static_cast( ecl_grid_get_global_size( m_grid.get() )); } diff --git a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp index e81154d02..b594ed949 100644 --- a/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp +++ b/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp @@ -37,11 +37,11 @@ namespace Opm { static bool hasCartesianKeywords(std::shared_ptr gridSection); void initCartesianGrid(const std::vector& dims , std::shared_ptr gridSection); void initCornerPointGrid(const std::vector& dims , std::shared_ptr gridSection); - int getNumActive( ) const; - int getNX( ) const; - int getNY( ) const; - int getNZ( ) const; - int getCartesianSize( ) const; + size_t getNumActive( ) const; + size_t getNX( ) const; + size_t getNY( ) const; + size_t getNZ( ) const; + size_t getCartesianSize( ) const; void exportMAPAXES( std::vector& mapaxes) const; void exportCOORD( std::vector& coord) const; diff --git a/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp b/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp index 77b0827c3..509325a28 100644 --- a/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp +++ b/opm/parser/eclipse/IntegrationTests/EclipseGridCreateFromDeck.cpp @@ -40,10 +40,10 @@ BOOST_AUTO_TEST_CASE(CreateCPGrid) { std::shared_ptr gridSection(new GRIDSection(deck) ); std::shared_ptr grid(new EclipseGrid( runspecSection , gridSection )); - BOOST_CHECK_EQUAL( 10 , grid->getNX( )); - BOOST_CHECK_EQUAL( 10 , grid->getNY( )); - BOOST_CHECK_EQUAL( 5 , grid->getNZ( )); - BOOST_CHECK_EQUAL( 500 , grid->getNumActive() ); + BOOST_CHECK_EQUAL( 10U , grid->getNX( )); + BOOST_CHECK_EQUAL( 10U , grid->getNY( )); + BOOST_CHECK_EQUAL( 5U , grid->getNZ( )); + BOOST_CHECK_EQUAL( 500U , grid->getNumActive() ); } @@ -55,10 +55,10 @@ BOOST_AUTO_TEST_CASE(CreateCPActnumGrid) { std::shared_ptr gridSection(new GRIDSection(deck) ); std::shared_ptr grid(new EclipseGrid( runspecSection , gridSection )); - BOOST_CHECK_EQUAL( 10 , grid->getNX( )); - BOOST_CHECK_EQUAL( 10 , grid->getNY( )); - BOOST_CHECK_EQUAL( 5 , grid->getNZ( )); - BOOST_CHECK_EQUAL( 100 , grid->getNumActive() ); + BOOST_CHECK_EQUAL( 10U , grid->getNX( )); + BOOST_CHECK_EQUAL( 10U , grid->getNY( )); + BOOST_CHECK_EQUAL( 5U , grid->getNZ( )); + BOOST_CHECK_EQUAL( 100U , grid->getNumActive() ); } @@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(ExportFromCPGridACTNUM) { size_t volume = grid->getNX()*grid->getNY()*grid->getNZ(); grid->exportCOORD( coord ); - BOOST_CHECK_EQUAL( coord.size() , (size_t) (grid->getNX() + 1) * (grid->getNY() + 1) * 6); + BOOST_CHECK_EQUAL( coord.size() , (grid->getNX() + 1) * (grid->getNY() + 1) * 6); grid->exportZCORN( zcorn ); BOOST_CHECK_EQUAL( zcorn.size() , volume * 8); @@ -111,7 +111,7 @@ BOOST_AUTO_TEST_CASE(ExportFromCPGridACTNUM) { for (size_t i = 0; i < volume; i++) { BOOST_CHECK_EQUAL( deckActnum[i] , actnum[i]); for (size_t j=0; j < 8; j++) - BOOST_CHECK_CLOSE( zcorn[i*8 + j] , deckZCORN[i*8 + j] , 0.0001); + BOOST_CHECK_CLOSE( zcor'n[i*8 + j] , deckZCORN[i*8 + j] , 0.0001); } } }