OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DeckItem - API change

Browse Source
This commit is contained in:
Torbjørn Skille
2022-02-14 11:29:43 +01:00
parent ab697b69ea
commit 5bf2087d0a
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/opm/io/deck/__init__.py
View File

@@ -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")

13
python/tests/test_parse_deck.py
View File

@@ -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()

12
python/tests/test_parser.py
View File

@@ -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()