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/ReservoirDataModel/CMakeLists_files.cmake
View File

@@ -79,7 +79,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.h
${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.h
${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h
${CMAKE_CURRENT_LIST_DIR}/RigGocadData.h
${CMAKE_CURRENT_LIST_DIR}/RigFaciesProperties.h
${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.h
)
@@ -156,7 +156,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCellFaceGeometryTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigGocadData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigFaciesProperties.cpp
${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.cpp
)
list(APPEND CODE_HEADER_FILES

38
ApplicationCode/ReservoirDataModel/RigFaciesProperties.cpp → ApplicationCode/ReservoirDataModel/RigElasticProperties.cpp
View File

@@ -16,14 +16,14 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RigFaciesProperties.h"
#include "RigElasticProperties.h"
#include "RiaInterpolationTools.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFaciesProperties::RigFaciesProperties( const QString& fieldName, const QString& formationName, const QString& faciesName )
RigElasticProperties::RigElasticProperties( const QString& fieldName, const QString& formationName, const QString& faciesName )
: m_fieldName( fieldName )
, m_formationName( formationName )
, m_faciesName( faciesName )
@@ -33,7 +33,7 @@ RigFaciesProperties::RigFaciesProperties( const QString& fieldName, const QStrin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString& RigFaciesProperties::fieldName() const
const QString& RigElasticProperties::fieldName() const
{
return m_fieldName;
}
@@ -41,7 +41,7 @@ const QString& RigFaciesProperties::fieldName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString& RigFaciesProperties::formationName() const
const QString& RigElasticProperties::formationName() const
{
return m_formationName;
}
@@ -49,7 +49,7 @@ const QString& RigFaciesProperties::formationName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString& RigFaciesProperties::faciesName() const
const QString& RigElasticProperties::faciesName() const
{
return m_faciesName;
}
@@ -57,7 +57,7 @@ const QString& RigFaciesProperties::faciesName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigFaciesProperties::porosity() const
const std::vector<double>& RigElasticProperties::porosity() const
{
return m_porosity;
}
@@ -65,7 +65,7 @@ const std::vector<double>& RigFaciesProperties::porosity() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigFaciesProperties::youngsModulus() const
const std::vector<double>& RigElasticProperties::youngsModulus() const
{
return m_youngsModulus;
}
@@ -73,7 +73,7 @@ const std::vector<double>& RigFaciesProperties::youngsModulus() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigFaciesProperties::poissonsRatio() const
const std::vector<double>& RigElasticProperties::poissonsRatio() const
{
return m_poissonsRatio;
}
@@ -81,7 +81,7 @@ const std::vector<double>& RigFaciesProperties::poissonsRatio() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigFaciesProperties::K_Ic() const
const std::vector<double>& RigElasticProperties::K_Ic() const
{
return m_K_Ic;
}
@@ -89,7 +89,7 @@ const std::vector<double>& RigFaciesProperties::K_Ic() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const std::vector<double>& RigFaciesProperties::proppantEmbedment() const
const std::vector<double>& RigElasticProperties::proppantEmbedment() const
{
return m_proppantEmbedment;
}
@@ -97,11 +97,11 @@ const std::vector<double>& RigFaciesProperties::proppantEmbedment() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFaciesProperties::appendValues( double porosity,
double youngsModulus,
double poissonsRatio,
double K_Ic,
double proppantEmbedment )
void RigElasticProperties::appendValues( double porosity,
double youngsModulus,
double poissonsRatio,
double K_Ic,
double proppantEmbedment )
{
m_porosity.push_back( porosity );
m_youngsModulus.push_back( youngsModulus );
@@ -113,7 +113,7 @@ void RigFaciesProperties::appendValues( double porosity,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFaciesProperties::getYoungsModulus( double porosity ) const
double RigElasticProperties::getYoungsModulus( double porosity ) const
{
return RiaInterpolationTools::linear( m_porosity, m_youngsModulus, porosity );
}
@@ -121,7 +121,7 @@ double RigFaciesProperties::getYoungsModulus( double porosity ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFaciesProperties::getPoissonsRatio( double porosity ) const
double RigElasticProperties::getPoissonsRatio( double porosity ) const
{
return RiaInterpolationTools::linear( m_porosity, m_poissonsRatio, porosity );
}
@@ -129,7 +129,7 @@ double RigFaciesProperties::getPoissonsRatio( double porosity ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFaciesProperties::getK_Ic( double porosity ) const
double RigElasticProperties::getK_Ic( double porosity ) const
{
return RiaInterpolationTools::linear( m_porosity, m_K_Ic, porosity );
}
@@ -137,7 +137,7 @@ double RigFaciesProperties::getK_Ic( double porosity ) const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RigFaciesProperties::getProppantEmbedment( double porosity ) const
double RigElasticProperties::getProppantEmbedment( double porosity ) const
{
return RiaInterpolationTools::linear( m_porosity, m_proppantEmbedment, porosity );
}

4
ApplicationCode/ReservoirDataModel/RigFaciesProperties.h → ApplicationCode/ReservoirDataModel/RigElasticProperties.h
View File

@@ -25,10 +25,10 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
class RigFaciesProperties
class RigElasticProperties
{
public:
RigFaciesProperties( const QString& fieldName, const QString& formationName, const QString& faciesName );
RigElasticProperties( const QString& fieldName, const QString& formationName, const QString& faciesName );
const QString& fieldName() const;
const QString& formationName() const;
const QString& faciesName() const;