From 67b5dc8615b69b0a176529591fbe7fdf04f5e28d Mon Sep 17 00:00:00 2001
From: Gaute Lindkvist <lindkvis@gmail.com>
Date: Tue, 19 May 2020 12:45:14 +0200
Subject: [PATCH] #5950 Wbs: Fix wrong behaviour for LAS-file PP_INP

---
 .../RigGeoMechWellLogExtractor.cpp                  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp b/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
index b9ca8e9a9f..c2da7f247a 100644
--- a/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
@@ -317,10 +317,15 @@ std::vector<RigGeoMechWellLogExtractor::WbsParameterSource>
                 if ( !lasFileValues.empty() )
                 {
                     double lasValue         = getWellLogIntersectionValue( intersectionIdx, lasFileValues );
-		    // Only accept las-values for reservoir if the result is PP Reservoir
-                    bool   invalidLasRegion = isPPResResult && intersectionIdx < gridValues.size() &&
-                                            gridValues[intersectionIdx] != std::numeric_limits<double>::infinity();
-                    if ( lasValue != std::numeric_limits<double>::infinity() && !invalidLasRegion )
+		            // Only accept las-values for PP_reservoir if the grid result is valid
+                    bool   validLasRegion = true;
+                    if (isPPResResult)
+                    {
+                        validLasRegion = intersectionIdx < gridValues.size() &&
+                                         gridValues[intersectionIdx] != std::numeric_limits<double>::infinity();
+                    }
+
+                    if ( validLasRegion && lasValue != std::numeric_limits<double>::infinity())
                     {
                         unscaledValues[intersectionIdx]         = lasValue;
                         finalSourcesPerSegment[intersectionIdx] = RigWbsParameter::LAS_FILE;