mirror of
https://github.com/OPM/ResInsight.git
synced 2026-08-27 05:37:21 -05:00
#14484 Orion Events: parse and apply data filter
Add a typed FILTER declaration to the ORIONEVENTS 2.0 grammar, e.g. FILTER POROPERM = "PORO > 0.4 AND PERMX > 100.0". A PERFORATION event references it with FILTER=POROPERM or supplies an inline quoted expression. When applied, each used filter is materialized as a case-level combined data filter (one property filter per term, one-sided inclusive bounds, AND/OR combine mode) and attached to the perforation. Unqualified result names are searched in STATIC_NATIVE, DYNAMIC_NATIVE then GENERATED results; a TYPE. qualifier restricts the search. Missing results raise before any event is applied. apply_orion_document gains an optional case= parameter defaulting to the project's first case. RimWellEventPerf carries a RimCellFilter ptr-field with scriptable AddFilter/cell_filter methods, and the filter is copied onto the RimPerforationInterval when the timeline materializes completions.
This commit is contained in:
@@ -18,6 +18,8 @@
|
||||
|
||||
#include "RimWellEventPerf.h"
|
||||
|
||||
#include "RimCellFilter.h"
|
||||
|
||||
#include "cafPdmFieldScriptingCapability.h"
|
||||
#include "cafPdmObjectScriptingCapability.h"
|
||||
#include "cafPdmUiDoubleSliderEditor.h"
|
||||
@@ -48,6 +50,7 @@ RimWellEventPerf::RimWellEventPerf()
|
||||
CAF_PDM_InitScriptableField( &m_skinFactor, "SkinFactor", 0.0, "Skin Factor" );
|
||||
CAF_PDM_InitScriptableField( &m_state, "State", caf::AppEnum<State>( State::OPEN ), "State" );
|
||||
CAF_PDM_InitScriptableField( &m_completionNumber, "CompletionNumber", 0, "Completion Number" );
|
||||
CAF_PDM_InitFieldNoDefault( &m_cellFilter, "CellFilter", "Cell Filter" );
|
||||
|
||||
setDeletable( true );
|
||||
}
|
||||
@@ -107,6 +110,14 @@ int RimWellEventPerf::completionNumber() const
|
||||
return m_completionNumber();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimCellFilter* RimWellEventPerf::cellFilter() const
|
||||
{
|
||||
return m_cellFilter();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -155,6 +166,14 @@ void RimWellEventPerf::setCompletionNumber( int completionNumber )
|
||||
m_completionNumber = completionNumber;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellEventPerf::setCellFilter( RimCellFilter* filter )
|
||||
{
|
||||
m_cellFilter = filter;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -22,6 +22,9 @@
|
||||
|
||||
#include "cafAppEnum.h"
|
||||
#include "cafPdmField.h"
|
||||
#include "cafPdmPtrField.h"
|
||||
|
||||
class RimCellFilter;
|
||||
|
||||
//==================================================================================================
|
||||
///
|
||||
@@ -43,12 +46,13 @@ public:
|
||||
~RimWellEventPerf() override;
|
||||
|
||||
// Getters
|
||||
double startMD() const;
|
||||
double endMD() const;
|
||||
double diameter() const;
|
||||
double skinFactor() const;
|
||||
State state() const;
|
||||
int completionNumber() const;
|
||||
double startMD() const;
|
||||
double endMD() const;
|
||||
double diameter() const;
|
||||
double skinFactor() const;
|
||||
State state() const;
|
||||
int completionNumber() const;
|
||||
RimCellFilter* cellFilter() const;
|
||||
|
||||
// Setters
|
||||
void setStartMD( double md );
|
||||
@@ -57,6 +61,7 @@ public:
|
||||
void setSkinFactor( double skinFactor );
|
||||
void setState( State state );
|
||||
void setCompletionNumber( int completionNumber );
|
||||
void setCellFilter( RimCellFilter* filter );
|
||||
|
||||
// Override from RimWellEvent
|
||||
EventType eventType() const override;
|
||||
@@ -73,6 +78,7 @@ private:
|
||||
caf::PdmField<double> m_skinFactor;
|
||||
caf::PdmField<caf::AppEnum<State>> m_state;
|
||||
caf::PdmField<int> m_completionNumber;
|
||||
caf::PdmPtrField<RimCellFilter*> m_cellFilter;
|
||||
};
|
||||
|
||||
namespace caf
|
||||
|
||||
@@ -493,6 +493,11 @@ bool RimWellEventTimeline::applyPerfEvent( const RimWellEventPerf& event, RimWel
|
||||
perfInterval->setCompletionNumber( event.completionNumber() );
|
||||
}
|
||||
|
||||
if ( event.cellFilter() )
|
||||
{
|
||||
perfInterval->setCellFilter( event.cellFilter() );
|
||||
}
|
||||
|
||||
// Set the custom start date based on the event date
|
||||
perfInterval->enableCustomStartDate( true );
|
||||
perfInterval->setCustomStartDate( event.eventDate().date() );
|
||||
|
||||
Reference in New Issue
Block a user