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

Improve RftPlt data source objects (#9769)

Browse Source 
Move AppEnum init to RifDataSourceForRftPlt
Simplify constructors for RifDataSourceForRftPlt
Rename enum names in RifDataSourceForRftPlt::SourceType
Add missing pressureDepthData in RimDataSourceForRftPlt
This commit is contained in:
Magne Sjaastad
2023-01-30 11:12:26 +01:00
committed by GitHub
parent 863925f980
commit 234719aea3
9 changed files with 366 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ApplicationLibCode/ProjectDataModel/Flow/RimDataSourceForRftPlt.cpp
View File

@@ -19,28 +19,17 @@
#include "RimDataSourceForRftPlt.h"
#include "RimEclipseCase.h"
#include "RimObservedFmuRftData.h"
#include "RimPressureDepthData.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimWellLogFile.h"
#include "cafAppEnum.h"
#include "cvfAssert.h"
#include <QString>
#include <QTextStream>
namespace caf
{
template <>
void caf::AppEnum<RifDataSourceForRftPlt::SourceType>::setUp()
{
addItem( RifDataSourceForRftPlt::SourceType::RFT, "RFT", "RFT Cases" );
addItem( RifDataSourceForRftPlt::SourceType::GRID, "GRID", "Grid Cases" );
addItem( RifDataSourceForRftPlt::SourceType::OBSERVED, "OBSERVED", "Observed Data" );
addItem( RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT, "ENSEMBLE", "Ensembles with RFT Data" );
addItem( RifDataSourceForRftPlt::SourceType::OBSERVED_FMU_RFT, "OBSERVED_FMU", "Observed FMU Data" );
setDefault( RifDataSourceForRftPlt::SourceType::NONE );
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -51,7 +40,7 @@ CAF_PDM_SOURCE_INIT( RimDataSourceForRftPlt, "RftAddress" );
//--------------------------------------------------------------------------------------------------
RimDataSourceForRftPlt::RimDataSourceForRftPlt()
{
InitPdmObject();
initPdmObject();
}
//--------------------------------------------------------------------------------------------------
@@ -59,7 +48,7 @@ RimDataSourceForRftPlt::RimDataSourceForRftPlt()
//--------------------------------------------------------------------------------------------------
RimDataSourceForRftPlt::RimDataSourceForRftPlt( const RifDataSourceForRftPlt& addr )
{
InitPdmObject();
initPdmObject();
setAddress( addr );
}
@@ -70,9 +59,11 @@ void RimDataSourceForRftPlt::setAddress( const RifDataSourceForRftPlt& address )
{
m_sourceType = address.sourceType();
m_eclCase = address.eclCase();
m_wellLogFile = address.wellLogFile();
m_summaryCase = address.summaryCase();
m_ensemble = address.ensemble();
m_wellLogFile = address.wellLogFile();
m_observedFmuRftData = address.observedFmuRftData();
m_pressureDepthData = address.pressureDepthData();
}
//--------------------------------------------------------------------------------------------------
@@ -82,17 +73,20 @@ RifDataSourceForRftPlt RimDataSourceForRftPlt::address() const
{
switch ( m_sourceType() )
{
case RifDataSourceForRftPlt::OBSERVED:
return RifDataSourceForRftPlt( m_sourceType(), m_wellLogFile );
case RifDataSourceForRftPlt::RFT:
case RifDataSourceForRftPlt::GRID:
return RifDataSourceForRftPlt( m_sourceType(), m_eclCase );
case RifDataSourceForRftPlt::ENSEMBLE_RFT:
return RifDataSourceForRftPlt( m_sourceType(), m_ensemble );
case RifDataSourceForRftPlt::OBSERVED_FMU_RFT:
return RifDataSourceForRftPlt( m_sourceType(), m_observedFmuRftData );
default:
break;
case RifDataSourceForRftPlt::SourceType::OBSERVED_LAS_FILE:
return RifDataSourceForRftPlt( m_wellLogFile );
case RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA:
return RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::RFT_SIM_WELL_DATA, m_eclCase );
case RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA:
return RifDataSourceForRftPlt( RifDataSourceForRftPlt::SourceType::GRID_MODEL_CELL_DATA, m_eclCase );
case RifDataSourceForRftPlt::SourceType::SUMMARY_RFT:
return RifDataSourceForRftPlt( m_summaryCase, m_ensemble );
case RifDataSourceForRftPlt::SourceType::ENSEMBLE_RFT:
return RifDataSourceForRftPlt( m_ensemble );
case RifDataSourceForRftPlt::SourceType::OBSERVED_FMU_RFT:
return RifDataSourceForRftPlt( m_observedFmuRftData );
case RifDataSourceForRftPlt::SourceType::OBSERVED_PRESSURE_DEPTH:
return RifDataSourceForRftPlt( m_pressureDepthData );
}
return RifDataSourceForRftPlt();
}
@@ -100,24 +94,13 @@ RifDataSourceForRftPlt RimDataSourceForRftPlt::address() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimDataSourceForRftPlt::InitPdmObject()
void RimDataSourceForRftPlt::initPdmObject()
{
CAF_PDM_InitFieldNoDefault( &m_sourceType, "SourceType", "Source Type" );
CAF_PDM_InitFieldNoDefault( &m_eclCase, "EclipseCase", "Eclipse Case" );
CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File" );
CAF_PDM_InitFieldNoDefault( &m_summaryCase, "SummaryCase", "Summary Case" );
CAF_PDM_InitFieldNoDefault( &m_ensemble, "Ensemble", "Ensemble" );
CAF_PDM_InitFieldNoDefault( &m_wellLogFile, "WellLogFile", "Well Log File" );
CAF_PDM_InitFieldNoDefault( &m_observedFmuRftData, "ObservedFmuRftData", "Observed FMU Data" );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDataSourceForRftPlt& RimDataSourceForRftPlt::operator=( const RimDataSourceForRftPlt& other )
{
m_sourceType = other.m_sourceType();
m_eclCase = other.m_eclCase();
m_wellLogFile = other.m_wellLogFile();
m_ensemble = other.m_ensemble();
m_observedFmuRftData = other.m_observedFmuRftData();
return *this;
CAF_PDM_InitFieldNoDefault( &m_pressureDepthData, "PressureDepthData", "Pressure/Depth Data" );
}