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

sunbeam test schedule.py works for new Well2.

Browse Source
This commit is contained in:
Steinar Foss 2019-06-19 14:43:59 +02:00
parent 24f44c1c64
commit 5e88782e51
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/python/sunbeam/schedule.py
View File

@ -20,8 +20,8 @@ class Schedule(object):
def groups(self, timestep=0):
return [Group(x, self, timestep) for x in self._groups if x.name != 'FIELD']
def __getitem__(self,well):
return Well(self._getwell(well))
def get_well(self, well, timestep):
return Well(self._getwell(well, timestep))
@delegate(lib.Well)
@ -126,7 +126,7 @@ class Group(object):
@property
def wells(self):
names = self._wellnames(self.timestep)
return [w for w in self._schedule.wells if w.name in names]
return [w for w in self._schedule.get_wells(self.timestep) if w.name in names]
@property
def vfp_table_nr(self):

16
python/tests/schedule.py
View File

@ -10,10 +10,10 @@ class TestSchedule(unittest.TestCase):
cls.sch = sunbeam.parse('spe3/SPE3CASE1.DATA').schedule
def testWells(self):
self.assertEqual(2, len(self.sch.wells))
self.assertEqual(2, len(self.sch.get_wells(0)))
with self.assertRaises(KeyError):
self.sch['foo']
self.sch.get_well('foo', 0)
def testContains(self):
self.assertTrue('PROD' in self.sch)
@ -31,19 +31,19 @@ class TestSchedule(unittest.TestCase):
self.assertEqual(dt.datetime(2016, 1, 1), timesteps[7])
def testGroups(self):
g1 = self.sch.group()['G1'].wells
g1 = self.sch.group(0)['G1'].wells
self.assertEqual(2, len(g1))
def head(xs): return next(iter(xs))
inje = head(filter(sunbeam.Well.injector(0), g1))
prod = head(filter(sunbeam.Well.producer(0), g1))
inje = head(filter(sunbeam.Well.injector(), g1))
prod = head(filter(sunbeam.Well.producer(), g1))
self.assertEqual(self.sch['INJ'], inje)
self.assertEqual(self.sch['PROD'], prod)
self.assertEqual(self.sch.get_well('INJ', 0).isinjector(), inje.isinjector())
self.assertEqual(self.sch.get_well('PROD', 0).isproducer(), prod.isproducer())
with self.assertRaises(KeyError):
self.sch.group()['foo']
self.sch.group(0)['foo']
if __name__ == "__main__":