cad-to-dagmc 0.9.5__py3-none-any.whl → 0.9.7__py3-none-any.whl

_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.9.5'
-__version_tuple__ = version_tuple = (0, 9, 5)
+__version__ = version = '0.9.7'
+__version_tuple__ = version_tuple = (0, 9, 7)
 
 __commit_id__ = commit_id = None

cad_to_dagmc/core.py

@@ -687,6 +687,7 @@ class CadToDagmc:
             assembly.add(part)
 
         if imprint:
+            print("Imprinting assembly for unstructured mesh generation")
             imprinted_assembly, _ = cq.occ_impl.assembly.imprint(assembly)
         else:
             imprinted_assembly = assembly
@@ -777,6 +778,7 @@ class CadToDagmc:
             assembly.add(part)
 
         if imprint:
+            print("Imprinting assembly for mesh generation")
             imprinted_assembly, _ = cq.occ_impl.assembly.imprint(assembly)
         else:
             imprinted_assembly = assembly
@@ -853,21 +855,32 @@ class CadToDagmc:
             ValueError: If invalid parameter combinations are used.
         """
 
+        # Define all acceptable kwargs
+        cadquery_keys = {"tolerance", "angular_tolerance"}
+        gmsh_keys = {
+            "min_mesh_size",
+            "max_mesh_size",
+            "mesh_algorithm",
+            "set_size",
+            "umesh_filename",
+            "method",
+            "unstructured_volumes",
+        }
+        all_acceptable_keys = cadquery_keys | gmsh_keys | {"meshing_backend"}
+
+        # Check for invalid kwargs
+        invalid_keys = set(kwargs.keys()) - all_acceptable_keys
+        if invalid_keys:
+            raise ValueError(
+                f"Invalid keyword arguments: {sorted(invalid_keys)}\n"
+                f"Acceptable arguments are: {sorted(all_acceptable_keys)}"
+            )
+
         # Handle meshing_backend - either from kwargs or auto-detect
         meshing_backend = kwargs.pop("meshing_backend", None)
 
         if meshing_backend is None:
             # Auto-select meshing_backend based on kwargs
-            cadquery_keys = {"tolerance", "angular_tolerance"}
-            gmsh_keys = {
-                "min_mesh_size",
-                "max_mesh_size",
-                "mesh_algorithm",
-                "set_size",
-                "umesh_filename",
-                "method",
-                "unstructured_volumes",
-            }
             has_cadquery = any(key in kwargs for key in cadquery_keys)
             has_gmsh = any(key in kwargs for key in gmsh_keys)
             if has_cadquery and not has_gmsh:
@@ -1002,6 +1015,7 @@ class CadToDagmc:
         elif meshing_backend == "gmsh":
             # If assembly is not to be imprinted, pass through the assembly as-is
             if imprint:
+                print("Imprinting assembly for mesh generation")
                 imprinted_assembly, imprinted_solids_with_org_id = cq.occ_impl.assembly.imprint(
                     assembly
                 )

cad_to_dagmc/direct_mesh_plugin.py

@@ -291,6 +291,7 @@ def to_mesh(
     # Imprinted assemblies end up being compounds, whereas you have to step through each of the
     # parts in an assembly and extract the solids.
     if imprint:
+        print("Imprinting assembly for mesh generation")
         # Imprint the assembly and process it as a compound
         (
             imprinted_assembly,
@@ -329,6 +330,7 @@ def to_mesh(
 
     # Step through all of the collected solids and their respective faces to get the vertices
     for solid in solids:
+        print(f"Meshing solid {solid_idx} of {len(solids)}")
         # Reset this each time so that we get the correct number of faces per solid
         face_triangles = {}
 

{cad_to_dagmc-0.9.5.dist-info → cad_to_dagmc-0.9.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.5
+Version: 0.9.7
 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
@@ -50,7 +50,7 @@ cad-to-dagmc can convert the following in to DAGMC compatible meshes:
 
 Cad-to-dagmc offers a wide range of features including.
 - Geometry scaling with ```scale_factor``` argument
-- Ddirect surface meshing of CadQuery geometry with ```tolerance``` and ```angular_tolerance``` arguments (avoids using Gmsh)
+- Direct surface meshing of CadQuery geometry with ```tolerance``` and ```angular_tolerance``` arguments (avoids using Gmsh)
 - Model wide mesh Gmsh size parameters with ```min_mesh_size``` and ```max_mesh_size``` arguments
 - Volume specific mesh sizing parameters with the ```set_size``` argument
 - Unstructured mesh that share the same coordinates as the surface mesh.
@@ -73,7 +73,7 @@ Cad-to-dagmc offers a wide range of features including.
 
 - Install using Mamba
 - Install using Conda
-- Install using pip and source compilations
+- Install using pip
 
 ## Install using Mamba
 
@@ -151,10 +151,10 @@ You may also want to install OpenMC with DAGMC to make use of the h5m geometry f
 
 To install OpenMC you can run ```mamba 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.15.0=dagmc*nompi*"
+mamba install -c conda-forge -y "openmc=0.15.2=dagmc*nompi*"
 ```
 
-It might not be possible to install OpenMC and cad-to-dagmc in the same conda/mamba python environment so you may have to create a new conda/mamba environment and install OpenMC there.
+You could also install using this [wheel repo](https://github.com/shimwell/wheels)
 
 Another option would be to [install OpenMC from source](https://docs.openmc.org/en/stable/quickinstall.html) which would also need compiling with MOAB and DAGMC options.
 

cad_to_dagmc-0.9.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=nVR1UPhFOYODT1jRbOZVkLGatCOSQLCVT4ndGPtcnZ8,704
+cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
+cad_to_dagmc/core.py,sha256=2U7KdBCCJst3pQTbMV3qjNzV1qNIzT_Ey9OZK7NVd48,42756
+cad_to_dagmc/direct_mesh_plugin.py,sha256=iKPYtWQd35Ipxv6g8fZ-r7GFKd1VlCwrSfaNzrGFtf0,24131
+cad_to_dagmc-0.9.7.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.7.dist-info/METADATA,sha256=1qZc6ys0oUghoevoLgz-YO3uODOxYocdapgnb7GBIXA,8994
+cad_to_dagmc-0.9.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cad_to_dagmc-0.9.7.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.7.dist-info/RECORD,,

cad_to_dagmc-0.9.5.dist-info/RECORD

@@ -1,9 +0,0 @@
-_version.py,sha256=V1-OiE6OEk5MX27BDAUWprPJs5XL5wiS2EaIpLYazTw,704
-cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
-cad_to_dagmc/core.py,sha256=lLPnkK1EM33zBpG3KEzTOLVRWvVlhdrvfgvLGtctT1s,42163
-cad_to_dagmc/direct_mesh_plugin.py,sha256=5jG5ILafjbDacaAvBRWD_ilMZLepcM6H1Tjze85vAxE,24013
-cad_to_dagmc-0.9.5.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.5.dist-info/METADATA,sha256=ppjg_7Fafa7bZo3qpJDSGylfhTQS4P__wR6YR2rsygQ,9121
-cad_to_dagmc-0.9.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cad_to_dagmc-0.9.5.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.5.dist-info/RECORD,,