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

Merge pull request #2592 from akva2/janitoring

Browse Source 
changed: use std::vector<char> instead of raw char arrays
This commit is contained in:
Bård Skaflestad 2021-08-04 15:53:52 +02:00 committed by GitHub
commit ee4987bf20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,16 +224,13 @@ void EclFile::loadData(const std::string& name)
inFile.seekg(ifStreamPos[arrIndex]);
char* buffer;
size_t size = sizeOnDiskFormatted(array_size[arrIndex], array_type[arrIndex], array_element_size[arrIndex])+1;
buffer = new char [size];
inFile.read (buffer, size);
std::vector<char> buffer(size);
inFile.read (buffer.data(), size);
std::string fileStr = std::string(buffer, size);
std::string fileStr = std::string(buffer.data(), size);
loadFormattedArray(fileStr, arrIndex, 0);
delete[] buffer;
}
}
@ -269,16 +266,13 @@ void EclFile::loadData(const std::vector<int>& arrIndex)
inFile.seekg(ifStreamPos[ind]);
char* buffer;
size_t size = sizeOnDiskFormatted(array_size[ind], array_type[ind], array_element_size[ind])+1;
buffer = new char [size];
inFile.read (buffer, size);
std::vector<char> buffer(size);
inFile.read (buffer.data(), size);
std::string fileStr = std::string(buffer, size);
std::string fileStr = std::string(buffer.data(), size);
loadFormattedArray(fileStr, ind, 0);
delete[] buffer;
}
} else {
@ -307,17 +301,14 @@ void EclFile::loadData(int arrIndex)
inFile.seekg(ifStreamPos[arrIndex]);
char* buffer;
size_t size = sizeOnDiskFormatted(array_size[arrIndex], array_type[arrIndex], array_element_size[arrIndex])+1;
buffer = new char [size];
inFile.read (buffer, size);
std::vector<char> buffer(size);
inFile.read (buffer.data(), size);
std::string fileStr = std::string(buffer, size);
std::string fileStr = std::string(buffer.data(), size);
loadFormattedArray(fileStr, arrIndex, 0);
delete[] buffer;
} else {
std::fstream fileH;
@ -421,17 +412,15 @@ std::vector<std::string> EclFile::get_fmt_real_raw_str_values(int arrIndex) cons
inFile.seekg(ifStreamPos[arrIndex]);
char* buffer;
size_t size = sizeOnDiskFormatted(array_size[arrIndex], array_type[arrIndex], array_element_size[arrIndex])+1;
buffer = new char [size];
inFile.read (buffer, size);
std::vector<char> buffer(size);
inFile.read (buffer.data(), size);
std::string fileStr = std::string(buffer, size);
std::string fileStr = std::string(buffer.data(), size);
std::vector<std::string> real_vect_str;
real_vect_str = readFormattedRealRawStrings(fileStr, array_size[arrIndex], 0);
delete buffer;
return real_vect_str;
}