From 839a049804a7c83bf01764513c3a23574bd8cce0 Mon Sep 17 00:00:00 2001
From: Kristian Bendiksen <kristian.bendiksen@gmail.com>
Date: Tue, 8 Sep 2020 13:13:34 +0200
Subject: [PATCH] #6175 Fracture Model: Remove hard-coded reference to Norne.

---
 ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp  | 4 +++-
 .../ProjectDataModel/RimElasticPropertiesCurve.cpp            | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp b/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp
index 7c112aff97..f3ec9ec042 100644
--- a/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp
+++ b/ApplicationCode/Commands/RicElasticPropertiesImportTools.cpp
@@ -104,7 +104,9 @@ void RicElasticPropertiesImportTools::importElasticPropertiesFromFile( const QSt
                                                item.immobileFluidSaturation );
         }
 
-        rimElasticProperties->setPropertiesForFacies( key, rigElasticProperties );
+        // Avoid using the field name in the match for now
+        FaciesKey noFieldKey = std::make_tuple( "", formationName, faciesName );
+        rimElasticProperties->setPropertiesForFacies( noFieldKey, rigElasticProperties );
     }
 
     rimElasticProperties->setFilePath( filePath );
diff --git a/ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.cpp b/ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.cpp
index e539fab577..bc04838801 100644
--- a/ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.cpp
+++ b/ApplicationCode/ProjectDataModel/RimElasticPropertiesCurve.cpp
@@ -257,8 +257,8 @@ void RimElasticPropertiesCurve::performDataExtraction( bool* isUsingPseudoLength
 
         for ( size_t i = 0; i < tvDepthValues.size(); i++ )
         {
-            // TODO: get from somewhere??
-            QString fieldName     = "Norne";
+            // Avoid using the field name in the match for now
+            QString fieldName     = "";
             QString faciesName    = findFaciesName( *colorLegend, faciesValues[i] );
             int     idx           = static_cast<int>( formationValues[i] );
             QString formationName = formationNamesVector[idx];