cad-to-dagmc 0.3.1__py3-none-any.whl → 0.4.0__py3-none-any.whl

_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.3.1'
-__version_tuple__ = version_tuple = (0, 3, 1)
+__version__ = version = '0.4.0'
+__version_tuple__ = version_tuple = (0, 4, 0)

cad_to_dagmc/brep_part_finder.py

@@ -1,39 +1,6 @@
-from turtle import shape
-import warnings
-from collections.abc import Iterable
-from typing import Tuple, Union
-from os import PathLike
-import numpy as np
-from cadquery import *
-from cadquery.occ_impl.shapes import Shape
 import cadquery as cq
 
 
-def get_part_properties_from_shape(shape: Shape) -> dict:
-    """Accepts a cadquery solid object and returns the unique
-    identify details of the solid
-
-    Args:
-        filename: the filename of the brep file
-    """
-
-    part_details = {}
-    part_details["center_x"] = shape.Center().x
-    part_details["center_y"] = shape.Center().y
-    part_details["center_z"] = shape.Center().z
-
-    part_details["volume"] = shape.Volume()
-
-    part_details["bounding_box_xmin"] = shape.BoundingBox().xmin
-    part_details["bounding_box_ymin"] = shape.BoundingBox().ymin
-    part_details["bounding_box_zmin"] = shape.BoundingBox().zmin
-    part_details["bounding_box_xmax"] = shape.BoundingBox().xmax
-    part_details["bounding_box_ymax"] = shape.BoundingBox().ymax
-    part_details["bounding_box_zmax"] = shape.BoundingBox().zmax
-
-    return part_details
-
-
 def convert_shape_to_iterable_of_shapes(shapes):
     if isinstance(shapes, cq.occ_impl.shapes.Compound):
         # brep route
@@ -47,283 +14,24 @@ def convert_shape_to_iterable_of_shapes(shapes):
     return iterable_solids
 
 
