cad-to-dagmc 0.9.4__py3-none-any.whl → 0.9.6__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.4'
-__version_tuple__ = version_tuple = (0, 9, 4)
+__version__ = version = '0.9.6'
+__version_tuple__ = version_tuple = (0, 9, 6)
 
 __commit_id__ = commit_id = None

cad_to_dagmc/core.py

@@ -812,7 +812,6 @@ class CadToDagmc:
     def export_dagmc_h5m_file(
         self,
         filename: str = "dagmc.h5m",
-        meshing_backend: str = "cadquery",
         implicit_complement_material_tag: str | None = None,
         scale_factor: float = 1.0,
         imprint: bool = True,
@@ -822,8 +821,6 @@ class CadToDagmc:
 
         Args:
             filename: the filename to use for the saved DAGMC file.
-            meshing_backend: determines whether gmsh or cadquery's direct mesh method
-                is used for meshing. Options are 'gmsh' or 'cadquery'.
             implicit_complement_material_tag: the name of the material tag to use
                 for the implicit complement (void space).
             scale_factor: a scaling factor to apply to the geometry.
@@ -831,6 +828,11 @@ class CadToDagmc:
 
             **kwargs: Backend-specific parameters:
 
+                Backend selection:
+                - meshing_backend (str, optional): explicitly specify 'gmsh' or 'cadquery'.
+                  If not provided, backend is auto-selected based on other arguments.
+                  Defaults to 'cadquery' if no backend-specific arguments are given.
+
                 For GMSH backend:
                 - min_mesh_size (float): minimum mesh element size
                 - max_mesh_size (float): maximum mesh element size
@@ -851,6 +853,52 @@ 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
+            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:
+                meshing_backend = "cadquery"
+            elif has_gmsh and not has_cadquery:
+                meshing_backend = "gmsh"
+            elif has_cadquery and has_gmsh:
+                provided_cadquery = [key for key in cadquery_keys if key in kwargs]
+                provided_gmsh = [key for key in gmsh_keys if key in kwargs]
+                raise ValueError(
+                    "Ambiguous backend: both CadQuery and GMSH-specific arguments provided.\n"
+                    f"CadQuery-specific arguments: {sorted(cadquery_keys)}\n"
+                    f"GMSH-specific arguments: {sorted(gmsh_keys)}\n"
+                    f"Provided CadQuery arguments: {provided_cadquery}\n"
+                    f"Provided GMSH arguments: {provided_gmsh}\n"
+                    "Please provide only one backend's arguments."
+                )
+            else:
+                meshing_backend = "cadquery"  # default
+
         # Validate meshing backend
         if meshing_backend not in ["gmsh", "cadquery"]:
             raise ValueError(
@@ -858,6 +906,8 @@ class CadToDagmc:
                 'Available options are "gmsh" or "cadquery"'
             )
 
+        print(f"Using meshing backend: {meshing_backend}")
+
         # Initialize variables to avoid unbound errors
         tolerance = 0.1
         angular_tolerance = 0.1

{cad_to_dagmc-0.9.4.dist-info → cad_to_dagmc-0.9.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cad_to_dagmc
-Version: 0.9.4
+Version: 0.9.6
 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.

cad_to_dagmc-0.9.6.dist-info/RECORD

@@ -0,0 +1,9 @@
+_version.py,sha256=e8-aWL0R1dkk01VJUUTVieOVR2LgJj8i-n3ez_PgchQ,704
+cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
+cad_to_dagmc/core.py,sha256=88L93amP-SMzppnXa7tWTvPnVGTxJUvVLN9B8PL_fp4,42556
+cad_to_dagmc/direct_mesh_plugin.py,sha256=5jG5ILafjbDacaAvBRWD_ilMZLepcM6H1Tjze85vAxE,24013
+cad_to_dagmc-0.9.6.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
+cad_to_dagmc-0.9.6.dist-info/METADATA,sha256=0CdxtSGC0GnICOxxkFZB45Bj5lJyqBh052HVjiq23K8,9120
+cad_to_dagmc-0.9.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cad_to_dagmc-0.9.6.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
+cad_to_dagmc-0.9.6.dist-info/RECORD,,

cad_to_dagmc-0.9.4.dist-info/RECORD

@@ -1,9 +0,0 @@
-_version.py,sha256=neCU47g_h2UhyiDH9FD_S8jzk8iEdw9LEgRY7JImMPs,704
-cad_to_dagmc/__init__.py,sha256=oCr1P0QnBsf6AH0RZujX7T7tdrb75NazdF70HtqXSfc,528
-cad_to_dagmc/core.py,sha256=xYDP7OQ8D-FtPhjfcbZ2Gs5oX4pZisd72zyk3lSkpJg,40352
-cad_to_dagmc/direct_mesh_plugin.py,sha256=5jG5ILafjbDacaAvBRWD_ilMZLepcM6H1Tjze85vAxE,24013
-cad_to_dagmc-0.9.4.dist-info/licenses/LICENSE,sha256=B8kznH_777JVNZ3HOKDc4Tj24F7wJ68ledaNYeL9sCw,1070
-cad_to_dagmc-0.9.4.dist-info/METADATA,sha256=7EeDiEXc-NKoTwMSiTPs2bo2uLPKSQqB2n1cgGyudFM,9121
-cad_to_dagmc-0.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cad_to_dagmc-0.9.4.dist-info/top_level.txt,sha256=zTi8C64SEBsE5WOtPovnxhOzt-E6Oc5nC3RW6M_5aEA,22
-cad_to_dagmc-0.9.4.dist-info/RECORD,,