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

Merge pull request #1170 from bska/resolve-asan-issues

Browse Source 
Resolve Address Sanitizer Issues
This commit is contained in:
Joakim Hove 2019-10-27 23:25:30 +01:00 committed by GitHub
commit 4e8a0eac9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -903,7 +903,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
}
return coord;
};
}
std::vector<double> EclipseGrid::makeZcornDzTops(const std::array<int, 3>& dims, const std::vector<double>& dz, const std::vector<double>& tops) const {
@ -947,7 +947,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
}
return zcorn;
};
}
double EclipseGrid::sumIdir(int i1, int j, int k, const std::array<int, 3>& dims, const std::vector<double>& dx) const {
@ -1156,7 +1156,10 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
const auto& actnumKeyword = deck.getKeyword<ParserKeywords::ACTNUM>();
actnumVector = actnumKeyword.getIntData();
actnum=actnumVector.data();
const auto nGlobCells = dims[0] * dims[1] * dims[2];
if (actnumVector.size() == static_cast<decltype(actnumVector.size())>(nGlobCells)) {
actnum=actnumVector.data();
}
}
initCornerPointGrid( dims, coord , zcorn, actnum, nullptr );

5
src/opm/parser/eclipse/EclipseState/Schedule/MSW/updatingConnectionsWithSegments.cpp
View File

@ -22,6 +22,7 @@
#include "Compsegs.hpp"
#include <memory>
namespace Opm {
WellConnections * newConnectionsWithSegments(const DeckKeyword& compsegs,
@ -31,10 +32,10 @@ namespace Opm {
const ParseContext& parseContext,
ErrorGuard& errors)
{
WellConnections * new_connection_set = new WellConnections(input_connections);
std::unique_ptr<WellConnections> new_connection_set(new WellConnections(input_connections));
std::vector<Compsegs> compsegs_vector = Compsegs::compsegsFromCOMPSEGSKeyword( compsegs, grid, parseContext, errors);
Compsegs::processCOMPSEGS(compsegs_vector, segment_set);
Compsegs::updateConnectionsWithSegment(compsegs_vector, grid, *new_connection_set);
return new_connection_set;
return new_connection_set.release();
}
}

16
tests/parser/EclipseGridTests.cpp
View File

@ -17,14 +17,16 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdexcept>
#include <iostream>
#include <boost/filesystem.hpp>
#include <cstdio>
#include <numeric>
#include <math.h>
#include <unistd.h>
#include <ctime>
#include <iostream>
#include <math.h>
#include <memory>
#include <numeric>
#include <stdexcept>
#include <unistd.h>
#include <boost/filesystem.hpp>
#define BOOST_TEST_MODULE EclipseGridTests
#include <boost/test/unit_test.hpp>
@ -1029,7 +1031,7 @@ BOOST_AUTO_TEST_CASE(GridActnumVia3D) {
BOOST_AUTO_TEST_CASE(GridActnumViaState) {
auto deck = createActnumDeck();
BOOST_CHECK_NO_THROW( new Opm::EclipseState( deck));
BOOST_CHECK_NO_THROW( std::unique_ptr<Opm::EclipseState>(new Opm::EclipseState( deck)));
Opm::EclipseState es( deck);
BOOST_CHECK_EQUAL(es.getInputGrid().getNumActive(), 2 * 2 * 2 - 1);
}

2
tests/parser/EclipseStateTests.cpp
View File

@ -490,7 +490,7 @@ BOOST_AUTO_TEST_CASE(TestIOConfigCreation) {
"/\n";
Parser parser(new Parser());
Parser parser{};
auto deck = parser.parseString(deckData) ;
EclipseState state(deck );

17
tests/parser/MultisegmentWellTests.cpp
View File

@ -17,8 +17,10 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdexcept>
#include <iostream>
#include <memory>
#include <stdexcept>
#include <boost/filesystem.hpp>
#define BOOST_TEST_MODULE WellConnectionsTests
@ -91,8 +93,8 @@ BOOST_AUTO_TEST_CASE(MultisegmentWellTest) {
Opm::ParseContext parseContext;
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_INVALID, Opm::InputError::THROW_EXCEPTION);
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_NOT_SUPPORTED, Opm::InputError::THROW_EXCEPTION);
Opm::WellConnections* new_connection_set = nullptr;
BOOST_CHECK_NO_THROW(new_connection_set = Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard));
std::unique_ptr<Opm::WellConnections> new_connection_set{nullptr};
BOOST_CHECK_NO_THROW(new_connection_set.reset(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard)));
BOOST_CHECK_EQUAL(7U, new_connection_set->size());
@ -178,10 +180,10 @@ BOOST_AUTO_TEST_CASE(WrongDistanceCOMPSEGS) {
Opm::ErrorGuard errorGuard;
Opm::ParseContext parseContext;
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_INVALID, Opm::InputError::THROW_EXCEPTION);
BOOST_CHECK_THROW(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard), std::invalid_argument);
BOOST_CHECK_THROW(std::unique_ptr<Opm::WellConnections>(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard)), std::invalid_argument);
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_INVALID, Opm::InputError::IGNORE);
BOOST_CHECK_NO_THROW(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard));
BOOST_CHECK_NO_THROW(std::unique_ptr<Opm::WellConnections>(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard)));
}
BOOST_AUTO_TEST_CASE(NegativeDepthCOMPSEGS) {
@ -234,9 +236,10 @@ BOOST_AUTO_TEST_CASE(NegativeDepthCOMPSEGS) {
Opm::ErrorGuard errorGuard;
Opm::ParseContext parseContext;
std::unique_ptr<Opm::WellConnections> wconns{nullptr};
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_NOT_SUPPORTED, Opm::InputError::THROW_EXCEPTION);
BOOST_CHECK_THROW(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard), std::invalid_argument);
BOOST_CHECK_THROW(wconns.reset(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard)), std::invalid_argument);
parseContext.update(Opm::ParseContext::SCHEDULE_COMPSEGS_NOT_SUPPORTED, Opm::InputError::IGNORE);
BOOST_CHECK_NO_THROW(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard));
BOOST_CHECK_NO_THROW(wconns.reset(Opm::newConnectionsWithSegments(compsegs, connection_set, segment_set, grid, parseContext, errorGuard)));
}

3
tests/parser/UDQTests.cpp
View File

@ -1403,7 +1403,8 @@ WCONPROD
}
{
const auto& udq_config = schedule.getUDQConfig(2);
const auto& def1 = udq_config.definitions()[0];
const auto& def = udq_config.definitions();
const auto& def1 = def[0];
const auto& tokens = def1.func_tokens();
BOOST_CHECK_EQUAL( tokens.count( UDQTokenType::number ), 1);
BOOST_CHECK_EQUAL( tokens.count( UDQTokenType::ecl_expr), 1);