-def get_part_properties_from_shapes(shapes: Iterable) -> dict:
-    """Accepts a cadquery.occ_impl.shapes object and returns the unique
-    identify details of each Solid
-
-    Args:
-        filename: the filename of the brep file
-    """
-
-    if not isinstance(shapes, Iterable):
-        iterable_of_shapes = convert_shape_to_iterable_of_shapes(shapes)
-    else:
-        # if a list of workplanes or other shapes is passed (e.g paramak) then
-        # we iterate through the list and convert to solids that have the
-        # expected properties (e.g. .Center.x)
-        iterable_of_shapes = []
-        for shape in shapes:
-            more_shapes = convert_shape_to_iterable_of_shapes(shape)
-            iterable_of_shapes = iterable_of_shapes + more_shapes
-
-    all_part_details = {}
-    for counter, part in enumerate(iterable_of_shapes, 1):
-        part_details = get_part_properties_from_shape(part)
-        all_part_details[counter] = part_details
-
-    return all_part_details
-
-
-def get_part_properties_from_file(filename: Union[str, PathLike]):
-    """Imports a Brep CAD file and returns the unique identify details of each Solid
-
-    Args:
-        filename: the filename of the brep file
-    """
-
-    shapes = Shape.importBrep(filename)
-
-    my_brep_part_details = get_part_properties_from_shapes(shapes)
-
-    return my_brep_part_details
-
-
-def get_matching_part_id(
-    brep_part_properties: dict,
-    center_x: float = None,
-    center_y: float = None,
-    center_z: float = None,
-    volume: float = None,
-    bounding_box_xmin: float = None,
-    bounding_box_ymin: float = None,
-    bounding_box_zmin: float = None,
-    bounding_box_xmax: float = None,
-    bounding_box_ymax: float = None,
-    bounding_box_zmax: float = None,
-    volume_atol: float = 1e-6,
-    center_atol: float = 1e-6,
-    bounding_box_atol: float = 1e-6,
-    verbose=True,
-):
-    """Finds the key within a dictionary of parts that matches the user
-    specified arguments for volume, center, bounding_box within the provided
-    tolerances
-
-    Arguments:
-        brep_part_properties: a dictionary with the part id number as the key
-            and a dictionary of values for the part properties. For example
-            {1: {'Center.x':0, 'Center.y':0, 'Center.z':0, 'Volume':10, ....}}
-        volume: the volume of the part to find.
-        center: a tuple of x,y,z coordinates
-        bounding_box: a tuple of two coordinates where the coordinates are the
-            lower left and upper right corners of the bounding box.
-        volume_atol: absolute tolerance acceptable on the volume comparison
-        center_atol: absolute tolerance acceptable on the center comparison
-        bounding_box_atol: absolute tolerance acceptable on the bounding box comparison
-    """
-
-    part_ids_matching = {}
-
-    properties = [
-        center_x,
-        center_y,
-        center_z,
-        volume,
-        bounding_box_xmin,
-        bounding_box_ymin,
-        bounding_box_zmin,
-        bounding_box_xmax,
-        bounding_box_ymax,
-        bounding_box_zmax,
-    ]
-    properties_names = [
-        "center_x",
-        "center_y",
-        "center_z",
-        "volume",
-        "bounding_box_xmin",
-        "bounding_box_ymin",
-        "bounding_box_zmin",
-        "bounding_box_xmax",
-        "bounding_box_ymax",
-        "bounding_box_zmax",
-    ]
-    tolerances = [
-        center_atol,
-        center_atol,
-        center_atol,
-        volume_atol,
-        bounding_box_atol,
-        bounding_box_atol,
-        bounding_box_atol,
-        bounding_box_atol,
-        bounding_box_atol,
-        bounding_box_atol,
-    ]
-    if verbose:
-        print(f"checking new shape against {len(brep_part_properties)} parts")
-    for i, (property, names, tolerance) in enumerate(
-        zip(properties, properties_names, tolerances)
-    ):
-        if verbose:
-            print(f"    checking shape against brep part {i+1}")
-        if property is not None:
-            part_ids_matching_property = []
-            for key, value in brep_part_properties.items():
-                if np.isclose(value[names], property, atol=tolerance):
-                    part_ids_matching_property.append(key)
-            if len(part_ids_matching_property) == 0:
-                warnings.warn(
-                    f"No parts matching the specified {names} +/- tolerances were found"
-                )
-            else:
-                part_ids_matching[names] = part_ids_matching_property
-
-    lists_of_matching_parts_separate = list(part_ids_matching.values())
-
-    if verbose:
-        if lists_of_matching_parts_separate == []:
-            warnings.warn("No single part found that matches all criteria")
-            print("search criteria are:")
-            print(" volume", volume)
-            print(" center_x", center_x)
-            print(" center_y", center_y)
-            print(" center_z", center_z)
-            print(" bounding_box_xmin", bounding_box_xmin)
-            print(" bounding_box_ymin", bounding_box_ymin)
-            print(" bounding_box_zmin", bounding_box_zmin)
-            print(" bounding_box_xmax", bounding_box_xmax)
-            print(" bounding_box_ymax", bounding_box_ymax)
-            print(" bounding_box_zmax", bounding_box_zmax)
-            print(" with tolerances")
-            print("  volume_atol", volume_atol)
-            print("  center_atol", center_atol)
-            print("  bounding_box_atol", bounding_box_atol)
-            print("\nbrep criteria are:")
-            for key, value in brep_part_properties.items():
-                print(f"    {key}")
-                for key2, value2 in value.items():
-                    print(f"        {key2}, {value2}")
-
-    if lists_of_matching_parts_separate == []:
-        raise ValueError("No matching part found")
-
-    lists_of_matching_parts = list(
-        set.intersection(*map(set, lists_of_matching_parts_separate))
-    )
-
-    if verbose:
-        if len(lists_of_matching_parts) == 0:
-            warnings.warn("No single part found that matches all criteria")
-            print("search criteria are:")
-            print(" volume", volume)
-            print(" center_x", center_x)
-            print(" center_y", center_y)
-            print(" center_z", center_z)
-            print(" bounding_box_xmin", bounding_box_xmin)
-            print(" bounding_box_ymin", bounding_box_ymin)
-            print(" bounding_box_zmin", bounding_box_zmin)
-            print(" bounding_box_xmax", bounding_box_xmax)
-            print(" bounding_box_ymax", bounding_box_ymax)
-            print(" bounding_box_zmax", bounding_box_zmax)
-            print(" with tolerances")
-            print("  volume_atol", volume_atol)
-            print("  center_atol", center_atol)
-            print("  bounding_box_atol", bounding_box_atol)
-            print("\nbrep criteria are:")
-            for key, value in brep_part_properties.items():
-                print(f"    {key}")
-                for key2, value2 in value.items():
-                    print(f"        {key2}, {value2}")
-
-    return lists_of_matching_parts
-
-
-def get_matching_part_ids(
-    brep_part_properties: dict,
-    shape_properties: dict,
-    volume_atol: float = 1e-6,
-    center_atol: float = 1e-6,
-    bounding_box_atol: float = 1e-6,
-    verbose=True,
-):
-    """finds the brep id that matches the shape ids and returns a list of tuples
-    where the first tuple is the shape part id and the second tuple is the brep
-    id"""
-
-    brep_and_shape_part_id = []
-    remaining_shape_ids = []
-    for shape_id, value in shape_properties.items():
-        if isinstance(value, dict):
-            # check if value is a list of dictionaries or a dictionary
-            matching_part_id = get_matching_part_id(
-                brep_part_properties=brep_part_properties,
-                volume_atol=volume_atol,
-                center_atol=center_atol,
-                bounding_box_atol=bounding_box_atol,
-                **value,
-            )
-            # if len(matching_part_id) == 0:
-            # nothing found, recheck
-            if len(matching_part_id) > 1:
-                raise ValueError(f"multiple matching volumes were found for {shape_id}")
-            if len(matching_part_id) == 1:
-                if verbose:
-                    print(
-                        f"    single matching pair, brep id = {matching_part_id[0]} shape id = {shape_id}"
-                    )
-                brep_and_shape_part_id.append((matching_part_id[0], shape_id))
-                # print()
-                brep_part_properties.pop(matching_part_id[0])
-            # todo check that key is not already in use
-
-            else:
-                remaining_shape_ids.append(shape_id)
-
-        else:
-            msg = "shape_properties must be a dictionary of dictionaries"
-            raise ValueError(msg)
-
-    if verbose:
-        print(
-            f"remaining brep ids that were not matched = {brep_part_properties.keys()}"
-        )
-
-    if len(brep_part_properties.keys()) == 1:
-        if len(remaining_shape_ids) == 1:
-            value = shape_properties[remaining_shape_ids[0]]
-
-            # removing bounding box check as a last resort.
-            # The bounding box for cad is not as robust as the other checks
-            # Therefore in the case where just a single volume remains we
-            # check the volume and the center of mass but skip the bb check
-            value.pop("bounding_box_xmin")
-            value.pop("bounding_box_ymin")
-            value.pop("bounding_box_zmin")
-            value.pop("bounding_box_xmax")
-            value.pop("bounding_box_ymax")
-            value.pop("bounding_box_zmax")
-
-            matching_part_id = get_matching_part_id(
-                brep_part_properties=brep_part_properties,
-                volume_atol=volume_atol,
-                center_atol=center_atol,
-                bounding_box_atol=None,
-                **value,
-            )
-
-            if verbose:
-                print("matching_part_id", matching_part_id)
+def get_ids_from_assembly(assembly):
+    ids = []
+    for obj, name, loc, _ in assembly:
+        ids.append(name)
+    return ids
 
