OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

#7339 StimPlanModel: Update python api changes in pdm objects.

Browse Source 
The eclipse cases are now set on the StimPlanModelTemplate, not on the
StimPlanModel.
This commit is contained in:
Kristian Bendiksen
2021-02-19 12:18:30 +01:00
parent dc4e372fc2
commit 530c6d3e85
7 changed files with 39 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.cpp
+2 -5
View File
@@ -42,8 +42,6 @@ RimcStimPlanModelCollection_newStimPlanModel::RimcStimPlanModelCollection_newSti
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create StimPlan Model", "", "", "Create a new StimPlan Model" );
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" );
CAF_PDM_InitScriptableFieldNoDefault( &m_wellPath, "WellPath", "", "", "", "Well Path" );
CAF_PDM_InitScriptableFieldNoDefault( &m_md, "MeasuredDepth", "", "", "", "Measured Depth" );
CAF_PDM_InitScriptableFieldNoDefault( &m_stimPlanModelTemplate, "StimPlanModelTemplate", "", "", "", "StimPlan Model Template" );
@@ -56,13 +54,12 @@ caf::PdmObjectHandle* RimcStimPlanModelCollection_newStimPlanModel::execute()
{
RimStimPlanModel* newStimPlanModel = nullptr;
RimStimPlanModelCollection* stimPlanModelCollection = self<RimStimPlanModelCollection>();
if ( m_wellPath && m_eclipseCase )
if ( m_wellPath )
{
RimWellPathCollection* wellPathCollection = nullptr;
stimPlanModelCollection->firstAncestorOrThisOfTypeAsserted( wellPathCollection );
newStimPlanModel =
RicNewStimPlanModelFeature::addStimPlanModel( m_wellPath, wellPathCollection, m_eclipseCase, m_timeStep );
newStimPlanModel = RicNewStimPlanModelFeature::addStimPlanModel( m_wellPath, wellPathCollection );
}
if ( newStimPlanModel )
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelCollection.h
-2
View File
@@ -48,8 +48,6 @@ public:
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
private:
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmField<int> m_timeStep;
caf::PdmPtrField<RimWellPath*> m_wellPath;
caf::PdmField<double> m_md;
caf::PdmPtrField<RimStimPlanModelTemplate*> m_stimPlanModelTemplate;
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.cpp
+12
View File
@@ -23,6 +23,7 @@
#include "FractureCommands/RicFractureNameGenerator.h"
#include "FractureCommands/RicNewStimPlanModelFeature.h"
#include "RimEclipseCase.h"
#include "RimStimPlanModelTemplate.h"
#include "RimStimPlanModelTemplateCollection.h"
@@ -41,6 +42,9 @@ RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::RimcStimPlanModelT
: caf::PdmObjectMethod( self )
{
CAF_PDM_InitObject( "Create StimPlan Model Template", "", "", "Create a new StimPlan Model Template" );
CAF_PDM_InitScriptableFieldNoDefault( &m_eclipseCase, "EclipseCase", "", "", "", "Eclipse Case" );
CAF_PDM_InitScriptableFieldNoDefault( &m_timeStep, "TimeStep", "", "", "", "Time Step" );
CAF_PDM_InitScriptableFieldNoDefault( &m_faciesPropertiesFilePath,
"FaciesPropertiesFilePath",
"",
@@ -60,9 +64,17 @@ RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::RimcStimPlanModelT
//--------------------------------------------------------------------------------------------------
caf::PdmObjectHandle* RimcStimPlanModelTemplateCollection_newStimPlanModelTemplate::execute()
{
if ( !m_eclipseCase ) return nullptr;
RimStimPlanModelTemplate* newStimPlanModelTemplate = new RimStimPlanModelTemplate;
RimStimPlanModelTemplateCollection* stimPlanModelTemplateCollection = self<RimStimPlanModelTemplateCollection>();
newStimPlanModelTemplate->setName( RicFractureNameGenerator::nameForNewStimPlanModelTemplate() );
newStimPlanModelTemplate->setDynamicEclipseCase( m_eclipseCase );
newStimPlanModelTemplate->setTimeStep( m_timeStep );
newStimPlanModelTemplate->setInitialPressureEclipseCase( m_eclipseCase );
newStimPlanModelTemplate->setStaticEclipseCase( m_eclipseCase );
stimPlanModelTemplateCollection->addStimPlanModelTemplate( newStimPlanModelTemplate );
RicElasticPropertiesImportTools::importElasticPropertiesFromFile( m_elasticPropertiesFilePath,
ApplicationLibCode/ProjectDataModelCommands/RimcStimPlanModelTemplateCollection.h
+5 -2
View File
@@ -29,6 +29,7 @@
#include <QString>
class RimStimPlanModelTemplateCollection;
class RimEclipseCase;
//==================================================================================================
///
@@ -45,6 +46,8 @@ public:
std::unique_ptr<PdmObjectHandle> defaultResult() const override;
private:
caf::PdmField<QString> m_elasticPropertiesFilePath;
caf::PdmField<QString> m_faciesPropertiesFilePath;
caf::PdmPtrField<RimEclipseCase*> m_eclipseCase;
caf::PdmField<int> m_timeStep;
caf::PdmField<QString> m_elasticPropertiesFilePath;
caf::PdmField<QString> m_faciesPropertiesFilePath;
};