From b712d7769486f8a35f9d7d255d07901ac19b8773 Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sun, 17 Mar 2024 19:49:29 +0000 Subject: [PATCH] moved material arg --- .github/actions/dependencies/action.yml | 1 + src/model_benchmark_zoo/utils.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml index 28e2d4e..9e8477c 100644 --- a/.github/actions/dependencies/action.yml +++ b/.github/actions/dependencies/action.yml @@ -20,6 +20,7 @@ runs: 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 cadqery-ocp==7.7.2 pip install cadquery==2.4.0 pip install cad_to_dagmc openmc_data_downloader pip install CAD_to_OpenMC diff --git a/src/model_benchmark_zoo/utils.py b/src/model_benchmark_zoo/utils.py index 9213e3c..6f93987 100644 --- a/src/model_benchmark_zoo/utils.py +++ b/src/model_benchmark_zoo/utils.py @@ -17,11 +17,12 @@ def export_h5m_file_with_cad_to_dagmc( ctd = CadToDagmc() - ctd.add_cadquery_object(self.cadquery_assembly(), material_tags=material_tags) + ctd.add_cadquery_object(self.cadquery_assembly()) ctd.export_dagmc_h5m_file( - h5m_filename, + material_tags=material_tags, + filename=h5m_filename, min_mesh_size=min_mesh_size, - max_mesh_size=max_mesh_size + max_mesh_size=max_mesh_size, ) def export_h5m_file_with_cad_to_openmc(