-            remaining_brep_id = list(brep_part_properties.keys())[0]
-            remaining_shape_id = remaining_shape_ids[0]
 
-            if verbose:
-                print(
-                    f"assigning brep id of {remaining_brep_id} to shape id of {remaining_shape_id} based on volume and center of mass check (bb check skipped)"
-                )
-            brep_and_shape_part_id.append((remaining_brep_id, remaining_shape_id))
+def get_ids_from_imprinted_assembly(solid_id_dict):
+    ids = []
+    for id in list(solid_id_dict.values()):
+        print(id[0])
+        ids.append(id[0])
+    return ids
 
-    brep_and_shape_part_id = sorted(brep_and_shape_part_id, key=lambda x: x[0])
 
-    return brep_and_shape_part_id
+def order_material_ids_by_brep_order(original_ids, scrambled_id, material_tags):
+    material_tags_in_brep_order = []
+    for brep_id in scrambled_id:
+        id_of_solid_in_org = original_ids.index(brep_id)
+        material_tags_in_brep_order.append(material_tags[id_of_solid_in_org])
+    return material_tags_in_brep_order

cad_to_dagmc/brep_to_h5m.py

@@ -4,50 +4,8 @@ from .vertices_to_h5m import vertices_to_h5m
 import typing
 
 
