Merge branch 'main' into rm_old_db_refs

terrapower · Mar 11, 2024 · 6fdb943 · 6fdb943
2 parents 3e83945 + d788393
commit 6fdb943
Show file tree

Hide file tree

Showing 16 changed files with 342 additions and 511 deletions.
diff --git a/armi/nucDirectory/elements.py b/armi/nucDirectory/elements.py
@@ -98,6 +98,7 @@
     .. exec::
         from tabulate import tabulate
         from armi.nucDirectory import elements
+        from dochelpers import createTable
 
         attributes = ['z',
                     'name',
@@ -121,10 +122,10 @@ def getAttributes(element):
             ]
 
         sortedElements = sorted(elements.byZ.values())
-        return create_table(tabulate(tabular_data=[getAttributes(elem) for elem in sortedElements],
+        return createTable(tabulate(tabular_data=[getAttributes(elem) for elem in sortedElements],
                                     headers=attributes,
                                     tablefmt='rst'),
-                            caption='List of elements')
+                           caption='List of elements')
 """
 
 import os

diff --git a/armi/nucDirectory/nuclideBases.py b/armi/nucDirectory/nuclideBases.py
@@ -99,6 +99,7 @@ class which is used to organize and store metadata about each nuclide. The
         import numpy
         from tabulate import tabulate
         from armi.nucDirectory import nuclideBases
+        from dochelpers import createTable
 
         attributes = ['name',
                     'type',
@@ -126,10 +127,10 @@ def getAttributes(nuc):
             ]
 
         sortedNucs = sorted(nuclideBases.instances)
-        return create_table(tabulate(tabular_data=[getAttributes(nuc) for nuc in sortedNucs],
-                                        headers=attributes,
-                                        tablefmt='rst'),
-                                        caption='List of nuclides')
+        return createTable(tabulate(tabular_data=[getAttributes(nuc) for nuc in sortedNucs],
+                                    headers=attributes,
+                                    tablefmt='rst'),
+                                    caption='List of nuclides')
 """
 
 import os

diff --git a/armi/reactor/composites.py b/armi/reactor/composites.py
@@ -2675,7 +2675,6 @@ def getDominantMaterial(self, typeSpec: TypeSpec = None, exact=False):
             Gets components that are made of a particular material
         gatherMaterialsByVolume
             Classifies all materials by volume
-
         """
         return getDominantMaterial([self], typeSpec, exact)