properties.py: removed class EclipseGrid.

python/python/opm/io/parser/properties.py

@@ -13,9 +13,6 @@ class EclipseState(object):
     def props(self):
         return Eclipse3DProperties(self._props())
 
-    def grid(self):
-        return EclipseGrid(self._grid())
-
     @property
     def table(self):
         return Tables(self._tables())
@@ -64,39 +61,6 @@ class Tables(object):
         return t_eval
 
 
-
-@delegate(lib.EclipseGrid)
-class EclipseGrid(object):
-
-    def getNX(self):
-        return self._getXYZ()[0]
-    def getNY(self):
-        return self._getXYZ()[1]
-    def getNZ(self):
-        return self._getXYZ()[2]
-
-    def getCellVolume(self, global_idx=None, i_idx=None, j_idx=None, k_idx=None):
-        if global_idx is not None:
-            if set([i_idx, j_idx, k_idx]) != set([None]):
-                raise ValueError('Specify exactly one of global and all three i,j,k.')
-            return self._cellVolume1G(global_idx)
-        if None in [i_idx, j_idx, k_idx]:
-            raise ValueError('If not global_idx, need all three of i_idx, j_idx, and k_idx.')
-        return self._cellVolume3(i_idx, j_idx, k_idx)
-
-    def eclGrid(self):
-        return self._ecl_grid_ptr()
-
-    def __repr__(self):
-        x,y,z = self._getXYZ()
-        g = self.cartesianSize()
-        na = self.nactive()
-        cnt = '(%d, %d, %d)' % (x,y,z)
-        if na != g:
-            cnt += ', active = %s' % na
-        return 'EclipseGrid(%s)' % cnt
-
-
 @delegate(lib.SunbeamState)
 class SunbeamState(object):
 

python/tests/test_parse.py

@@ -64,10 +64,11 @@ FIPNUM
     def test_parse_norne(self):
          state = opm.io.parse(self.norne_fname, recovery=[('PARSE_RANDOM_SLASH', opm.io.action.ignore)])
          es = state.state
+         """
          self.assertEqual(46, es.grid().getNX())
          self.assertEqual(112, es.grid().getNY())
          self.assertEqual(22, es.grid().getNZ())
-
+         """
 
 if __name__ == "__main__":
     unittest.main()

python/tests/test_props.py

@@ -36,6 +36,7 @@ class TestProps(unittest.TestCase):
             """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))
@@ -48,7 +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()
@@ -61,7 +64,7 @@ class TestProps(unittest.TestCase):
                     if k == 0:
                         self.assertClose(exp, grid.getCellVolume(g_idx))
                     self.assertEqual(grid.getCellVolume(g_idx), grid.getCellVolume(None, i, j, k))
-
+    """
 
 if __name__ == "__main__":
     unittest.main()

python/tests/test_state.py

@@ -61,6 +61,7 @@ SATNUM
     def test_state_nnc(self):
         self.assertFalse(self.state.has_input_nnc())
 
+    """
     def test_grid(self):
         grid = self.state.grid()
         self.assertTrue('EclipseGrid' in repr(grid))
@@ -72,6 +73,7 @@ SATNUM
         g,i,j,k = 295,7,5,3
         self.assertEqual(g, grid.globalIndex(i,j,k))
         self.assertEqual((i,j,k), grid.getIJK(g))
+    """
 
     def test_summary(self):
         smry = self.spe3.summary_config