Merge Formation Names coloring work and FlowDiagnostics integration

ApplicationCode/CMakeLists.txt

@@ -31,6 +31,7 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
     ${ResInsight_SOURCE_DIR}/ThirdParty/custom-opm-common/opm-common/
     ${custom-opm-parser_SOURCE_DIR}/opm-parser/
+    ${custom-opm-flowdiagnostics_SOURCE_DIR}/opm-flowdiagnostics/
 
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/Adm
@@ -333,7 +334,8 @@ endif()
 
 set( LINK_LIBRARIES
     custom-opm-parser
-    
+    custom-opm-flowdiagnostics
+        
     WellPathImportSsihub
 
 	ResultStatisticsCache

ApplicationCode/UnitTests/CMakeLists_files.cmake

@@ -23,6 +23,7 @@ ${CEE_CURRENT_LIST_DIR}ScalarMapper-Test.cpp
 ${CEE_CURRENT_LIST_DIR}WellPathAsciiFileReader-Test.cpp
 ${CEE_CURRENT_LIST_DIR}opm-parser-Test.cpp
 ${CEE_CURRENT_LIST_DIR}opm-parser-Performance-Test.cpp
+${CEE_CURRENT_LIST_DIR}opm-flowdiagnostics-Test.cpp
 )
 
 list(APPEND CODE_HEADER_FILES

ApplicationCode/UnitTests/RifReaderEclipseOutput-Test.cpp

@@ -40,6 +40,7 @@ TEST(RigReservoirTest, BasicTest)
 {
     RifEclipseUnifiedRestartFileAccess unrstAccess;
 
+/*
     QStringList filenames;
     //filenames << "d:/Models/Statoil/testcase_juli_2011/data/TEST10K_FLT_LGR_NNC.UNRST";
     filenames << "d:/Models/MRST/simple/SIMPLE.UNRST";
@@ -62,6 +63,7 @@ TEST(RigReservoirTest, BasicTest)
     {
         qDebug() << reportNum;
     }
+*/
 
 /*
     cvf::ref<RifReaderEclipseOutput> readerInterfaceEcl = new RifReaderEclipseOutput;

ApplicationCode/UnitTests/opm-flowdiagnostics-Test.cpp

@@ -0,0 +1,10 @@
+#include "gtest/gtest.h"
+
+#include <opm/flowdiagnostics/CellSet.hpp>
+#include <opm/utility/graph/AssembledConnections.hpp>
+
+TEST(opm_flowdiagnostics_test, basic_construction)
+{
+    auto g = Opm::AssembledConnections{};
+    auto s = Opm::FlowDiagnostics::CellSet{};
+}