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

changed from int to size_t for index. Changed loading of all data, reading data from disk array by array

Browse Source
This commit is contained in:
Torbjørn Skille 2019-08-22 10:26:21 +02:00
parent 6d79ab4715
commit 6f7d45750f
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/io/eclipse/EclFile.hpp
View File

@ -106,8 +106,8 @@ protected:
private:
std::vector<bool> arrayLoaded;
void loadBinaryArray(std::fstream& fileH, int arrIndex);
void loadFormattedArray(const std::string& fileStr, int arrIndex, long int fromPos);
void loadBinaryArray(std::fstream& fileH, std::size_t arrIndex);
void loadFormattedArray(const std::string& fileStr, std::size_t arrIndex, long int fromPos);
};

35
src/opm/io/eclipse/EclFile.cpp
View File

@ -31,6 +31,16 @@
#include <opm/common/ErrorMacros.hpp>
#include <iostream>
//#include <algorithm>
//#include <iostream>
//#include <list>
#include <numeric>
//#include <random>
//#include <vector>
// anonymous namespace for EclFile
@ -339,11 +349,11 @@ std::vector<T> readFormattedArray(const std::string& file_str, const int size, l
long int p1=fromPos;
long int p2=0;
for (int i=0; i< size; i++) {
p1 = file_str.find_first_not_of(' ',p1);
p2 = file_str.find_first_of(' ', p1);
arr.push_back(process(file_str.substr(p1, p2-p1)));
p1 = file_str.find_first_not_of(' ',p2);
@ -527,7 +537,7 @@ EclFile::EclFile(const std::string& filename) : inputFilename(filename)
}
void EclFile::loadBinaryArray(std::fstream& fileH, int arrIndex)
void EclFile::loadBinaryArray(std::fstream& fileH, std::size_t arrIndex)
{
fileH.seekg (ifStreamPos[arrIndex], fileH.beg);
@ -557,11 +567,10 @@ void EclFile::loadBinaryArray(std::fstream& fileH, int arrIndex)
arrayLoaded[arrIndex] = true;
}
void EclFile::loadFormattedArray(const std::string& fileStr, int arrIndex, long int fromPos)
void EclFile::loadFormattedArray(const std::string& fileStr, std::size_t arrIndex, long int fromPos)
{
switch (array_type[arrIndex]) {
case INTE:
inte_array[arrIndex] = readFormattedInteArray(fileStr, array_size[arrIndex], fromPos);
break;
@ -593,17 +602,11 @@ void EclFile::loadData()
if (formatted) {
std::ifstream inFile(inputFilename);
std::stringstream strStream;
strStream << inFile.rdbuf();
std::string fileStr = strStream.str();
for (unsigned int arrIndex = 0; arrIndex < array_name.size(); arrIndex++) {
loadFormattedArray(fileStr, arrIndex, ifStreamPos[arrIndex]);
}
std::vector<int> arrIndices(array_name.size());
std::iota(arrIndices.begin(), arrIndices.end(), 0);
this->loadData(arrIndices);
} else {
std::fstream fileH;
@ -687,7 +690,7 @@ void EclFile::loadData(const std::vector<int>& arrIndex)
inFile.read (buffer, size);
std::string fileStr = std::string(buffer, size);
loadFormattedArray(fileStr, ind, 0);
delete[] buffer;