properties.py: removed Eclipse3DProperties.

This commit is contained in:
Steinar Foss 2019-09-12 15:56:31 +02:00
parent 369a99a64a
commit 525dfdcd69
2 changed files with 7 additions and 17 deletions

View File

@ -10,9 +10,6 @@ class EclipseState(object):
def __repr__(self):
return 'EclipseState(title = "%s")' % self.title
def props(self):
return Eclipse3DProperties(self._props())
@property
def table(self):
return Tables(self._tables())
@ -25,13 +22,6 @@ class EclipseState(object):
return fs
@delegate(lib.Eclipse3DProperties)
class Eclipse3DProperties(object):
def __repr__(self):
return 'Eclipse3DProperties()'
@delegate(lib.Tables)
class Tables(object):

View File

@ -10,11 +10,11 @@ class TestProps(unittest.TestCase):
def setUp(self):
self.spe3 = opm.io.parse('tests/spe3/SPE3CASE1.DATA').state
"""
self.props = self.spe3.props()
"""
def test_repr(self):
self.assertTrue('Eclipse3DProperties' in repr(self.props))
"""
def test_contains(self):
p = self.props
self.assertTrue('PORO' in p)
@ -33,10 +33,10 @@ class TestProps(unittest.TestCase):
def test_permx_values(self):
def md2si(md):
"""millidarcy->SI"""
#millidarcy->SI
return md * 1e-3 * 9.869233e-13
e3dp = self.props
"""
grid = self.spe3.grid()
permx = e3dp['PERMX']
print('set(PERMX) = %s' % set(permx))
@ -49,9 +49,9 @@ class TestProps(unittest.TestCase):
perm = permx[g_idx]
darcy = darcys[k]
self.assertClose(darcy, perm)
"""
"""
def test_volume(self):
e3dp = self.props
grid = self.spe3.grid()