Merge branch 'main' into adding_toko_icf

.github/actions/dependencies/action.yml → .github/actions/dependencies_cad_to_dagmc/action.yml

@@ -19,9 +19,10 @@ runs:
           sudo apt-get upgrade -y
           sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0
           mamba activate
-          mamba install -y -c conda-forge moab gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*"
-          pip install git+https://github.com/CadQuery/cadquery.git
-          pip install cad_to_dagmc openmc_data_downloader
-          pip install --pre CAD_to_OpenMC
+          mamba install -y -c conda-forge moab>=5.3.0 gmsh python-gmsh "openmc=0.14.0=dagmc*nompi*"
+          pip install cadquery-ocp==7.7.2
+          pip install cadquery==2.4.0
+          pip install cad_to_dagmc
+          pip install openmc_data_downloader
           openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9
           pip install .[tests]

.github/actions/dependencies_cad_to_openmc/action.yml

@@ -0,0 +1,26 @@
+name: composite action
+description: builds 
+runs:
+    using: "composite"
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: install dependencies
+        shell: bash
+        run: |
+
+          wget -O Miniforge3.sh "https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
+          bash Miniforge3.sh -b -p "${HOME}/conda"
+          source "${HOME}/conda/etc/profile.d/conda.sh"
+          source "${HOME}/conda/etc/profile.d/mamba.sh"
+          sudo apt-get --allow-releaseinfo-change update
+          sudo apt-get update -y
+          sudo apt-get upgrade -y
+          sudo apt-get install -y libgl1-mesa-glx libgl1-mesa-dev libglu1-mesa-dev freeglut3-dev libosmesa6 libosmesa6-dev libgles2-mesa-dev libarchive-dev libpangocairo-1.0-0
+          mamba activate
+          mamba install -y -c conda-forge "openmc=0.14.0=dagmc*nompi*"
+          pip install CAD_to_OpenMC
+          pip install openmc_data_downloader
+          openmc_data_downloader -l ENDFB-7.1-NNDC -i Fe56 Be9
+          pip install .[tests]

.github/workflows/circular_torus_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/circular_torus_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/cuboid_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/cuboid_cad_to_openmc.yml

@@ -5,9 +5,10 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
-
+    
 jobs:
   testing:
     runs-on: ubuntu-latest
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/cylinder_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/cylinder_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:
@@ -26,4 +27,4 @@ jobs:
           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_cylinder.py
+          pytest tests/test_cad_to_openmc/test_csg_cad_cylinder.py

.github/workflows/elliptical_torus_cad_to_dagmc.yml

@@ -5,9 +5,9 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
-
 jobs:
   testing:
     runs-on: ubuntu-latest
@@ -17,7 +17,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/elliptical_torus_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/nested_cylinder_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/nested_cylinder_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/nested_sphere_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/nested_sphere_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/sphere_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/sphere_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env:

.github/workflows/two_touching_cuboids_cad_to_dagmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_dagmc
 
       - shell: bash
         env:

.github/workflows/two_touching_cuboids_cad_to_openmc.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - develop
       - main
-    push:
+  push:
+    branches:
       - main
 
 jobs:
@@ -17,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: use upstream test composite action
-        uses: ./.github/actions/dependencies
+        uses: ./.github/actions/dependencies_cad_to_openmc
 
       - shell: bash
         env: