more code agnoistic layout

.github/workflows/circular_torus_cad_to_dagmc.yml

@@ -0,0 +1,29 @@
+name: circular torus - cad to dagmc
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    push:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout actions
+        uses: actions/checkout@v4
+
+      - name: use upstream test composite action
+        uses: ./.github/actions/dependencies
+
+      - shell: bash
+        env:
+          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
+        run: |
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          mamba activate
+          pytest tests/test_cad_to_dagmc/test_csg_cad_circulartorus.py

.github/workflows/ci_nestedcylinder.yml → .github/workflows/cuboid_cad_to_dagmc.yml

@@ -1,4 +1,4 @@
-name: nested cylinder
+name: cuboid - cad to dagmc
 
 on:
   pull_request:
@@ -26,4 +26,4 @@ jobs:
           source "${HOME}/conda/etc/profile.d/conda.sh"
           source "${HOME}/conda/etc/profile.d/mamba.sh"
           mamba activate
-          pytest tests/test_csg_cad_nestedcylinder.py
+          pytest tests/test_cad_to_dagmc/test_csg_cad_sphere.py

.github/workflows/ci_cylinder.yml → .github/workflows/cylinder_cad_to_dagmc.yml

@@ -1,5 +1,4 @@
-
-name: cylinder
+name: cylinder - cad to dagmc
 
 on:
   pull_request:
@@ -27,4 +26,4 @@ jobs:
           source "${HOME}/conda/etc/profile.d/conda.sh"
           source "${HOME}/conda/etc/profile.d/mamba.sh"
           mamba activate
-          pytest tests/test_csg_cad_cylinder.py
+          pytest tests/test_cad_to_dagmc/test_csg_cad_cylinder.py

.github/workflows/elliptical_torus_cad_to_dagmc.yml

@@ -0,0 +1,29 @@
+name: elliptical torus - cad to dagmc
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    push:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout actions
+        uses: actions/checkout@v4
+
+      - name: use upstream test composite action
+        uses: ./.github/actions/dependencies
+
+      - shell: bash
+        env:
+          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
+        run: |
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          mamba activate
+          pytest tests/test_cad_to_dagmc/test_csg_cad_ellipticaltorus.py

.github/workflows/ci_ellipticaltorus.yml → .github/workflows/nested_cylinder_cad_to_dagmc.yml

@@ -1,4 +1,4 @@
-name: elliptical torus
+name: nested cylinder - cad to dagmc
 
 on:
   pull_request:
@@ -26,4 +26,4 @@ jobs:
           source "${HOME}/conda/etc/profile.d/conda.sh"
           source "${HOME}/conda/etc/profile.d/mamba.sh"
           mamba activate
-          pytest tests/test_csg_cad_ellipticaltorus.py
+          pytest tests/test_cad_to_dagmc/test_csg_cad_nestedcylinder.py

.github/workflows/ci_circulartorus.yml → .github/workflows/nested_sphere_cad_to_dagmc.yml

@@ -1,29 +1,29 @@
-name: circulartorus
-
-on:
-  pull_request:
-    branches:
-      - develop
-      - main
-    push:
-      - main
-
-jobs:
-  testing:
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: checkout actions
-        uses: actions/checkout@v4
-
-      - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
-
-      - shell: bash
-        env:
-          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
-        run: |
-          source "${HOME}/conda/etc/profile.d/conda.sh"
-          source "${HOME}/conda/etc/profile.d/mamba.sh"
-          mamba activate
-          pytest tests/test_csg_cad_circulartorus.py
+name: nested sphere - cad to dagmc
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    push:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout actions
+        uses: actions/checkout@v4
+
+      - name: use upstream test composite action
+        uses: ./.github/actions/dependencies
+
+      - shell: bash
+        env:
+          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
+        run: |
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          mamba activate
+          pytest tests/test_cad_to_dagmc/test_csg_cad_nestedsphere.py

.github/workflows/ci_cuboid.yml → .github/workflows/sphere_cad_to_dagmc.yml

