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

Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)

Browse Source 
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
rubenthoms
2021-01-21 12:58:46 +01:00
committed by GitHub
parent c4c6eb75f2
commit bc81437435
176 changed files with 1470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/ReservoirDataModel/RigStimPlanFractureDefinition.cpp
View File

@@ -18,6 +18,7 @@
#include "RigStimPlanFractureDefinition.h"
#include "RiaEclipseUnitTools.h"
#include "RiaFractureDefines.h"
#include "RiaLogging.h"
@@ -45,7 +46,7 @@ const double RigStimPlanFractureDefinition::THRESHOLD_VALUE = 1e-5;
///
//--------------------------------------------------------------------------------------------------
RigStimPlanFractureDefinition::RigStimPlanFractureDefinition()
: m_unitSet( RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
: m_unitSet( RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
, m_xMirrorMode( false )
, m_topPerfTvd( HUGE_VAL )
, m_bottomPerfTvd( HUGE_VAL )
@@ -64,7 +65,7 @@ RigStimPlanFractureDefinition::~RigStimPlanFractureDefinition()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RigStimPlanFractureDefinition::unitSet() const
RiaDefines::EclipseUnitSystem RigStimPlanFractureDefinition::unitSet() const
{
return m_unitSet;
}
@@ -316,9 +317,9 @@ std::vector<std::pair<QString, QString>> RigStimPlanFractureDefinition::getStimP
///
//--------------------------------------------------------------------------------------------------
std::vector<std::vector<double>>
RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName,
int activeTimeStepIndex,
RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const
RigStimPlanFractureDefinition::conductivityValuesAtTimeStep( const QString& resultName,
int activeTimeStepIndex,
RiaDefines::EclipseUnitSystem requiredUnitSet ) const
{
std::vector<std::vector<double>> conductivityValues;
@@ -350,11 +351,11 @@ std::vector<std::vector<double>>
{
for ( auto& xVal : yValues )
{
if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
if ( requiredUnitSet == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
xVal = RiaEclipseUnitTools::convertToFeet( xVal, conductivityUnitTextOnFile );
}
else if ( requiredUnitSet == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
else if ( requiredUnitSet == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
xVal = RiaEclipseUnitTools::convertToMeter( xVal, conductivityUnitTextOnFile );
}
@@ -371,7 +372,7 @@ cvf::ref<RigFractureGrid>
RigStimPlanFractureDefinition::createFractureGrid( const QString& resultName,
int activeTimeStepIndex,
double wellPathIntersectionAtFractureDepth,
RiaEclipseUnitTools::UnitSystem requiredUnitSet ) const
RiaDefines::EclipseUnitSystem requiredUnitSet ) const
{
std::vector<std::vector<double>> conductivityValues =
conductivityValuesAtTimeStep( resultName, activeTimeStepIndex, requiredUnitSet );