Skip to content

Commit 144dc86

Browse files
authored
Merge pull request #44 from fusion-energy/develop
adding tet mesh support
2 parents d0134df + 28ac281 commit 144dc86

File tree

14 files changed

+216
-131
lines changed

14 files changed

+216
-131
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
# test:
88
build:
99
docker:
10-
- image: ghcr.io/fusion-energy/paramak-neutronics:dependencies
10+
- image: ghcr.io/fusion-energy/openmc-dagmc-wrapper:dependencies
1111
steps:
1212
- checkout
1313
- run:

.github/workflows/autopep8.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: autopep8
2+
on: pull_request
3+
jobs:
4+
autopep8:
5+
# Check if the PR is not from a fork
6+
if: github.event.pull_request.head.repo.full_name == github.repository
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v2
10+
with:
11+
token: ${{ secrets.GITHUB_TOKEN }}
12+
ref: ${{ github.head_ref }}
13+
- name: autopep8
14+
id: autopep8
15+
uses: peter-evans/autopep8@v1
16+
with:
17+
args: --exclude=make_faceteted_neutronics_model.py --exit-code --recursive --in-place --aggressive --aggressive .
18+
- name: Commit autopep8 changes
19+
if: steps.autopep8.outputs.exit-code == 2
20+
run: |
21+
git config --global user.name 'autopep8'
22+
git config --global user.email 'autopep8@users.noreply.github.com'
23+
git commit -am "Automated autopep8 fixes"
24+
git push

docs/source/conf.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,12 @@
148148

149149
# One entry per manual page. List of tuples
150150
# (source start file, name, description, authors, manual section).
151-
man_pages = [(master_doc, "paramak-neutronics", "Paramak Documentation", [author], 1)]
151+
man_pages = [
152+
(master_doc,
153+
"paramak-neutronics",
154+
"Paramak Documentation",
155+
[author],
156+
1)]
152157

153158

154159
# -- Options for Texinfo output ----------------------------------------------

docs/source/index.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ neutronics simulations of fusion reactors in a reproducible manner.
2020

2121
The source code is distributed with a permissive open-source
2222
license (MIT) and is available from the GitHub repository
23-
`https://github.com/fusion-energy/paramak-neutronics <https://github.com/fusion-energy/paramak-neutronics>`_
23+
`https://github.com/fusion-energy/openmc-dagmc-wrapper <https://github.com/fusion-energy/openmc-dagmc-wrapper>`_
2424

2525

2626
Features
2727
--------
2828

2929
In general the openmc-dagmc-wrapper takes a DAGMC geometry in the form of a h5m
30-
file and helps all tallies, materials and a source term to be easily added to
30+
file and helps adding tallies, materials and a source term to be easily added to
3131
create a complete neutronics model. The package will also post processes the
3232
results of the neutronics simulation to allow easy access to the outputs.
3333
The simulated results are extracted from the statepoint.h5 file that
@@ -51,5 +51,10 @@ The `OpenMC workflow <https://github.com/fusion-energy/neutronics_workflow>`_
5151
demonstrates the use of this package along side others in a complete neutronics
5252
tool chain.
5353

54+
`CAD-to-h5m <https://github.com/fusion-energy/cad_to_h5m>`_ makes use of the
55+
`Cubit API <https://coreform.com/products/coreform-cubit/>`_ to convert CAD
56+
files (stp or sat format) into `DAGMC <https://svalinn.github.io/DAGMC/>`_
57+
compatible h5m files for use in DAGMC enabled neutronics codes.
58+
5459
For magnetic confinement fusion simulations you might want to use the parametric-plasma-source
5560
`Git repository <https://github.com/open-radiation-sources/parametric-plasma-source>`_

examples/segmented_blanket_ball_reactor.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ def make_model_and_simulate():
5959
temperature=blanket_rear_wall_coolant_temperature,
6060
pressure=blanket_rear_wall_coolant_pressure,
6161
),
62-
nmm.Material.from_library(name=blanket_rear_wall_structural_material),
62+
nmm.Material.from_library(
63+
name=blanket_rear_wall_structural_material),
6364
],
6465
fracs=[
6566
blanket_rear_wall_coolant_fraction,
@@ -156,7 +157,8 @@ def make_model_and_simulate():
156157
temperature=center_column_shield_coolant_temperature_k,
157158
pressure=center_column_shield_coolant_pressure_Pa,
158159
),
159-
nmm.Material.from_library(name=center_column_shield_structural_material),
160+
nmm.Material.from_library(
161+
name=center_column_shield_structural_material),
160162
],
161163
fracs=[
162164
center_column_shield_coolant_fraction,
@@ -184,8 +186,10 @@ def make_model_and_simulate():
184186
temperature=inboard_tf_coils_coolant_temperature_k,
185187
pressure=inboard_tf_coils_coolant_pressure_Pa,
186188
),
187-
nmm.Material.from_library(name=inboard_tf_coils_conductor_material),
188-
nmm.Material.from_library(name=inboard_tf_coils_structure_material),
189+
nmm.Material.from_library(
190+
name=inboard_tf_coils_conductor_material),
191+
nmm.Material.from_library(
192+
name=inboard_tf_coils_structure_material),
189193
],
190194
fracs=[
191195
inboard_tf_coils_coolant_fraction,

0 commit comments

Comments
 (0)