OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing assert due to m_odb not set

Browse Source 
There still are troubles closing two instances accessing same file.
This commit is contained in:
Jacob Støren
2015-04-30 16:35:21 +02:00
parent 791a25e6e9
commit 4e9f91274c
3 changed files with 19 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/GeoMech/OdbReader_UnitTests/RifOdbReader-Test.cpp
View File

@@ -34,13 +34,21 @@ TEST(OdbReaderTest, BasicTests)
cvf::ref<RifOdbReader> reader = new RifOdbReader;
cvf::ref<RigGeoMechCaseData> femCase = new RigGeoMechCaseData;
cvf::ref<RigFemPartCollection> femData = femCase->femParts();
reader->readFemParts(TEST_FILE, femData.p());
EXPECT_EQ(1, femData->partCount());
EXPECT_EQ(4320, femData->part(0)->elementCount());
EXPECT_EQ(HEX8, femData->part(0)->elementType(0));
std::map<std::string, std::vector<std::string> > scalarNodeFieldsMap = reader->scalarNodeFieldAndComponentNames();
EXPECT_EQ(3, scalarNodeFieldsMap.size());
cvf::ref<RigGeoMechCaseData> femCase2 = new RigGeoMechCaseData;
cvf::ref<RigFemPartCollection> femData2 = femCase->femParts();
cvf::ref<RifOdbReader> reader2 = new RifOdbReader;
EXPECT_EQ(true, reader2->openFile(TEST_FILE));
EXPECT_EQ(true, reader2->readFemParts(TEST_FILE, femData2.p()));
EXPECT_EQ(true, reader2->stepNames().size() == 1);
std::vector<std::string> steps = reader2->stepNames();
@@ -48,7 +56,7 @@ TEST(OdbReaderTest, BasicTests)
EXPECT_EQ(2, reader2->frameTimes(0).size());
EXPECT_EQ(1.0, reader2->frameTimes(0)[1]);
std::map<std::string, std::vector<std::string> > scalarNodeFieldsMap = reader2->scalarNodeFieldAndComponentNames();
scalarNodeFieldsMap = reader2->scalarNodeFieldAndComponentNames();
EXPECT_EQ(3, scalarNodeFieldsMap.size());
std::map<std::string, std::vector<std::string> > scalarElementNodeFieldsMap = reader2->scalarElementNodeFieldAndComponentNames();
@@ -61,8 +69,11 @@ TEST(OdbReaderTest, BasicTests)
reader2->readScalarNodeField("U", "U2", 0, 0, 1, &displacementValues);
EXPECT_EQ(5168, displacementValues.size());
reader = NULL;
std::vector<cvf::Vec3f> displacements;
reader2->readDisplacements(0, 0, 1, &displacements);
reader2 = NULL;
EXPECT_EQ(5168, displacements.size());
EXPECT_FLOAT_EQ(0.047638997, displacements[1].y());
}