-def brep_to_h5m(
-    brep_filename: str,
-    material_tags: typing.Iterable[str],
-    h5m_filename: str = "dagmc.h5m",
-    min_mesh_size: float = 30,
-    max_mesh_size: float = 10,
-    mesh_algorithm: int = 1,
-) -> str:
-    """Converts a Brep file into a DAGMC h5m file. This makes use of Gmsh and
-    will therefore need to have Gmsh installed to work.
-
-    Args:
-        brep_filename: the filename of the Brep file to convert
-        material_tags: A list of material tags to tag the DAGMC volumes with.
-            Should be in the same order as the volumes
-        h5m_filename: the filename of the DAGMC h5m file to write
-        min_mesh_size: the minimum mesh element size to use in Gmsh. Passed
-            into gmsh.option.setNumber("Mesh.MeshSizeMin", min_mesh_size)
-        max_mesh_size: the maximum mesh element size to use in Gmsh. Passed
-            into gmsh.option.setNumber("Mesh.MeshSizeMax", max_mesh_size)
-        mesh_algorithm: The Gmsh mesh algorithm number to use. Passed into
-            gmsh.option.setNumber("Mesh.Algorithm", mesh_algorithm)
-    Returns:
-        The filename of the h5m file produced
-    """
-
-    gmsh, volumes = mesh_brep(
-        brep_filename=brep_filename,
-        min_mesh_size=min_mesh_size,
-        max_mesh_size=max_mesh_size,
-        mesh_algorithm=mesh_algorithm,
-    )
-
-    h5m_filename = mesh_to_h5m_in_memory_method(
-        volumes=volumes,
-        material_tags=material_tags,
-        h5m_filename=h5m_filename,
-    )
-
-    return h5m_filename
-
-
 def mesh_brep(
-    brep_filename: str,
+    brep_object: str,
     min_mesh_size: float = 30,
     max_mesh_size: float = 10,
     mesh_algorithm: int = 1,
@@ -56,7 +14,7 @@ def mesh_brep(
     Gmsh.
 
     Args:
-        brep_filename: the filename of the Brep file to convert
+        brep_object: the filename of the Brep file to convert
         min_mesh_size: the minimum mesh element size to use in Gmsh. Passed
             into gmsh.option.setNumber("Mesh.MeshSizeMin", min_mesh_size)
         max_mesh_size: the maximum mesh element size to use in Gmsh. Passed
@@ -68,14 +26,11 @@ def mesh_brep(
         The gmsh object and volumes in Brep file
     """
 
-    if not Path(brep_filename).is_file():
-        msg = f"The specified brep ({brep_filename}) file was not found"
-        raise FileNotFoundError(msg)
-
     gmsh.initialize()
     gmsh.option.setNumber("General.Terminal", 1)
     gmsh.model.add("made_with_brep_to_h5m_package")
-    volumes = gmsh.model.occ.importShapes(brep_filename)
+    volumes = gmsh.model.occ.importShapesNativePointer(brep_object)
+    # gmsh.model.occ.importShapes(brep_object)
     gmsh.model.occ.synchronize()
 
     gmsh.option.setNumber("Mesh.Algorithm", mesh_algorithm)
@@ -155,11 +110,9 @@ def mesh_to_h5m_in_memory_method(
     gmsh.finalize()
 
     # checks and fixes triangle fix_normals within vertices_to_h5m
-    vertices_to_h5m(
+    return vertices_to_h5m(
         vertices=GroupedCoords,
         triangles=nodes_in_each_pg,
         material_tags=material_tags,
         h5m_filename=h5m_filename,
     )
-
-    return h5m_filename

cad_to_dagmc/core.py

@@ -1,22 +1,22 @@
-from tempfile import mkstemp
-
 import typing
 from cadquery import importers
-from cadquery import Assembly
-from OCP.GCPnts import GCPnts_QuasiUniformDeflection
+
+# from cadquery import Assembly
+# from OCP.GCPnts import GCPnts_QuasiUniformDeflection
 
 # from cadquery.occ_impl import shapes
 import OCP
 import cadquery as cq
-from OCP.TopLoc import TopLoc_Location
-from OCP.BRep import BRep_Tool
-from OCP.TopAbs import TopAbs_Orientation
 
-from .brep_to_h5m import brep_to_h5m
+# from OCP.TopLoc import TopLoc_Location
+# from OCP.BRep import BRep_Tool
+# from OCP.TopAbs import TopAbs_Orientation
+
+from .brep_to_h5m import mesh_brep, mesh_to_h5m_in_memory_method
 from .brep_part_finder import (
-    get_part_properties_from_shapes,
-    get_part_properties_from_shapes,
-    get_matching_part_ids,
+    get_ids_from_assembly,
+    get_ids_from_imprinted_assembly,
+    order_material_ids_by_brep_order,
 )
 
 
@@ -45,7 +45,7 @@ class CadToDagmc:
                 Useful when converting the geometry to cm for use in neutronics
                 simulations.
         """
-
+        print(f"loading stp file {filename}")
         part = importers.importStep(str(filename)).val()
 
         if scale_factor == 1:
@@ -94,71 +94,78 @@ class CadToDagmc:
         filename: str = "dagmc.h5m",
         min_mesh_size: float = 1,
         max_mesh_size: float = 10,
-        verbose: bool = False,
-        volume_atol: float = 0.000001,
-        center_atol: float = 0.000001,
-        bounding_box_atol: float = 0.000001,
+        mesh_algorithm: int = 1,
     ):
-        brep_shape = self._merge_surfaces()
-
-        tmp_brep_filename = mkstemp(suffix=".brep", prefix="paramak_")[1]
-        brep_shape.exportBrep(tmp_brep_filename)
-
-        if verbose:
-            print(f"Brep file saved to {tmp_brep_filename}")
-
-        brep_file_part_properties = get_part_properties_from_shapes(brep_shape)
+        assembly = cq.Assembly()
+        for part in self.parts:
+            assembly.add(part)
+
+        (
+            imprinted_assembly,
+            imprinted_solids_with_original_id,
+        ) = cq.occ_impl.assembly.imprint(assembly)
+
+        original_ids = get_ids_from_assembly(assembly)
+        scrambled_ids = get_ids_from_imprinted_assembly(
+            imprinted_solids_with_original_id
+        )
 
-        shape_properties = get_part_properties_from_shapes(self.parts)
+        # both id lists should be the same length as each other and the same
+        # length as the self.material_tags
 
-        brep_and_shape_part_ids = get_matching_part_ids(
-            brep_part_properties=brep_file_part_properties,
-            shape_properties=shape_properties,
-            volume_atol=volume_atol,
-            center_atol=center_atol,
-            bounding_box_atol=bounding_box_atol,
+        material_tags_in_brep_order = order_material_ids_by_brep_order(
+            original_ids, scrambled_ids, self.material_tags
         )
 
-        material_tags_in_brep_order = []
-        for brep_id, shape_id in brep_and_shape_part_ids:
-            material_tags_in_brep_order.append(self.material_tags[shape_id - 1])
+        gmsh, volumes = mesh_brep(
+            brep_object=imprinted_assembly.wrapped._address(),
+            min_mesh_size=min_mesh_size,
+            max_mesh_size=max_mesh_size,
+            mesh_algorithm=mesh_algorithm,
+        )
 
-        brep_to_h5m(
-            brep_filename=tmp_brep_filename,
+        h5m_filename = mesh_to_h5m_in_memory_method(
+            volumes=volumes,
             material_tags=material_tags_in_brep_order,
             h5m_filename=filename,
-            min_mesh_size=min_mesh_size,
-            max_mesh_size=max_mesh_size,
         )
+        return h5m_filename
 
-    def _merge_surfaces(self):
-        """Merges surfaces in the geometry that are the same. More details on
-        the merging process in the DAGMC docs
-        https://svalinn.github.io/DAGMC/usersguide/cubit_basics.html"""
 
-        # solids = geometry.Solids()
+def merge_surfaces(parts):
+    """Merges surfaces in the geometry that are the same. More details on
+    the merging process in the DAGMC docs
+    https://svalinn.github.io/DAGMC/usersguide/cubit_basics.html"""
 
-        bldr = OCP.BOPAlgo.BOPAlgo_Splitter()
+    # solids = geometry.Solids()
 
-        if len(self.parts) == 1:
-            # merged_solid = cq.Compound(solids)
-            return self.parts[0]
+    bldr = OCP.BOPAlgo.BOPAlgo_Splitter()
 
-        for solid in self.parts:
-            # checks if solid is a compound as .val() is not needed for compounds
-            if isinstance(
-                solid, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)
-            ):
-                bldr.AddArgument(solid.wrapped)
-            else:
-                bldr.AddArgument(solid.val().wrapped)
+    if len(parts) == 1:
+        # merged_solid = cq.Compound(solids)
+
+        if isinstance(
+            parts[0], (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)
+        ):
+            # stp file
+            return parts[0], parts[0].wrapped
+        else:
+            return parts[0], parts[0].toOCC()
+
+    # else:
+    for solid in parts:
+        # checks if solid is a compound as .val() is not needed for compounds
+        if isinstance(solid, (cq.occ_impl.shapes.Compound, cq.occ_impl.shapes.Solid)):
+            bldr.AddArgument(solid.wrapped)
+        else:
+            bldr.AddArgument(solid.val().wrapped)
 
-        bldr.SetNonDestructive(True)
+    bldr.SetNonDestructive(True)
 
-        bldr.Perform()
+    bldr.Perform()
 
-        bldr.Images()
+    bldr.Images()
 
-        merged_solid = cq.Compound(bldr.Shape())
+    merged_solid = cq.Compound(bldr.Shape())
 
-        return merged_solid
+    return merged_solid, merged_solid.wrapped

cad_to_dagmc/vertices_to_h5m.py

@@ -207,3 +207,5 @@ def vertices_to_h5m(
     moab_core.add_entities(file_set, all_sets)
 
     moab_core.write_file(h5m_filename)
+
+    return h5m_filename

cad_to_dagmc-0.4.0.dist-info/METADATA

@@ -0,0 +1,114 @@
+Metadata-Version: 2.1
+Name: cad-to-dagmc
+Version: 0.4.0
+Summary: Converts CAD files to a DAGMC h5m file
+Author-email: Jonathan Shimwell <mail@jshimwell.com>
+Project-URL: Homepage, https://github.com/fusion-energy/cad_to_dagmc
+Project-URL: Bug Tracker, https://github.com/fusion-energy/cad_to_dagmc/issues
+Keywords: dagmc,geometry,plot,slice
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: trimesh
+Requires-Dist: networkx
+Provides-Extra: tests
+Requires-Dist: pytest ; extra == 'tests'
+
+
+[![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
+
+[![CI with install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml)
+
+[![Upload Python Package](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml)
+
+
+[![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
+
+___
+
+A minimal package that uses CadQuery functionality to convert Cad geometry to [DAGMC](https://github.com/svalinn/DAGMC/) h5m files
+
+This particular method of producing DAGMC compatible h5m files from CAD geometry
+is intended to convert STP files or [CadQuery](https://cadquery.readthedocs.io) objects to h5m file.
+
+One unique feature of this package is the ability to combine STP files with CadQuery objects.
+This allows for the addition of parametric geometry to static geometry.
+
+# Installation
+
+In principle, any Conda distribution will work. 
+
+
+# Install using Conda and pip
+
+This example uses Conda to install some dependencies that are not available via PyPi.
+
+Create a new conda environment
+```bash
+conda create --name new_env python=3.9 -y
+```
+
+Activate the environment
+```bash
+conda activate new_env
+```
+
+Install the dependencies
+```bash
+conda install -c conda-forge moab multimethod typish ezdxf nptyping nlopt casadi gmsh python-gmsh ocp>=7.7.1 -y
+conda install -c cadquery -c conda-forge cadquery=master --no-deps -y
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others [link to DAGMC documentation](https://svalinn.github.io/DAGMC/).You can run ```conda install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
+```bash
+conda install -c conda-forge -y "openmc=0.13.3=dagmc*nompi*"
+```
+
+
+# Install using Mamba and pip
+
+This example uses Mamba to install some dependencies that are not available via PyPi.
+
+Create a new conda environment, I've chosen Python 3.9 here but new versions are
+also supported.
+```bash
+conda create --name new_env python=3.9 -y
+```
+
+Activate the environment
+```bash
+mamba activate new_env
+```
+
+Install the dependencies
+```bash
+conda install -c conda-forge mamba -y
+mamba install -c conda-forge moab multimethod typish ezdxf nptyping nlopt casadi gmsh python-gmsh ocp>=7.7.1 -y
+mamba install -c cadquery -c conda-forge cadquery=master --no-deps -y
+```
+
+Then you can install the cad_to_dagmc package with ```pip```
+```bash
+pip install cad_to_dagmc
+```
+
+You may also want to install OpenMC with DAGMC to make use of the h5m geometry files produced in simulations. However you could also use other supported particle transport codes such as MCNP, FLUKA and others [link to DAGMC documentation](https://svalinn.github.io/DAGMC/).You can run ```conda install -c conda-forge openmc``` however this more specific command makes sure the latest version of OpenMC which contains DAGMC is chosen by conda / mamba
+```bash
+mamba install -c conda-forge -y "openmc=0.13.3=dagmc*nompi*"
+```
+
+# Usage - creation of DAGMC h5m files
+
+For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)
+
+# Usage - simulation with transport code
+
+For examples see the CAD tasks in the [neutronics-workshop](https://github.com/fusion-energy/neutronics-workshop)

cad_to_dagmc-0.4.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+_version.py,sha256=QiCQVGOicQZY3DBr4tYPU9egzT1VgzOJGfLt9Q26uyU,160
+cad_to_dagmc/__init__.py,sha256=PgkpCP8unzhcoyvw-lKpy5HLy2bnUNmFHS508_bsCCE,593
+cad_to_dagmc/brep_part_finder.py,sha256=by2wnjo_KrTZaihFP5m5Z_sZJSdtEef7GS4nvpwqNrc,1020
+cad_to_dagmc/brep_to_h5m.py,sha256=4w7xaO0uJU5c8PoQFtDoPUyzWart7pdSpynU1Rcv7xY,4107
+cad_to_dagmc/core.py,sha256=XNXmEn06VellMwEqTXiCKRLVPN7NRDG3X0OQZXM2cOE,5594
+cad_to_dagmc/vertices_to_h5m.py,sha256=h7KI2fofhBlyTMRdb0FXUO12SxW9MtnNEgwdCyNCPmk,5997
+cad_to_dagmc-0.4.0.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.4.0.dist-info/METADATA,sha256=9iMhi-El25ZzKZL1sKTQqwDQO5t2zd-8DEA5-acacgA,4545
+cad_to_dagmc-0.4.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+cad_to_dagmc-0.4.0.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.4.0.dist-info/RECORD,,

cad_to_dagmc-0.3.1.dist-info/METADATA

@@ -1,95 +0,0 @@
-Metadata-Version: 2.1
-Name: cad-to-dagmc
-Version: 0.3.1
-Summary: Converts CAD files to a DAGMC h5m file
-Author-email: Jonathan Shimwell <mail@jshimwell.com>
-Project-URL: Homepage, https://github.com/fusion-energy/cad_to_dagmc
-Project-URL: Bug Tracker, https://github.com/fusion-energy/cad_to_dagmc/issues
-Keywords: dagmc,geometry,plot,slice
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: cadquery (>=2.2.0)
-Requires-Dist: trimesh
-Requires-Dist: networkx
-Provides-Extra: tests
-Requires-Dist: pytest ; extra == 'tests'
-Requires-Dist: openmc-data-downloader ; extra == 'tests'
-
-
-[![N|Python](https://www.python.org/static/community_logos/python-powered-w-100x40.png)](https://www.python.org)
-
-[![CI with install](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/ci_with_install.yml)
-
-[![Upload Python Package](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml/badge.svg)](https://github.com/fusion-energy/cad_to_dagmc/actions/workflows/python-publish.yml)
-
-
-[![conda-publish](https://anaconda.org/fusion-energy/cad_to_dagmc/badges/version.svg)](https://anaconda.org/fusion-energy/cad_to_dagmc)
-[![PyPI](https://img.shields.io/pypi/v/cad_to_dagmc?color=brightgreen&label=pypi&logo=grebrightgreenen&logoColor=green)](https://pypi.org/project/cad_to_dagmc/)
-
-___
-
-A minimal package that uses CadQuery functionality to convert Cad geometry to DAGMC h5m files
-
-This particular method of producing DAGMC compatible h5m files from CAD geometry
-is intended to convert STP files or [CadQuery](https://cadquery.readthedocs.io) objects to h5m file.
-
-One unique feature of this package is the ability to combine STP files with CadQuery objects.
-This allows for the addition of parametric geometry to static geometry.
-
-# Install (Conda)
-
-Creates a new empty Conda environment and activate it
-```bash
-conda create --name new_env python=3.9
-conda activate new_env
-```
-
-Installs cad_to_dagmc and dependencies
-```bash
-conda install -c fusion-energy -c cadquery -c conda-forge cad_to_dagmc
-```
-# Install (Mamba)
-
-Creates a new empty Conda environment and activate it
-```bash
-conda create --name new_env python=3.9
-conda activate new_env
-```
-
-Installs Mamba
-```bash
-conda install -c conda-forge mamba
-```
-
-Installs cad_to_dagmc and dependencies
-```bash
-mamba install -c fusion-energy -c cadquery -c conda-forge cad_to_dagmc
-```
-
-# Install (Conda + pip)
-
-You will need to install some dependencies that are not available via PyPi.
-This example uses Conda but Mamba could also be used.
-```bash
-conda install -c conda-forge moab
-conda install -c conda-forge gmsh
-conda install -c conda-forge python-gmsh
-```
-
-Then you can install the cad_to_dagmc package with ```pip```
-
-```bash
-pip install cad_to_dagmc
-```
-
-# Usage
-
-To use the h5m geometry you will need a transport code with DAGMC enabled such as OpenMC.
-Just to note that currently the conda install for CadQuery and OpenMC can't be installed in the same conda environment.
-A work around for this is to create the h5m geometry in one conda environment and simulate with OpenMC in another conda environment.
-
-For examples see the [examples folder](https://github.com/fusion-energy/cad_to_dagmc/tree/main/examples)

cad_to_dagmc-0.3.1.dist-info/RECORD

@@ -1,11 +0,0 @@
-_version.py,sha256=NpX2iZJQYVxuIsKBfyjQghJWMvGYxwOlfWJ3M_xOU7s,160
-cad_to_dagmc/__init__.py,sha256=PgkpCP8unzhcoyvw-lKpy5HLy2bnUNmFHS508_bsCCE,593
-cad_to_dagmc/brep_part_finder.py,sha256=XNxCbVqlnDokFmUpFaCd_Zi_DoG9XxF0jVezv4MrGUE,11973
-cad_to_dagmc/brep_to_h5m.py,sha256=0m-TLfRldc3p60f96-0J9WeOaa-z3ba4acZJ4KgKvmw,5730
-cad_to_dagmc/core.py,sha256=oj9Ol3-Y7tzC4No2FqelPCH8PzKYKVAbkMoO7f1Ot-w,5547
-cad_to_dagmc/vertices_to_h5m.py,sha256=gJImjUvHzCWe0tHckHs4BRa4kbaVM2aYWDZGRgzPQng,5972
-cad_to_dagmc-0.3.1.dist-info/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.3.1.dist-info/METADATA,sha256=XIopZBD9DVbP44VAdxeeOgGZNKQQ3Xa--w2Tml9rUb8,3485
-cad_to_dagmc-0.3.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-cad_to_dagmc-0.3.1.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.3.1.dist-info/RECORD,,