Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor reactor to assembly #304

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Refactor reactor to assembly #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
81b73c9
started class refactor
shimwell Jan 13, 2023
76af2b5
[skip ci] Apply formatting changes
shimwell Jan 13, 2023
549b38f
refactored dagc export method
shimwell Jan 15, 2023
e853104
added weblink
shimwell Jan 24, 2023
25f2a96
Merge branch 'refactor_reactor_to_assembly' of github.com:fusion-ener…
shimwell Jan 28, 2023
ea1c0d6
function returning cq.assembly
shimwell Jan 28, 2023
f055574
[skip ci] Apply formatting changes
shimwell Jan 28, 2023
fc1d2b9
limited reactor import
shimwell Jan 28, 2023
dfc6760
started adding color
shimwell Jan 28, 2023
d355bd8
patching cq assembly
shimwell Jan 28, 2023
9cae44e
merge conflict
shimwell Jan 28, 2023
14b7e09
[skip ci] Apply formatting changes
shimwell Jan 28, 2023
0c2d28a
started converting ballreactor
shimwell Jan 29, 2023
34df2e7
Merge branch 'refactor_reactor_to_assembly' of github.com:fusion-ener…
shimwell Jan 29, 2023
cd66d31
[skip ci] Apply formatting changes
shimwell Jan 29, 2023
c116b73
ball reactor names assigned correctly
shimwell Feb 13, 2023
f9b52d9
[skip ci] Apply formatting changes
shimwell Feb 13, 2023
91d3159
save
shimwell Feb 14, 2023
c0eb016
[skip ci] Apply formatting changes
shimwell Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ STP, STL, BRep, HTML and DAGMC h5m.

:point_right: [Docker images](https://github.com/fusion-energy/paramak/pkgs/container/paramak)

:point_right: [Web app](https://xsplot.com)

:point_right: Examples with Neutronics [1](https://github.com/fusion-energy/magnetic_fusion_openmc_dagmc_paramak_example), [2](https://github.com/fusion-energy/inertial_fusion_openmc_dagmc_paramak_example), [3](https://github.com/fusion-energy/neutronics-workshop)
56 changes: 29 additions & 27 deletions src/paramak/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@


from .shape import Shape
from .reactor import Reactor
from .reactor import *
from .utils import (
rotate,
extend,
Expand Down Expand Up @@ -136,27 +136,29 @@
from .parametric_components.hollow_cube import HollowCube
from .parametric_components.shell_fs import ShellFS

from .parametric_reactors.eu_demo_2015_reactor import EuDemoFrom2015PaperDiagram
# from .parametric_reactors.eu_demo_2015_reactor import EuDemoFrom2015PaperDiagram
from .parametric_reactors.ball_reactor import BallReactor
from .parametric_reactors.submersion_reactor import SubmersionTokamak
from .parametric_reactors.single_null_submersion_reactor import (
SingleNullSubmersionTokamak,
)
from .parametric_reactors.single_null_ball_reactor import SingleNullBallReactor
from .parametric_reactors.segmented_blanket_ball_reactor import (
SegmentedBlanketBallReactor,
)
from .parametric_reactors.center_column_study_reactor import CenterColumnStudyReactor
from .parametric_reactors.sparc_paper_2020 import SparcFrom2020PaperDiagram
from .parametric_reactors.iter_paper_2020 import IterFrom2020PaperDiagram

# from .parametric_reactors.submersion_reactor import SubmersionTokamak
# from .parametric_reactors.single_null_submersion_reactor import (
# SingleNullSubmersionTokamak,
# )
# from .parametric_reactors.single_null_ball_reactor import SingleNullBallReactor
# from .parametric_reactors.segmented_blanket_ball_reactor import (
# SegmentedBlanketBallReactor,
# )
# from .parametric_reactors.center_column_study_reactor import CenterColumnStudyReactor
# from .parametric_reactors.sparc_paper_2020 import SparcFrom2020PaperDiagram
# from .parametric_reactors.iter_paper_2020 import IterFrom2020PaperDiagram
from .parametric_reactors.flf_system_code_reactor import FlfSystemCodeReactor
from .parametric_reactors.negative_triangularity_reactor import (
NegativeTriangularityReactor,
)

# from .parametric_reactors.negative_triangularity_reactor import (
# NegativeTriangularityReactor,
# )

__all__ = [
Shape,
Reactor,
# Reactor,
rotate,
extend,
distance_between_two_points,
Expand Down Expand Up @@ -235,15 +237,15 @@
CapsuleVacuumVessel,
HollowCube,
ShellFS,
EuDemoFrom2015PaperDiagram,
BallReactor,
SubmersionTokamak,
SingleNullSubmersionTokamak,
SingleNullBallReactor,
SegmentedBlanketBallReactor,
CenterColumnStudyReactor,
SparcFrom2020PaperDiagram,
IterFrom2020PaperDiagram,
# EuDemoFrom2015PaperDiagram,
# BallReactor,
# SubmersionTokamak,
# SingleNullSubmersionTokamak,
# SingleNullBallReactor,
# SegmentedBlanketBallReactor,
# CenterColumnStudyReactor,
# SparcFrom2020PaperDiagram,
# IterFrom2020PaperDiagram,
FlfSystemCodeReactor,
NegativeTriangularityReactor,
# NegativeTriangularityReactor,
]
Loading