From ce5b108cc1930f68ee2a539f1c237527b7613881 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 25 Jul 2014 09:10:45 +0200 Subject: [PATCH] Adjusted file unit test --- .../RifReaderEclipseOutput-Test.cpp | 64 +++++++++++++++++-- 1 file changed, 57 insertions(+), 7 deletions(-) diff --git a/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp b/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp index d1fbe43b49..59739e33b2 100644 --- a/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp +++ b/ApplicationCode/FileInterface/FileInterface_UnitTests/RifReaderEclipseOutput-Test.cpp @@ -27,7 +27,7 @@ #include "ecl_file.h" #include "RifEclipseOutputFileTools.h" #include "RigCaseCellResultsData.h" - +#include "RifEclipseUnifiedRestartFileAccess.h" @@ -35,15 +35,14 @@ #if 0 + TEST(RigReservoirTest, FileOutputToolsTest) { - cvf::ref readerInterfaceEcl = new RifReaderEclipseOutput; - cvf::ref reservoir = new RigReservoir; - // QString filename("d:/Models/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.EGRID"); - QString filename("d:/Models/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.UNRST"); +// QString filename("d:/Models/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.UNRST"); + QString filename("d:/Models/Statoil/troll_MSW/T07-4A-W2012-16-F3.UNRST"); - ecl_file_type* ertFile = ecl_file_open(filename.toAscii().data()); + ecl_file_type* ertFile = ecl_file_open(filename.toAscii().data(), ECL_FILE_CLOSE_STREAM); EXPECT_TRUE(ertFile); @@ -53,7 +52,6 @@ TEST(RigReservoirTest, FileOutputToolsTest) EXPECT_TRUE(keywords.size() == keywordDataItemCounts.size()); - qDebug() << "Keyword - Number of data items"; for (int i = 0; i < keywords.size(); i++) { @@ -66,6 +64,58 @@ TEST(RigReservoirTest, FileOutputToolsTest) } +TEST(RigReservoirTest, UnifiedTestFile) +{ + + // Location of test dataset received from Håkon Høgstøl in July 2011 with 10k active cells +#ifdef WIN32 + QString filename("d:/Models/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.UNRST"); +#else + QString filename("/mnt/hgfs/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.UNRST"); +#endif + + { + cvf::ref restartFile = new RifEclipseUnifiedRestartFileAccess(); + + QStringList fileNameList; + fileNameList << filename; + restartFile->setRestartFiles(fileNameList); + restartFile->open(); + + QStringList resultNames; + std::vector resultDataItemCounts; + restartFile->resultNames(&resultNames, &resultDataItemCounts); + + for (int i = 0; i < resultNames.size(); i++) + { + qDebug() << "Result names\n" << resultNames[i] << " - " << resultDataItemCounts[i]; + } + + std::vector tsteps = restartFile->timeSteps(); + + qDebug() << "Time step texts\n"; + for (int i = 0; i < tsteps.size(); i++) + { + qDebug() << tsteps[i].toString(); + } + + /* + std::vector resultValues; + size_t timeStep = 0; + restartFile->results(resultNames[0], timeStep, &resultValues); + + size_t i; + for (i = 0; i < 500; i++) + { + qDebug() << resultValues[i]; + } + */ + } + +} + + + void buildResultInfoString(RigReservoir* reservoir, RifReaderInterface::PorosityModelResultType porosityModel, RimDefines::ResultCatType resultType) { RigCaseCellResultsData* matrixResults = reservoir->results(porosityModel);