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

#6064 Use RiaEclipseUnitTools for unit conversion (and add some new ones).

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-06-18 19:42:28 +02:00
parent 4b56d93582
commit 78e5b40da9
3 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
View File

@@ -45,6 +45,9 @@ public:
static double mmToMeter( double mm ) { return mm / 1000.0; } static double mmToMeter( double mm ) { return mm / 1000.0; }
static double meterToMm( double meter ) { return 1000.0 * meter; } static double meterToMm( double meter ) { return 1000.0 * meter; }
static double barToPsi( double bar ) { return bar * 14.5038; }
static double barPerMeterToPsiPerFeet( double barPerMeter ) { return barPerMeter * 4.42075; }
static double darcysConstant( UnitSystem unitSystem ); static double darcysConstant( UnitSystem unitSystem );
static RiaDefines::DepthUnitType depthUnit( UnitSystem unit ); static RiaDefines::DepthUnitType depthUnit( UnitSystem unit );

30
ApplicationCode/ProjectDataModel/RimFractureModelPlot.cpp
View File

@@ -89,30 +89,6 @@ void RimFractureModelPlot::applyDataSource()
this->updateConnectedEditors(); this->updateConnectedEditors();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureModelPlot::convertToPsiPerFeetFromBarPerMeter( double value )
{
return value * 4.42075;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureModelPlot::convertToFeetFromMeter( double value )
{
return value * 3.28084;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimFractureModelPlot::convertToPsiFromBar( double value )
{
return value * 14.5038;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -237,7 +213,7 @@ std::vector<double> RimFractureModelPlot::calculateTrueVerticalDepth() const
std::vector<double> tvdTopZone; std::vector<double> tvdTopZone;
for ( auto p : layerBoundaryDepths ) for ( auto p : layerBoundaryDepths )
{ {
double depthInFeet = convertToFeetFromMeter( p.first ); double depthInFeet = RiaEclipseUnitTools::meterToFeet( p.first );
tvdTopZone.push_back( depthInFeet ); tvdTopZone.push_back( depthInFeet );
} }
@@ -401,7 +377,7 @@ bool RimFractureModelPlot::calculateStressWithGradients( std::vector<double>& st
( biot * pressureDiff ); ( biot * pressureDiff );
double depletionStress = Sh_init + deltaHorizontalStress; double depletionStress = Sh_init + deltaHorizontalStress;
stress.push_back( convertToPsiFromBar( depletionStress ) ); stress.push_back( RiaEclipseUnitTools::barToPsi( depletionStress ) );
// Cache some results for the gradients calculation // Cache some results for the gradients calculation
stressForGradients.push_back( Sv ); stressForGradients.push_back( Sv );
@@ -433,7 +409,7 @@ bool RimFractureModelPlot::calculateStressWithGradients( std::vector<double>& st
double diffDepth = depthForGradients[i + 1] - depthForGradients[i]; double diffDepth = depthForGradients[i + 1] - depthForGradients[i];
double k0 = computeValueAtDepth( k0Data, layerBoundaryDepths, depthForGradients[i] ); double k0 = computeValueAtDepth( k0Data, layerBoundaryDepths, depthForGradients[i] );
double gradient = ( diffStress * k0 + diffPressure * ( 1.0 - k0 ) ) / diffDepth; double gradient = ( diffStress * k0 + diffPressure * ( 1.0 - k0 ) ) / diffDepth;
stressGradients.push_back( convertToPsiPerFeetFromBarPerMeter( gradient ) ); stressGradients.push_back( RiaEclipseUnitTools::barPerMeterToPsiPerFeet( gradient ) );
} }
return true; return true;

3
ApplicationCode/ProjectDataModel/RimFractureModelPlot.h
View File

@@ -65,9 +65,6 @@ protected:
static void computeAverageByLayer( const std::vector<std::pair<size_t, size_t>>& layerBoundaryIndexes, static void computeAverageByLayer( const std::vector<std::pair<size_t, size_t>>& layerBoundaryIndexes,
const std::vector<double>& inputVector, const std::vector<double>& inputVector,
std::vector<double>& result ); std::vector<double>& result );
static double convertToPsiPerFeetFromBarPerMeter( double value );
static double convertToFeetFromMeter( double value );
static double convertToPsiFromBar( double value );
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;