From f9973c5cf09c75fb43e8512ece33a71fc5ddd8ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= <Bard.Skaflestad@sintef.no>
Date: Fri, 6 Oct 2017 15:34:49 +0200
Subject: [PATCH] Parser: Recognise Keywords 'LAB' and 'PVT-M'

Add test to verify that the parser recognises these keywords.
---
 .../share/keywords/000_Eclipse100/L/LAB       |  3 +++
 .../share/keywords/000_Eclipse100/P/PVT_M     |  7 +++++++
 .../eclipse/share/keywords/keyword_list.cmake |  2 ++
 tests/parser/ParserTests.cpp                  | 20 +++++++++++++++++++
 4 files changed, 32 insertions(+)
 create mode 100644 src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB
 create mode 100644 src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M

diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB
new file mode 100644
index 000000000..8a40c4ebc
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/L/LAB
@@ -0,0 +1,3 @@
+{"name" : "LAB" ,
+ "sections" : ["RUNSPEC"]
+}
diff --git a/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M
new file mode 100644
index 000000000..13c393aaa
--- /dev/null
+++ b/src/opm/parser/eclipse/share/keywords/000_Eclipse100/P/PVT_M
@@ -0,0 +1,7 @@
+{"name" : "PVT_M" ,
+ "sections" : ["RUNSPEC"],
+
+ "deck_names" : [
+  "PVT-M"
+ ]
+}
diff --git a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
index 05f715867..dd725aac9 100644
--- a/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
+++ b/src/opm/parser/eclipse/share/keywords/keyword_list.cmake
@@ -125,6 +125,7 @@ set( keywords
      000_Eclipse100/I/ISWL
      000_Eclipse100/I/ISWU
      000_Eclipse100/J/JFUNC
+     000_Eclipse100/L/LAB
      000_Eclipse100/L/LGR
      000_Eclipse100/L/LIFTOPT
      000_Eclipse100/M/MAPAXES
@@ -211,6 +212,7 @@ set( keywords
      000_Eclipse100/P/PVDG
      000_Eclipse100/P/PVDO
      000_Eclipse100/P/PVDS
+     000_Eclipse100/P/PVT_M
      000_Eclipse100/P/PVTG
      000_Eclipse100/P/PVTNUM
      000_Eclipse100/P/PVTO
diff --git a/tests/parser/ParserTests.cpp b/tests/parser/ParserTests.cpp
index a5424025e..c35dff9c9 100644
--- a/tests/parser/ParserTests.cpp
+++ b/tests/parser/ParserTests.cpp
@@ -1829,3 +1829,23 @@ BOOST_AUTO_TEST_CASE(TestKeywordActionEnumLoop) {
     BOOST_CHECK_EQUAL( "IGNORE_WARNING"    , ParserKeywordActionEnum2String(ParserKeywordActionEnumFromString(  "IGNORE_WARNING" ) ));
     BOOST_CHECK_EQUAL( "THROW_EXCEPTION" , ParserKeywordActionEnum2String(ParserKeywordActionEnumFromString(  "THROW_EXCEPTION" ) ));
 }
+
+/*****************************************************************/
+
+BOOST_AUTO_TEST_CASE(ParseUnitConventions)
+{
+    const auto* deck_string = R"(
+METRIC
+FIELD
+LAB
+PVT-M
+)";
+
+    Parser parser;
+    const auto deck = parser.parseString( deck_string, ParseContext() );
+
+    BOOST_CHECK( deck.hasKeyword( "METRIC" ) );
+    BOOST_CHECK( deck.hasKeyword( "FIELD" ) );
+    BOOST_CHECK( deck.hasKeyword( "LAB" ) );
+    BOOST_CHECK( deck.hasKeyword( "PVT-M" ) );
+}