Skip to content

Commit c6f46e5

Browse files
authored
Moving C5G7 into its own test dir (#1941)
1 parent 3d0b871 commit c6f46e5

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

armi/tests/test_lwrInputs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_loadC5G7(self):
4747

4848
# load the reactor
4949
_o, r = test_reactors.loadTestReactor(
50-
os.path.join(TEST_ROOT, "tutorials"),
50+
os.path.join(TEST_ROOT, "c5g7"),
5151
inputFileName=TEST_INPUT_TITLE,
5252
)
5353

armi/utils/tests/test_plotting.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ def test_plotCartesianBlock(self):
116116

117117
with TemporaryDirectoryChanger():
118118
cs = settings.Settings(
119-
os.path.join(TEST_ROOT, "tutorials", "c5g7-settings.yaml")
119+
os.path.join(TEST_ROOT, "c5g7", "c5g7-settings.yaml")
120120
)
121121

122122
blueprint = blueprints.loadFromCs(cs)

doc/tutorials/walkthrough_lwr_inputs.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ to specify their composition. The composition details below are documented in Ta
4141
`NEA/NSC/DOC(96)2 <https://www.oecd-nea.org/upload/docs/application/pdf/2020-01/nsc-doc96-02-rev2.pdf>`_.
4242

4343

44-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
44+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
4545
:language: yaml
4646
:start-after: start-custom-isotopics
4747
:end-before: end-custom-isotopics
@@ -64,7 +64,7 @@ position in the grid that has any of the specifiers in this list.
6464
You will see the `<<: *guide_tube` notation below. This means use the
6565
specifications of guide_tube, but make the modifications that apear below.
6666

67-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
67+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
6868
:language: yaml
6969
:start-after: end-custom-isotopics
7070
:end-before: end-block-uo2
@@ -79,7 +79,7 @@ The next assembly is very similar. We define three separate fuel pins,
7979
each with different ``latticeIDs``, and then use YAML anchors to just
8080
copy the moderator, guide tube, and fission chamber from the previous assembly.
8181

82-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
82+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
8383
:language: yaml
8484
:start-after: end-block-uo2
8585
:end-before: end-block-mox
@@ -88,7 +88,7 @@ The moderator block
8888
-------------------
8989
The moderator block for the radial and axial reflectors is very simple:
9090

91-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
91+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
9292
:language: yaml
9393
:start-after: end-block-mox
9494
:end-before: end-block-mod
@@ -98,7 +98,7 @@ The 3-D Assembly definitions
9898
Now that the pins are defined, we stack them into assemblies, very similar
9999
to what we did in the SFR tutorial. There are three distinct assembly definitions.
100100

101-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
101+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
102102
:language: yaml
103103
:start-after: end-block-mod
104104
:end-before: end-assemblies
@@ -111,7 +111,7 @@ they would be here alongside the core. We also anchor the core at the global
111111
coordinates (0,0,0). If we wanted the core at some other elevation, we could
112112
adjust that here.
113113

114-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
114+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
115115
:language: yaml
116116
:start-after: end-assemblies
117117
:end-before: end-systems
@@ -124,7 +124,7 @@ from an XML file. In this tutorial, we define the grid directly with an
124124
textual ``lattice map`` input section. The core map is particularly simple; it
125125
only has 9 assemblies.
126126

127-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
127+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
128128
:language: yaml
129129
:start-after: end-systems
130130
:end-before: end-grid-core
@@ -134,14 +134,14 @@ Recall that on the ``uo2`` block above we said that we want to apply the grid
134134
with the name ``UO2 grid``, and wanted to fill any ``U`` position with
135135
the ``fuel`` component defined up there. Here's where we define that grid.
136136

137-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
137+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
138138
:language: yaml
139139
:start-after: end-grid-core
140140
:end-before: end-grid-UO2
141141

142142
Similarly, we define the ``MOX grid`` as follows:
143143

144-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
144+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
145145
:language: yaml
146146
:start-after: end-grid-UO2
147147
:end-before: end-grid-MOX
@@ -151,7 +151,7 @@ the assembly.
151151

152152
Nuclide Flags
153153
-------------
154-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-blueprints.yaml
154+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-blueprints.yaml
155155
:language: yaml
156156
:start-after: end-grid-MOX
157157
:end-before: end-nucflags
@@ -167,7 +167,7 @@ Really, the only thing the settings file does in this case is point to the bluep
167167
file. As we turn this case into an actual run, we may add various cross section
168168
and neutrons options to evaluate the benchmark.
169169

170-
.. literalinclude:: ../../armi/tests/tutorials/c5g7-settings.yaml
170+
.. literalinclude:: ../../armi/tests/c5g7/c5g7-settings.yaml
171171
:language: yaml
172172

173173
Defining fuel management
@@ -228,5 +228,5 @@ This should show a simple representation of the block.
228228

229229
Here are the full files used in this example:
230230

231-
* :download:`Blueprints <../../armi/tests/tutorials/c5g7-blueprints.yaml>`
232-
* :download:`Settings <../../armi/tests/tutorials/c5g7-settings.yaml>`
231+
* :download:`Blueprints <../../armi/tests/c5g7/c5g7-blueprints.yaml>`
232+
* :download:`Settings <../../armi/tests/c5g7/c5g7-settings.yaml>`

pyproject.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,9 @@ armi = [
314314
"tests/1DslabXSByCompTest.yaml",
315315
"tests/armiRun-SHUFFLES.txt",
316316
"tests/armiRun.yaml",
317+
"tests/c5g7",
318+
"tests/c5g7/c5g7-blueprints.yaml",
319+
"tests/c5g7/c5g7-settings.yaml",
317320
"tests/COMPXS.ascii",
318321
"tests/detailedAxialExpansion/armiRun.yaml",
319322
"tests/detailedAxialExpansion/refSmallCoreGrid.yaml",

0 commit comments

Comments
 (0)