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

#6007 Rename Facies Properties to Elastic Properties.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-06-05 09:46:44 +02:00
committed by Magne Sjaastad
parent 466827e7d0
commit 5ddfd4f9da
23 changed files with 264 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/FileInterface/CMakeLists_files.cmake
View File

@@ -53,7 +53,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputPropertyLoader.h
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceReader.h
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.h
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.h
${CMAKE_CURRENT_LIST_DIR}/RifFaciesPropertiesReader.h
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.h
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CMAKE_CURRENT_LIST_DIR}/RifHdf5Reader.h
@@ -111,7 +111,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RifEclipseInputPropertyLoader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifSurfaceReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifRoffReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifColorLegendData.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFaciesPropertiesReader.cpp
${CMAKE_CURRENT_LIST_DIR}/RifElasticPropertiesReader.cpp
# HDF5 file reader is directly included in ResInsight main CmakeList.txt
#${CMAKE_CURRENT_LIST_DIR}/RifHdf5Reader.cpp

64
ApplicationCode/FileInterface/RifFaciesPropertiesReader.cpp → ApplicationCode/FileInterface/RifElasticPropertiesReader.cpp
View File

@@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RifFaciesPropertiesReader.h"
#include "RifElasticPropertiesReader.h"
#include "RifFileParseTools.h"
@@ -26,19 +26,19 @@
//==================================================================================================
///
//==================================================================================================
void RifFaciesPropertiesReader::readFaciesProperties( std::vector<RifFaciesProperties>& faciesProperties,
const QStringList& filePaths )
void RifElasticPropertiesReader::readElasticProperties( std::vector<RifElasticProperties>& elasticProperties,
const QStringList& filePaths )
{
for ( const QString& filePath : filePaths )
{
try
{
readFaciesProperties( faciesProperties, filePath );
readElasticProperties( elasticProperties, filePath );
}
catch ( FileParseException& )
{
// Delete all facies properties and rethrow exception
faciesProperties.clear();
elasticProperties.clear();
throw;
}
}
@@ -47,8 +47,8 @@ void RifFaciesPropertiesReader::readFaciesProperties( std::vector<RifFaciesPrope
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifFaciesPropertiesReader::readFaciesProperties( std::vector<RifFaciesProperties>& faciesProperties,
const QString& filePath )
void RifElasticPropertiesReader::readElasticProperties( std::vector<RifElasticProperties>& elasticProperties,
const QString& filePath )
{
QFile file( filePath );
if ( !file.open( QIODevice::ReadOnly | QIODevice::Text ) )
@@ -63,8 +63,8 @@ void RifFaciesPropertiesReader::readFaciesProperties( std::vector<RifFaciesPrope
QString line = in.readLine();
if ( !isEmptyLine( line ) && !isCommentLine( line ) )
{
RifFaciesProperties faciesProp = parseFaciesProperties( line, lineNumber, filePath );
faciesProperties.push_back( faciesProp );
RifElasticProperties faciesProp = parseElasticProperties( line, lineNumber, filePath );
elasticProperties.push_back( faciesProp );
}
lineNumber++;
@@ -74,8 +74,8 @@ void RifFaciesPropertiesReader::readFaciesProperties( std::vector<RifFaciesPrope
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifFaciesProperties
RifFaciesPropertiesReader::parseFaciesProperties( const QString& line, int lineNumber, const QString& filePath )
RifElasticProperties
RifElasticPropertiesReader::parseElasticProperties( const QString& line, int lineNumber, const QString& filePath )
{
QStringList tokens = tokenize( line, "," );
@@ -96,23 +96,23 @@ RifFaciesProperties
<< "Proppant Embedment";
verifyNonEmptyTokens( tokens, nameOfNonEmptyTokens, lineNumber, filePath );
RifFaciesProperties faciesProperties;
faciesProperties.fieldName = tokens[0];
faciesProperties.formationName = tokens[1];
faciesProperties.faciesName = tokens[2];
faciesProperties.porosity = parseDouble( tokens[3], "Porosity", lineNumber, filePath );
faciesProperties.youngsModulus = parseDouble( tokens[4], "Young's Modulus", lineNumber, filePath );
faciesProperties.poissonsRatio = parseDouble( tokens[5], "Poisson's Ratio", lineNumber, filePath );
faciesProperties.K_Ic = parseDouble( tokens[6], "K-Ic", lineNumber, filePath );
faciesProperties.proppantEmbedment = parseDouble( tokens[7], "Proppant Embedment", lineNumber, filePath );
RifElasticProperties elasticProperties;
elasticProperties.fieldName = tokens[0];
elasticProperties.formationName = tokens[1];
elasticProperties.faciesName = tokens[2];
elasticProperties.porosity = parseDouble( tokens[3], "Porosity", lineNumber, filePath );
elasticProperties.youngsModulus = parseDouble( tokens[4], "Young's Modulus", lineNumber, filePath );
elasticProperties.poissonsRatio = parseDouble( tokens[5], "Poisson's Ratio", lineNumber, filePath );
elasticProperties.K_Ic = parseDouble( tokens[6], "K-Ic", lineNumber, filePath );
elasticProperties.proppantEmbedment = parseDouble( tokens[7], "Proppant Embedment", lineNumber, filePath );
return faciesProperties;
return elasticProperties;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RifFaciesPropertiesReader::tokenize( const QString& line, const QString& separator )
QStringList RifElasticPropertiesReader::tokenize( const QString& line, const QString& separator )
{
return RifFileParseTools::splitLineAndTrim( line, separator );
}
@@ -120,10 +120,10 @@ QStringList RifFaciesPropertiesReader::tokenize( const QString& line, const QStr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RifFaciesPropertiesReader::parseDouble( const QString& token,
const QString& propertyName,
int lineNumber,
const QString& filePath )
double RifElasticPropertiesReader::parseDouble( const QString& token,
const QString& propertyName,
int lineNumber,
const QString& filePath )
{
bool isOk = false;
double value = token.toDouble( &isOk );
@@ -139,7 +139,7 @@ double RifFaciesPropertiesReader::parseDouble( const QString& token,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifFaciesPropertiesReader::isEmptyLine( const QString& line )
bool RifElasticPropertiesReader::isEmptyLine( const QString& line )
{
return line.trimmed().isEmpty();
}
@@ -147,7 +147,7 @@ bool RifFaciesPropertiesReader::isEmptyLine( const QString& line )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifFaciesPropertiesReader::isCommentLine( const QString& line )
bool RifElasticPropertiesReader::isCommentLine( const QString& line )
{
return line.trimmed().startsWith( "#" );
}
@@ -155,10 +155,10 @@ bool RifFaciesPropertiesReader::isCommentLine( const QString& line )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifFaciesPropertiesReader::verifyNonEmptyTokens( const QStringList& tokens,
const QStringList& nameOfNonEmptyTokens,
int lineNumber,
const QString& filePath )
void RifElasticPropertiesReader::verifyNonEmptyTokens( const QStringList& tokens,
const QStringList& nameOfNonEmptyTokens,
int lineNumber,
const QString& filePath )
{
for ( int i = 0; i < nameOfNonEmptyTokens.size(); ++i )
{

20
ApplicationCode/FileInterface/RifFaciesPropertiesReader.h → ApplicationCode/FileInterface/RifElasticPropertiesReader.h
View File

@@ -22,7 +22,7 @@
#include <QString>
struct RifFaciesProperties
struct RifElasticProperties
{
QString fieldName;
QString formationName;
@@ -37,19 +37,19 @@ struct RifFaciesProperties
//==================================================================================================
///
//==================================================================================================
class RifFaciesPropertiesReader
class RifElasticPropertiesReader
{
public:
static void readFaciesProperties( std::vector<RifFaciesProperties>& faciesProperties, const QStringList& filePaths );
static void readElasticProperties( std::vector<RifElasticProperties>& elasticProperties, const QStringList& filePaths );
private:
static void readFaciesProperties( std::vector<RifFaciesProperties>& faciesProperties, const QString& filePath );
static RifFaciesProperties parseFaciesProperties( const QString& line, int lineNumber, const QString& filePath );
static QStringList tokenize( const QString& line, const QString& separator );
static void verifyNonEmptyTokens( const QStringList& tokens,
const QStringList& nameOfNonEmptyTokens,
int lineNumber,
const QString& filePath );
static void readElasticProperties( std::vector<RifElasticProperties>& elasticProperties, const QString& filePath );
static RifElasticProperties parseElasticProperties( const QString& line, int lineNumber, const QString& filePath );
static QStringList tokenize( const QString& line, const QString& separator );
static void verifyNonEmptyTokens( const QStringList& tokens,
const QStringList& nameOfNonEmptyTokens,
int lineNumber,
const QString& filePath );
static double parseDouble( const QString& token, const QString& propertyName, int lineNumber, const QString& filePath );