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

4
ApplicationLibCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -135,9 +135,9 @@ std::string RifColumnBasedUserData::unitName( const RifEclipseSummaryAddress& re
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifColumnBasedUserData::unitSystem() const
RiaDefines::EclipseUnitSystem RifColumnBasedUserData::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/FileInterface/RifColumnBasedUserData.h
View File

@@ -46,8 +46,8 @@ public:
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
void buildTimeStepsAndMappings();

4
ApplicationLibCode/FileInterface/RifCsvUserData.cpp
View File

@@ -140,9 +140,9 @@ std::string RifCsvUserData::unitName( const RifEclipseSummaryAddress& resultAddr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifCsvUserData::unitSystem() const
RiaDefines::EclipseUnitSystem RifCsvUserData::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/FileInterface/RifCsvUserData.h
View File

@@ -50,7 +50,7 @@ public:
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
void buildTimeStepsAndMappings();

4
ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.cpp
View File

@@ -98,7 +98,7 @@ std::string RifDerivedEnsembleReader::unitName( const RifEclipseSummaryAddress&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifDerivedEnsembleReader::unitSystem() const
RiaDefines::EclipseUnitSystem RifDerivedEnsembleReader::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}

2
ApplicationLibCode/FileInterface/RifDerivedEnsembleReader.h
View File

@@ -37,7 +37,7 @@ public:
const std::vector<time_t>& timeSteps( const RifEclipseSummaryAddress& resultAddress ) const override;
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
RimDerivedSummaryCase* m_derivedCase;

22
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -120,8 +120,8 @@ bool RifEclipseInputFileTools::openGridFile( const QString& fileName,
QFile gridFile( fileName );
if ( gridFile.open( QFile::ReadOnly ) )
{
RiaEclipseUnitTools::UnitSystem units = readUnitSystem( gridFile, gridunitPos );
if ( units != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
RiaDefines::EclipseUnitSystem units = readUnitSystem( gridFile, gridunitPos );
if ( units != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
{
eclipseCase->setUnitsType( units );
}
@@ -417,9 +417,9 @@ bool RifEclipseInputFileTools::exportGrid( const QString& fileName,
}
ert_ecl_unit_enum ecl_units = ECL_METRIC_UNITS;
if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
ecl_units = ECL_FIELD_UNITS;
else if ( eclipseCase->unitsType() == RiaEclipseUnitTools::UnitSystem::UNITS_LAB )
else if ( eclipseCase->unitsType() == RiaDefines::EclipseUnitSystem::UNITS_LAB )
ecl_units = ECL_LAB_UNITS;
ecl_grid_fprintf_grdecl2( mainEclGrid, filePtr, ecl_units );
@@ -751,8 +751,8 @@ void RifEclipseInputFileTools::saveFaults( QTextStream& stream,
const cvf::Collection<RigFault>& faults = mainGrid->faults();
for ( const auto& fault : faults )
{
if ( fault->name() != RiaDefines::undefinedGridFaultName() &&
fault->name() != RiaDefines::undefinedGridFaultWithInactiveName() )
if ( fault->name() != RiaResultNames::undefinedGridFaultName() &&
fault->name() != RiaResultNames::undefinedGridFaultWithInactiveName() )
{
saveFault( stream, mainGrid, fault->faultFaces(), fault->name(), min, max, refinement );
}
@@ -1662,7 +1662,7 @@ void RifEclipseInputFileTools::readKeywordDataContent( QFile& data,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos )
RiaDefines::EclipseUnitSystem RifEclipseInputFileTools::readUnitSystem( QFile& file, qint64 gridunitPos )
{
bool stopParsing = false;
QStringList unitText;
@@ -1671,18 +1671,18 @@ RiaEclipseUnitTools::UnitSystem RifEclipseInputFileTools::readUnitSystem( QFile&
{
if ( unitString.contains( "FEET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
return RiaDefines::EclipseUnitSystem::UNITS_FIELD;
}
else if ( unitString.contains( "CM", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
return RiaDefines::EclipseUnitSystem::UNITS_LAB;
}
else if ( unitString.contains( "MET", Qt::CaseInsensitive ) )
{
return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
return RiaDefines::EclipseUnitSystem::UNITS_METRIC;
}
}
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/FileInterface/RifEclipseInputFileTools.h
View File

@@ -23,7 +23,7 @@
#include "cvfCollection.h"
#include "cvfObject.h"
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RifReaderInterface.h"
#include "RigFault.h"
@@ -142,7 +142,7 @@ public:
);
static void readKeywordDataContent( QFile& data, qint64 filePos, QStringList* textContent, bool* isEditKeywordDetected );
static RiaEclipseUnitTools::UnitSystem readUnitSystem( QFile& file, qint64 gridunitPos );
static RiaDefines::EclipseUnitSystem readUnitSystem( QFile& file, qint64 gridunitPos );
static cvf::StructGridInterface::FaceEnum faceEnumFromText( const QString& faceString );

3
ApplicationLibCode/FileInterface/RifEclipseInputPropertyLoader.cpp
View File

@@ -143,7 +143,8 @@ bool RifEclipseInputPropertyLoader::importFaultsFromFile( RigEclipseCaseData* ec
for ( size_t i = 0; i < faultCollection.size(); i++ )
{
RigFault* f = faultCollection.at( i );
if ( f->name() == RiaDefines::undefinedGridFaultName() || f->name() == RiaDefines::undefinedGridFaultName() )
if ( f->name() == RiaResultNames::undefinedGridFaultName() ||
f->name() == RiaResultNames::undefinedGridFaultName() )
{
// Do not include undefined grid faults, as these are recomputed based on the imported faults from filesa
continue;

2
ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.cpp
View File

@@ -104,7 +104,7 @@ std::string RifEnsembleStatisticsReader::unitName( const RifEclipseSummaryAddres
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifEnsembleStatisticsReader::unitSystem() const
RiaDefines::EclipseUnitSystem RifEnsembleStatisticsReader::unitSystem() const
{
return m_ensembleStatCase->unitSystem();
}

2
ApplicationLibCode/FileInterface/RifEnsembleStatisticsReader.h
View File

@@ -35,7 +35,7 @@ public:
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
bool validateAddress( const RifEclipseSummaryAddress& address ) const;

4
ApplicationLibCode/FileInterface/RifKeywordVectorUserData.cpp
View File

@@ -230,9 +230,9 @@ std::string RifKeywordVectorUserData::unitName( const RifEclipseSummaryAddress&
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifKeywordVectorUserData::unitSystem() const
RiaDefines::EclipseUnitSystem RifKeywordVectorUserData::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationLibCode/FileInterface/RifKeywordVectorUserData.h
View File

@@ -47,8 +47,8 @@ public:
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
static bool isTimeHeader( const std::map<QString, QString>& header );

9
ApplicationLibCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@@ -22,6 +22,7 @@
#include "RiaApplication.h"
#include "RiaCellDividingTools.h"
#include "RiaEclipseUnitTools.h"
#include "RiaLogging.h"
#include "RiaPreferences.h"
@@ -1023,8 +1024,8 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
// Unit system
{
// Default units type is METRIC
RiaEclipseUnitTools::UnitSystem unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
int unitsTypeValue;
RiaDefines::EclipseUnitSystem unitsType = RiaDefines::EclipseUnitSystem::UNITS_METRIC;
int unitsTypeValue;
if ( m_dynamicResultsAccess.notNull() )
{
@@ -1044,11 +1045,11 @@ void RifReaderEclipseOutput::buildMetaData( ecl_grid_type* grid )
if ( unitsTypeValue == 2 )
{
unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
unitsType = RiaDefines::EclipseUnitSystem::UNITS_FIELD;
}
else if ( unitsTypeValue == 3 )
{
unitsType = RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
unitsType = RiaDefines::EclipseUnitSystem::UNITS_LAB;
}
m_eclipseCase->setUnitsType( unitsType );
}

14
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -60,19 +60,19 @@ std::vector<time_t> getTimeSteps( ecl_sum_type* ecl_sum )
return timeSteps;
}
RiaEclipseUnitTools::UnitSystem readUnitSystem( ecl_sum_type* ecl_sum )
RiaDefines::EclipseUnitSystem readUnitSystem( ecl_sum_type* ecl_sum )
{
ert_ecl_unit_enum eclUnitEnum = ecl_sum_get_unit_system( ecl_sum );
switch ( eclUnitEnum )
{
case ECL_METRIC_UNITS:
return RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
return RiaDefines::EclipseUnitSystem::UNITS_METRIC;
case ECL_FIELD_UNITS:
return RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
return RiaDefines::EclipseUnitSystem::UNITS_FIELD;
case ECL_LAB_UNITS:
return RiaEclipseUnitTools::UnitSystem::UNITS_LAB;
return RiaDefines::EclipseUnitSystem::UNITS_LAB;
default:
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}
}
@@ -124,7 +124,7 @@ void closeEclSum( ecl_sum_type* ecl_sum )
RifReaderEclipseSummary::RifReaderEclipseSummary()
: m_ecl_sum( nullptr )
, m_ecl_SmSpec( nullptr )
, m_unitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
, m_unitSystem( RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
m_valuesCache.reset( new ValuesCache() );
}
@@ -633,7 +633,7 @@ std::string RifReaderEclipseSummary::unitName( const RifEclipseSummaryAddress& r
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifReaderEclipseSummary::unitSystem() const
RiaDefines::EclipseUnitSystem RifReaderEclipseSummary::unitSystem() const
{
return m_unitSystem;
}

8
ApplicationLibCode/FileInterface/RifReaderEclipseSummary.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RifEclipseSummaryAddress.h"
#include "RifSummaryReaderInterface.h"
@@ -75,8 +75,8 @@ public:
bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const override;
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
QStringList warnings() const { return m_warnings; }
RiaDefines::EclipseUnitSystem unitSystem() const override;
QStringList warnings() const { return m_warnings; }
static std::string differenceIdentifier() { return "_DIFF"; }
static const std::string historyIdentifier() { return "H"; }
@@ -96,7 +96,7 @@ private:
const ecl_smspec_type* m_ecl_SmSpec;
std::vector<time_t> m_timeSteps;
RiaEclipseUnitTools::UnitSystem m_unitSystem;
RiaDefines::EclipseUnitSystem m_unitSystem;
std::map<RifEclipseSummaryAddress, int> m_resultAddressToErtNodeIdx;

4
ApplicationLibCode/FileInterface/RifReaderObservedData.cpp
View File

@@ -213,7 +213,7 @@ std::string RifReaderObservedData::unitName( const RifEclipseSummaryAddress& res
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaEclipseUnitTools::UnitSystem RifReaderObservedData::unitSystem() const
RiaDefines::EclipseUnitSystem RifReaderObservedData::unitSystem() const
{
return RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
return RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
}

2
ApplicationLibCode/FileInterface/RifReaderObservedData.h
View File

@@ -51,7 +51,7 @@ public:
std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const override;
RiaEclipseUnitTools::UnitSystem unitSystem() const override;
RiaDefines::EclipseUnitSystem unitSystem() const override;
private:
RifEclipseSummaryAddress address( const QString& quantity,

2
ApplicationLibCode/FileInterface/RifStimPlanModelAsymmetricFrkExporter.cpp
View File

@@ -18,6 +18,8 @@
#include "RifStimPlanModelAsymmetricFrkExporter.h"
#include "RiaEclipseUnitTools.h"
#include "RimStimPlanModel.h"
#include <QFile>

2
ApplicationLibCode/FileInterface/RifStimPlanModelDeviationFrkExporter.cpp
View File

@@ -18,6 +18,8 @@
#include "RifStimPlanModelDeviationFrkExporter.h"
#include "RiaEclipseUnitTools.h"
#include "RimStimPlanModel.h"
#include "RimWellPath.h"

1
ApplicationLibCode/FileInterface/RifStimPlanModelPerfsFrkExporter.cpp
View File

@@ -18,6 +18,7 @@
#include "RifStimPlanModelPerfsFrkExporter.h"
#include "RiaEclipseUnitTools.h"
#include "RiaLogging.h"
#include "RimStimPlanModel.h"

72
ApplicationLibCode/FileInterface/RifStimPlanXmlReader.cpp
View File

@@ -18,6 +18,7 @@
#include "RifStimPlanXmlReader.h"
#include "RiaDefines.h"
#include "RiaEclipseUnitTools.h"
#include "RiaFractureDefines.h"
#include "RiaLogging.h"
@@ -36,15 +37,14 @@ bool hasNegativeValues( std::vector<double> xs );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigStimPlanFractureDefinition>
RifStimPlanXmlReader::readStimPlanXMLFile( const QString& stimPlanFileName,
double conductivityScalingFactor,
double xScaleFactor,
double yScaleFactor,
double wellPathInterationY,
MirrorMode mirrorMode,
RiaEclipseUnitTools::UnitSystem requiredUnit,
QString* errorMessage )
cvf::ref<RigStimPlanFractureDefinition> RifStimPlanXmlReader::readStimPlanXMLFile( const QString& stimPlanFileName,
double conductivityScalingFactor,
double xScaleFactor,
double yScaleFactor,
double wellPathInterationY,
MirrorMode mirrorMode,
RiaDefines::EclipseUnitSystem requiredUnit,
QString* errorMessage )
{
RiaLogging::info( QString( "Starting to open StimPlan XML file: '%1'" ).arg( stimPlanFileName ) );
@@ -65,9 +65,9 @@ cvf::ref<RigStimPlanFractureDefinition>
if ( xScaleFactor != 1.0 ) stimPlanFileData->scaleXs( xScaleFactor );
if ( yScaleFactor != 1.0 ) stimPlanFileData->scaleYs( yScaleFactor, wellPathInterationY );
RiaEclipseUnitTools::UnitSystemType unitSystem = stimPlanFileData->unitSet();
caf::AppEnum<RiaDefines::EclipseUnitSystem> unitSystem = stimPlanFileData->unitSet();
if ( unitSystem != RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
if ( unitSystem != RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
RiaLogging::info( QString( "Setting unit system for StimPlan fracture template %1 to %2" )
.arg( stimPlanFileName )
.arg( unitSystem.uiText() ) );
@@ -178,10 +178,10 @@ cvf::ref<RigStimPlanFractureDefinition>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream,
RigStimPlanFractureDefinition* stimPlanFileData,
MirrorMode mirrorMode,
RiaEclipseUnitTools::UnitSystem requiredUnit )
void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream,
RigStimPlanFractureDefinition* stimPlanFileData,
MirrorMode mirrorMode,
RiaDefines::EclipseUnitSystem requiredUnit )
{
size_t startNegValuesYs = 0;
@@ -201,7 +201,7 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader&
if ( xmlStream.isStartElement() )
{
RiaEclipseUnitTools::UnitSystem destinationUnit = requiredUnit;
RiaDefines::EclipseUnitSystem destinationUnit = requiredUnit;
if ( xmlStream.name() == "grid" )
{
@@ -211,13 +211,13 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader&
QString gridunit = getAttributeValueString( xmlStream, "uom" );
if ( gridunit == "m" )
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_METRIC;
stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_METRIC;
else if ( gridunit == "ft" )
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_FIELD;
stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_FIELD;
else
stimPlanFileData->m_unitSet = RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN;
stimPlanFileData->m_unitSet = RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN;
if ( destinationUnit == RiaEclipseUnitTools::UnitSystem::UNITS_UNKNOWN )
if ( destinationUnit == RiaDefines::EclipseUnitSystem::UNITS_UNKNOWN )
{
// Use file unit set if requested unit is unknown
destinationUnit = stimPlanFileData->m_unitSet;
@@ -227,11 +227,11 @@ void RifStimPlanXmlReader::readStimplanGridAndTimesteps( QXmlStreamReader&
double tvdToBotPerfFt = getAttributeValueDouble( xmlStream, "TVDToBottomPerfFt" );
tvdToTopPerf =
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD,
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD,
destinationUnit,
tvdToTopPerfFt );
tvdToBotPerf =
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem::UNITS_FIELD,
RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem::UNITS_FIELD,
destinationUnit,
tvdToBotPerfFt );
}
@@ -387,12 +387,12 @@ std::vector<std::vector<double>> RifStimPlanXmlReader::getAllDepthDataAtTimeStep
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit,
RiaEclipseUnitTools::UnitSystem requiredUnit,
const std::vector<double>& values )
std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit,
RiaDefines::EclipseUnitSystem requiredUnit,
const std::vector<double>& values )
{
if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD &&
requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
std::vector<double> convertedValues;
for ( const auto& valueInFeet : values )
@@ -402,8 +402,8 @@ std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse
return convertedValues;
}
else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
else if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC &&
requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
std::vector<double> convertedValues;
for ( const auto& valueInMeter : values )
@@ -420,17 +420,17 @@ std::vector<double> RifStimPlanXmlReader::valuesInRequiredUnitSystem( RiaEclipse
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit,
RiaEclipseUnitTools::UnitSystem requiredUnit,
double value )
double RifStimPlanXmlReader::valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit,
RiaDefines::EclipseUnitSystem requiredUnit,
double value )
{
if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC )
if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD &&
requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC )
{
return RiaEclipseUnitTools::feetToMeter( value );
}
else if ( sourceUnit == RiaEclipseUnitTools::UnitSystem::UNITS_METRIC &&
requiredUnit == RiaEclipseUnitTools::UnitSystem::UNITS_FIELD )
else if ( sourceUnit == RiaDefines::EclipseUnitSystem::UNITS_METRIC &&
requiredUnit == RiaDefines::EclipseUnitSystem::UNITS_FIELD )
{
return RiaEclipseUnitTools::meterToFeet( value );
}

26
ApplicationLibCode/FileInterface/RifStimPlanXmlReader.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "cvfObject.h"
@@ -45,14 +45,14 @@ public:
double yScaleFactor,
double wellPathIntersectionY,
MirrorMode mirrorMode,
RiaEclipseUnitTools::UnitSystem requiredUnit,
QString* errorMessage );
RiaDefines::EclipseUnitSystem requiredUnit,
QString* errorMessage );
private:
static void readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream,
RigStimPlanFractureDefinition* stimPlanFileData,
MirrorMode mirrorMode,
RiaEclipseUnitTools::UnitSystem requiredUnit );
static void readStimplanGridAndTimesteps( QXmlStreamReader& xmlStream,
RigStimPlanFractureDefinition* stimPlanFileData,
MirrorMode mirrorMode,
RiaDefines::EclipseUnitSystem requiredUnit );
static double getAttributeValueDouble( QXmlStreamReader& xmlStream, const QString& parameterName );
static QString getAttributeValueString( QXmlStreamReader& xmlStream, const QString& parameterName );
@@ -60,11 +60,11 @@ private:
static std::vector<std::vector<double>> getAllDepthDataAtTimeStep( QXmlStreamReader& xmlStream );
static std::vector<double> valuesInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit,
RiaEclipseUnitTools::UnitSystem requiredUnit,
const std::vector<double>& values );
static std::vector<double> valuesInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit,
RiaDefines::EclipseUnitSystem requiredUnit,
const std::vector<double>& values );
static double valueInRequiredUnitSystem( RiaEclipseUnitTools::UnitSystem sourceUnit,
RiaEclipseUnitTools::UnitSystem requiredUnit,
double value );
static double valueInRequiredUnitSystem( RiaDefines::EclipseUnitSystem sourceUnit,
RiaDefines::EclipseUnitSystem requiredUnit,
double value );
};

6
ApplicationLibCode/FileInterface/RifSummaryReaderInterface.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RifEclipseSummaryAddress.h"
#include "cvfObject.h"
@@ -48,8 +48,8 @@ public:
virtual bool values( const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values ) const = 0;
virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0;
virtual RiaEclipseUnitTools::UnitSystem unitSystem() const = 0;
virtual std::string unitName( const RifEclipseSummaryAddress& resultAddress ) const = 0;
virtual RiaDefines::EclipseUnitSystem unitSystem() const = 0;
protected:
std::set<RifEclipseSummaryAddress> m_allResultAddresses; // Result and error addresses