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

#7117 Fix stale data when reimporting elastic properties

Browse Source
This commit is contained in:
Kristian Bendiksen 2021-02-19 16:25:51 +01:00 committed by Magne Sjaastad
parent f12a3ed1ba
commit 8ce01c098a
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationLibCode/Commands/RicElasticPropertiesImportTools.cpp
View File

@ -87,6 +87,11 @@ void RicElasticPropertiesImportTools::importElasticPropertiesFromFile( const QSt
RimElasticProperties* rimElasticProperties = stimPlanModelTemplate->elasticProperties(); RimElasticProperties* rimElasticProperties = stimPlanModelTemplate->elasticProperties();
if ( !rimElasticProperties ) rimElasticProperties = new RimElasticProperties; if ( !rimElasticProperties ) rimElasticProperties = new RimElasticProperties;
// Clear the properties to avoid keeping data which has been deleted
// from the file since the last import.
rimElasticProperties->clearProperties();
for ( FaciesKey key : faciesKeys ) for ( FaciesKey key : faciesKeys )
{ {
std::vector<RifElasticProperties> matchingFacies; std::vector<RifElasticProperties> matchingFacies;

8
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.cpp
View File

@ -108,6 +108,14 @@ const RigElasticProperties& RimElasticProperties::propertiesForFacies( FaciesKey
return m_properties.find( key )->second; return m_properties.find( key )->second;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimElasticProperties::clearProperties()
{
m_properties.clear();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

1
ApplicationLibCode/ProjectDataModel/StimPlanModel/RimElasticProperties.h
View File

@ -52,6 +52,7 @@ public:
void setPropertiesForFacies( FaciesKey& key, const RigElasticProperties& properties ); void setPropertiesForFacies( FaciesKey& key, const RigElasticProperties& properties );
bool hasPropertiesForFacies( FaciesKey& key ) const; bool hasPropertiesForFacies( FaciesKey& key ) const;
const RigElasticProperties& propertiesForFacies( FaciesKey& key ) const; const RigElasticProperties& propertiesForFacies( FaciesKey& key ) const;
void clearProperties();
void loadDataAndUpdate(); void loadDataAndUpdate();