From 5bf2087d0a4eeb08a643ca24a673d1b8b036150c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B8rn=20Skille?= Date: Mon, 14 Feb 2022 11:29:43 +0100 Subject: [PATCH] DeckItem - API change --- python/opm/io/deck/__init__.py | 2 +- python/tests/test_parse_deck.py | 13 +++++++++++-- python/tests/test_parser.py | 12 ++++++------ 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/python/opm/io/deck/__init__.py b/python/opm/io/deck/__init__.py index c7f0c1a59..5e231a11d 100644 --- a/python/opm/io/deck/__init__.py +++ b/python/opm/io/deck/__init__.py @@ -38,7 +38,7 @@ def get_item_deckitem(self): elif self.is_double(): return self.get_raw(0) elif self.is_uda(): - return self.get_uda(0) + return self.get_uda(0).value else: raise ValueError("Deck Item, unknown type") diff --git a/python/tests/test_parse_deck.py b/python/tests/test_parse_deck.py index 1157b6271..3fc88df68 100644 --- a/python/tests/test_parse_deck.py +++ b/python/tests/test_parse_deck.py @@ -133,8 +133,17 @@ FIPNUM welln= dkw_wconprod[0][0].value self.assertEqual(dkw_wconprod[0][2].value, "ORAT") - self.assertEqual(dkw_wconprod[0][3].value.value, "WUOPRL") - self.assertEqual(dkw_wconprod[0][5].value.value, 1.5e5) + self.assertEqual(dkw_wconprod[0][3].value, "WUOPRL") + self.assertEqual(dkw_wconprod[0][5].value, 1.5e5) + + self.assertTrue(not dkw_wconprod[0][3].defaulted) + self.assertTrue(dkw_wconprod[0][3].is_uda) + + dkw_wconinje = self.deck_spe1case1["WCONINJE"] + + self.assertEqual(dkw_wconinje[0][0].value, "INJ") + self.assertTrue(dkw_wconinje[0][4].is_uda) + self.assertEqual(dkw_wconinje[0][4].value, 1e5) dkw_permx = self.deck_spe1case1["PERMX"] permx = dkw_permx.get_raw_array() diff --git a/python/tests/test_parser.py b/python/tests/test_parser.py index fb1f59ad1..5d40a78ec 100644 --- a/python/tests/test_parser.py +++ b/python/tests/test_parser.py @@ -188,22 +188,22 @@ FIPNUM self.assertEqual(record[2].get_str(0), "ORAT") self.assertEqual(record[3].name(), "ORAT") self.assertTrue(record[3].is_uda()) - self.assertEqual(record[3].value.value, 30000) + self.assertEqual(record[3].value, 30000) self.assertEqual(record[4].name(), "WRAT") self.assertTrue(record[4].is_uda()) - self.assertEqual(record[4].value.value, 0) + self.assertEqual(record[4].value, 0) self.assertEqual(record[5].name(), "GRAT") self.assertTrue(record[5].is_uda()) - self.assertEqual(record[5].value.value, 0) + self.assertEqual(record[5].value, 0) self.assertEqual(record[6].name(), "LRAT") self.assertTrue(record[6].is_uda()) - self.assertEqual(record[6].value.value, 0) + self.assertEqual(record[6].value, 0) self.assertEqual(record[7].name(), "RESV") self.assertTrue(record[7].is_uda()) - self.assertEqual(record[7].value.value, 0) + self.assertEqual(record[7].value, 0) self.assertEqual(record[8].name(), "BHP") self.assertTrue(record[8].is_uda()) - self.assertEqual(record[8].value.value, 1000) + self.assertEqual(record[8].value, 1000) def test_deck_kw_vector(self): parser = Parser()