From dbc775e6c20b5ae7d6a1a3e31ea43f0e99a34984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rnar=20Grip=20Fj=C3=A6r?= <bjornar.fjar@gmail.com>
Date: Tue, 23 May 2017 15:38:10 +0200
Subject: [PATCH] #1518 Add UI for selecting pressure drop when exporting
 completion data

---
 .../RicWellPathExportCompletionDataFeature.cpp       |  2 +-
 .../RimExportCompletionDataSettings.cpp              | 12 ++++++++++++
 .../RimExportCompletionDataSettings.h                |  9 +++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp b/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp
index e3aa639ef4..a3a855bd33 100644
--- a/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp
+++ b/ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp
@@ -276,7 +276,7 @@ void RicWellPathExportCompletionDataFeature::generateWelsegsTable(RifEclipseOutp
         formatter.add(firstLocation.measuredDepth);
         formatter.add("1*");
         formatter.add("INC"); 
-        formatter.add("H--");
+        formatter.add(settings.pressureDrop().text());
 
         formatter.rowCompleted();
     }
diff --git a/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.cpp b/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.cpp
index ec0f14f726..065c236df0 100644
--- a/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.cpp
+++ b/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.cpp
@@ -18,6 +18,17 @@
 
 #include "RimExportCompletionDataSettings.h"
 
+namespace caf {
+    template<>
+    void RimExportCompletionDataSettings::PressureDropEnum::setUp()
+    {
+        addItem(RimExportCompletionDataSettings::HYDROSTATIC,                       "H--", "Hydrostatic");
+        addItem(RimExportCompletionDataSettings::HYDROSTATIC_FRICTION,              "HF-", "Hydrostatic + Friction");
+        addItem(RimExportCompletionDataSettings::HYDROSTATIC_FRICTION_ACCELERATION, "HFA", "Hydrostatic + Friction + Acceleration");
+        setDefault(RimExportCompletionDataSettings::HYDROSTATIC);
+    }
+}
+
 CAF_PDM_SOURCE_INIT(RimExportCompletionDataSettings, "RimExportCompletionDataSettings");
 
 //--------------------------------------------------------------------------------------------------
@@ -29,4 +40,5 @@ RimExportCompletionDataSettings::RimExportCompletionDataSettings()
 
     CAF_PDM_InitField(&includeWpimult, "IncludeWPIMULT", true, "Include WPIMLUT", "", "", "");
     CAF_PDM_InitField(&removeLateralsInMainBoreCells, "RemoveLateralsInMainBoreCells", false, "Remove Laterals in Main Bore Cells", "", "", "");
+    CAF_PDM_InitFieldNoDefault(&pressureDrop, "PressureDrop", "Pressure Drop", "", "", "");
 }
diff --git a/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.h b/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.h
index 37594a18b2..ebe14fc17e 100644
--- a/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.h
+++ b/ApplicationCode/ProjectDataModel/RimExportCompletionDataSettings.h
@@ -31,8 +31,17 @@ class RimExportCompletionDataSettings : public RimCaseAndFileExportSettings
     CAF_PDM_HEADER_INIT;
 public:
 
+    enum PressureDropType {
+        HYDROSTATIC,
+        HYDROSTATIC_FRICTION,
+        HYDROSTATIC_FRICTION_ACCELERATION
+    };
+
+    typedef caf::AppEnum<RimExportCompletionDataSettings::PressureDropType> PressureDropEnum;
+
     RimExportCompletionDataSettings();
 
     caf::PdmField<bool>                     includeWpimult;
     caf::PdmField<bool>                     removeLateralsInMainBoreCells;
+    caf::PdmField<PressureDropEnum>         pressureDrop;
 };