@@ -1,4 +1,4 @@
-name: cuboid
+name: sphere - cad to dagmc
 
 on:
   pull_request:
@@ -26,4 +26,4 @@ jobs:
           source "${HOME}/conda/etc/profile.d/conda.sh"
           source "${HOME}/conda/etc/profile.d/mamba.sh"
           mamba activate
-          pytest tests/test_csg_cad_sphere.py
+          pytest tests/test_cad_to_dagmc/test_csg_cad_sphere.py

.github/workflows/two_touching_cuboids_cad_to_dagmc.yml

@@ -0,0 +1,29 @@
+name: two touching cuboids - cad to dagmc
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    push:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout actions
+        uses: actions/checkout@v4
+
+      - name: use upstream test composite action
+        uses: ./.github/actions/dependencies
+
+      - shell: bash
+        env:
+          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
+        run: |
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          mamba activate
+          pytest tests/test_cad_to_dagmc/test_csg_cad_two_touching_cuboids.py

.github/workflows/two_touching_cuboids_cad_to_openmc.yml

@@ -0,0 +1,29 @@
+name: two touching cuboids - cad to dagmc
+
+on:
+  pull_request:
+    branches:
+      - develop
+      - main
+    push:
+      - main
+
+jobs:
+  testing:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: checkout actions
+        uses: actions/checkout@v4
+
+      - name: use upstream test composite action
+        uses: ./.github/actions/dependencies
+
+      - shell: bash
+        env:
+          OPENMC_CROSS_SECTIONS: /home/runner/work/model_benchmark_zoo/model_benchmark_zoo/cross_sections.xml
+        run: |
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          mamba activate
+          pytest tests/test_cad_to_openmc/test_csg_cad_two_touching_cuboids.py

.gitignore

@@ -139,3 +139,5 @@ dmypy.json
 *.pkl
 *.ipynb
 *.zip
+
+**/_version.py

src/model_benchmark_zoo/two_touching_cuboids.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 
 #     *----------*
 #     |          |
@@ -49,7 +50,7 @@ def cadquery_assembly(self):
     def export_stp_file(self, filename="TwoTouchingCuboids.step"):
         self.cadquery_assembly().save(filename, "STEP")
 
-    def dagmc_model(self, filename="TwoTouchingCuboids.h5m", min_mesh_size=0.1, max_mesh_size=100.0):
+    def dagmc_model_with_cad_to_dagmc(self, filename="TwoTouchingCuboids.h5m", min_mesh_size=0.1, max_mesh_size=100.0):
         from cad_to_dagmc import CadToDagmc
         import openmc
 
@@ -69,20 +70,24 @@ def dagmc_model(self, filename="TwoTouchingCuboids.h5m", min_mesh_size=0.1, max_
         model = openmc.Model(geometry=geometry)
         return model
 
-    def c2omc_model(self, filename="TwoTouchingCuboids.h5m"):
+    def dagmc_model_with_cad_to_openmc(self, filename="TwoTouchingCuboids.h5m"):
         from CAD_to_OpenMC import assembly
-        from pathlib import Path
         import openmc
-        stepfn=str(Path(filename).with_suffix('.stp'))
 
-        #mesh/triangulate
-        a=assembly.Assembly([stepfn])
+        self.export_stp_file()
+
+        a=assembly.Assembly(["TwoTouchingCuboids.step"])
         a.verbose=2
         assembly.mesher_config['threads']=1
-        material_tags = [self.materials[0].name, self.materials[1].name]
-        a.run(backend='stl2',merge=True,h5m_filename=filename, sequential_tags=material_tags, scale=1.0)
+        a.run(
+            backend='stl2',
+            merge=True,
+            h5m_filename=filename,
+            sequential_tags=[self.materials[0].name, self.materials[1].name],
+            scale=1.0
+        )
 
-        universe = openmc.DAGMCUniverse(filename ,auto_geom_ids=True).bounded_universe()
+        universe = openmc.DAGMCUniverse(filename, auto_geom_ids=True).bounded_universe()
         geometry = openmc.Geometry(universe)
         model = openmc.Model(geometry=geometry)
         return model