Added material names via a different physical group

Author: jmwright

.github/workflows/tests.yml

@@ -40,5 +40,6 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install .[dev]
+          python -m pip install --upgrade git+https://github.com/CadQuery/cadquery.git
       - name: Run tests
         run: python -m pytest -v

assembly_mesh_plugin/plugin.py

@@ -221,14 +221,14 @@ def get_gmsh(self, imprint=True):
     for volume_id in volumes.keys():
         gmsh.model.occ.synchronize()
 
-        # Include the material name, if present
+        # Attach the name to the volume
         ps = gmsh.model.addPhysicalGroup(3, volumes[volume_id][0])
+        gmsh.model.setPhysicalName(3, ps, f"{volume_map[volume_id]}")
 
-        # See if we need to include the material name as part of the physical volume name
-        volume_name = f"{volume_map[volume_id]}"
+        # Attach the material to the volume, if the material is present
         if len(solid_materials) >= volume_id:
-            volume_name = f"{volume_map[volume_id]}~{solid_materials[volume_id - 1]}"
-        gmsh.model.setPhysicalName(3, ps, volume_name)
+            ps1 = gmsh.model.addPhysicalGroup(3, volumes[volume_id][0])
+            gmsh.model.setPhysicalName(3, ps1, f"mat:{solid_materials[volume_id - 1]}")
 
     # Handle tagged surface groups
     for t_name, surf_group in surface_groups.items():

tests/test_meshes.py

@@ -196,9 +196,13 @@ def test_mesh_materials():
 
     # Make sure we got the correct names
     name = gmsh.model.getPhysicalName(3, 1)
-    assert name == "cube_1~copper"
+    assert name == "cube_1"
     name = gmsh.model.getPhysicalName(3, 2)
-    assert name == "cube_2~steel"
+    assert name == "mat:copper"
+    name = gmsh.model.getPhysicalName(3, 3)
+    assert name == "cube_2"
+    name = gmsh.model.getPhysicalName(3, 4)
+    assert name == "mat:steel"
 
     #
     # Non-imprinted assembly
@@ -210,6 +214,10 @@ def test_mesh_materials():
 
     # Make sure we got the correct names
     name = gmsh.model.getPhysicalName(3, 1)
-    assert name == "cube_1~copper"
+    assert name == "cube_1"
     name = gmsh.model.getPhysicalName(3, 2)
-    assert name == "cube_2~steel"
+    assert name == "mat:copper"
+    name = gmsh.model.getPhysicalName(3, 3)
+    assert name == "cube_2"
+    name = gmsh.model.getPhysicalName(3, 4)
+    assert name == "mat:steel"