OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-23 23:13:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Smoothing is default on

Browse Source 
Fix timestep and odb case name issues.
This commit is contained in:
jonjenssen 2021-05-26 14:41:12 +02:00 committed by jonjenssen
parent 098fda9816
commit ec9713212e
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPreprocSettings.cpp
View File

@ -61,7 +61,7 @@ RimFaultRAPreprocSettings::RimFaultRAPreprocSettings()
m_baseDir.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField( &m_cleanBaseDir, "CleanBaseDir", false, "Clean Output Directory", "", "", "" );
CAF_PDM_InitField( &m_smoothEclipseData, "SmoothEclipseData", false, "Smooth Eclipse Data", "", "", "" );
CAF_PDM_InitField( &m_smoothEclipseData, "SmoothEclipseData", true, "Smooth Eclipse Data", "", "", "" );
}
//--------------------------------------------------------------------------------------------------

21
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.cpp
View File

@ -40,6 +40,8 @@
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiTableViewEditor.h"
#include <QFileInfo>
CAF_PDM_SOURCE_INIT( RimFaultRASettings, "RimFaultRASettings" );
//--------------------------------------------------------------------------------------------------
@ -190,6 +192,15 @@ QString RimFaultRASettings::geomechCaseFilename() const
return "";
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimFaultRASettings::geomechCaseName() const
{
QFileInfo fi( geomechCaseFilename() );
return fi.baseName();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -319,7 +330,7 @@ QString RimFaultRASettings::startTimeStepGeoMech() const
if ( m_geomechCase() )
{
if ( ( m_startTimestepGeoMech >= 0 ) && ( m_startTimestepGeoMech <= m_geomechCase->timeStepStrings().size() ) )
return m_geomechCase->timeStepStrings()[m_startTimestepEclipse];
return m_geomechCase->timeStepStrings()[m_startTimestepGeoMech];
}
return "";
}
@ -394,8 +405,8 @@ std::list<RimGenericParameter*> RimFaultRASettings::basicParameters( int faultID
//--------------------------------------------------------------------------------------------------
std::list<RimGenericParameter*> RimFaultRASettings::advancedParameters( int faultID )
{
m_advancedParametersRI->setParameterValue( "eclipse_loadstep_start", startTimeStepEclipse() );
m_advancedParametersRI->setParameterValue( "eclipse_loadstep_end", m_endTimestepEclipse() );
m_advancedParametersRI->setParameterValue( "eclipse_loadstep_start", loadStepStart() );
m_advancedParametersRI->setParameterValue( "eclipse_loadstep_end", loadStepEnd() );
m_advancedParametersRI->setParameterValue( "faultid_calibration", faultID );
m_advancedParametersRI->setParameterValue( "abaqus_elastic_properties", elasticPropertiesFilename() );
m_advancedParametersRI->setParameterValue( "abaqus_stress_start", stressStartFilename() );
@ -452,7 +463,7 @@ QString RimFaultRASettings::elasticPropertiesFilename() const
//--------------------------------------------------------------------------------------------------
QString RimFaultRASettings::stressStartFilename() const
{
QString filename = QString( "/%1/%2_%3_stress.rpt" ).arg( "Abaqus", geomechCase()->uiName(), startTimeStepGeoMech() );
QString filename = QString( "/%1/%2_%3_stress.rpt" ).arg( "Abaqus", geomechCaseName(), startTimeStepGeoMech() );
return m_baseDir + filename;
}
@ -461,7 +472,7 @@ QString RimFaultRASettings::stressStartFilename() const
//--------------------------------------------------------------------------------------------------
QString RimFaultRASettings::stressEndFilename() const
{
QString filename = QString( "/%1/%2_%3_stress.rpt" ).arg( "Abaqus", geomechCase()->uiName(), endTimeStepGeoMech() );
QString filename = QString( "/%1/%2_%3_stress.rpt" ).arg( "Abaqus", geomechCaseName(), endTimeStepGeoMech() );
return m_baseDir + filename;
}

1
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRASettings.h
View File

@ -45,6 +45,7 @@ public:
void setGeoMechCase( RimGeoMechCase* geomechCase );
RimGeoMechCase* geomechCase() const;
QString geomechCaseFilename() const;
QString geomechCaseName() const;
RimEclipseInputCase* eclipseFRAGeneratedCase() const;
RimEclipseCase* eclipseCase() const;