Merge pull request #338 from simphony/revert-336-revert-331-remove-ma…

…terial-id Revert "Revert "Problem: MATERIAL_ID is removed but simphony depends on it""
simphony · Oct 26, 2016 · 7ddebf6 · 7ddebf6
2 parents 64158ad + 6efd118
commit 7ddebf6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 24 deletions.
diff --git a/simphony/core/cuba.py b/simphony/core/cuba.py
@@ -195,4 +195,3 @@ class CUBA(IntEnum):
     SURFACE_TENSION = 186
     RELAXATION_TIME = 187
     MULTIPHASE_MODEL = 188
-    MATERIAL_ID = 189
diff --git a/simphony/core/keywords.py b/simphony/core/keywords.py
@@ -1141,11 +1141,5 @@
         definition='Multiphase model',  # noqa
         key='MULTIPHASE_MODEL',
         shape=[1],
-        dtype=None),
-    'MATERIAL_ID': Keyword(
-        name='MaterialId',
-        definition='Material identification number',  # noqa
-        key='MATERIAL_ID',
-        shape=[1],
-        dtype=numpy.int32),
+        dtype=None)
 }
diff --git a/simphony/io/tests/test_data_container_table.py b/simphony/io/tests/test_data_container_table.py
@@ -11,14 +11,13 @@
 
 class CustomData(tables.IsDescription):
 
-        name = tables.StringCol(pos=0, itemsize=20)
-        direction = tables.Float64Col(pos=1, shape=3)
-        status = tables.Int32Col(pos=2)
-        label = tables.Int32Col(pos=3)
-        material_id = tables.Int32Col(pos=4)
-        chemical_specie = tables.StringCol(pos=5, itemsize=20)
-        rolling_friction = tables.Float64Col(pos=6)
-        volume_fraction = tables.Float64Col(pos=7)
+    name = tables.StringCol(pos=0, itemsize=20)
+    direction = tables.Float64Col(pos=1, shape=3)
+    status = tables.Int32Col(pos=2)
+    label = tables.Int32Col(pos=3)
+    chemical_specie = tables.StringCol(pos=5, itemsize=20)
+    rolling_friction = tables.Float64Col(pos=6)
+    volume_fraction = tables.Float64Col(pos=7)
 
 
 class CustomRecord(tables.IsDescription):

diff --git a/simphony/io/tests/test_h5_cuds.py b/simphony/io/tests/test_h5_cuds.py
@@ -247,13 +247,14 @@ def test_add_get_dataset_with_cuba_keys_argument(self):
 
         # Add some CUBA data
         for node in reference.iter_nodes():
-            node.data = DataContainer({CUBA.MATERIAL_ID: 1})
+            node.data = DataContainer({CUBA.NAME: 'test_container'})
             expected.update_nodes([node])
-            node.data = DataContainer({CUBA.MATERIAL_ID: 1, CUBA.DENSITY: 2})
+            node.data = DataContainer({CUBA.NAME: 'test_container',
+                                       CUBA.DENSITY: 2})
             reference.update_nodes([node])
 
         # Store reference dataset along with its data
-        engine.add_dataset(reference, {CUDSItem.NODE: [CUBA.MATERIAL_ID]})
+        engine.add_dataset(reference, {CUDSItem.NODE: [CUBA.NAME]})
 
         # Closing and reopening the file
         engine.close()

diff --git a/simphony/io/tests/test_h5_lattice.py b/simphony/io/tests/test_h5_lattice.py
@@ -15,10 +15,8 @@
 
 
 class CustomRecord(tables.IsDescription):
-
     class data(tables.IsDescription):
 
-        material_id = tables.Int32Col(pos=0)
         velocity = tables.Float64Col(pos=1, shape=3)
         density = tables.Float64Col(pos=2)
 
@@ -130,7 +128,7 @@ def container_factory(self, name, primitive_cell, size, origin):
                                     origin, record=CustomRecord)
 
     def supported_cuba(self):
-        return [CUBA.VELOCITY, CUBA.MATERIAL_ID, CUBA.DENSITY]
+        return [CUBA.VELOCITY, CUBA.DENSITY]
 
 
 class TestH5LatticeCustomNodeOperations(
@@ -154,7 +152,7 @@ def container_factory(self, name, primitive_cell, size, origin):
                                     origin, record=CustomRecord)
 
     def supported_cuba(self):
-        return [CUBA.VELOCITY, CUBA.MATERIAL_ID, CUBA.DENSITY]
+        return [CUBA.VELOCITY, CUBA.DENSITY]
 
 
 class TestH5LatticeVersions(unittest.TestCase):

diff --git a/simphony/io/tests/test_indexed_data_container_table.py b/simphony/io/tests/test_indexed_data_container_table.py
@@ -15,7 +15,6 @@ class CustomData(tables.IsDescription):
     direction = tables.Float64Col(pos=1, shape=3)
     status = tables.Int32Col(pos=2)
     label = tables.Int32Col(pos=3)
-    material_id = tables.Int32Col(pos=4)
     chemical_specie = tables.StringCol(pos=5, itemsize=20)
     rolling_friction = tables.Float64Col(pos=6)
     volume_fraction = tables.Float64Col(pos=7)