Skip to content

Commit f06e2bf

Browse files
authored
Replacing the concrete material with a better reference (#1717)
1 parent 0db103d commit f06e2bf

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

armi/materials/concrete.py

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
"""
1616
Concrete.
1717
18-
Concrete is often used to provide structural support of nuclear equipment.
19-
20-
It can also provide radiation shielding.
18+
Concrete is often used to provide structural support of nuclear equipment. It can also provide
19+
radiation shielding.
2120
"""
2221

2322
from armi.materials.material import Material
@@ -26,20 +25,20 @@
2625
class Concrete(Material):
2726
"""Simple concreate material.
2827
29-
http://jolissrch-inter.tokai-sc.jaea.go.jp/pdfdata/JAERI-Data-Code-98-004.pdf
28+
https://web.archive.org/web/20221103120449/https://physics.nist.gov/cgi-bin/Star/compos.pl?matno=144
3029
"""
3130

3231
def setDefaultMassFracs(self):
33-
self.setMassFrac("H", 0.023 / 2.302)
34-
self.setMassFrac("O16", 1.220 / 2.302)
35-
self.setMassFrac("C", 0.0023 / 2.302)
36-
self.setMassFrac("NA23", 0.0368 / 2.302)
37-
self.setMassFrac("MG", 0.005 / 2.302)
38-
self.setMassFrac("AL", 0.078 / 2.302)
39-
self.setMassFrac("SI", 0.775 / 2.302)
40-
self.setMassFrac("K", 0.0299 / 2.302)
41-
self.setMassFrac("CA", 0.100 / 2.302)
42-
self.setMassFrac("FE", 0.032 / 2.302)
32+
self.setMassFrac("H", 0.010000)
33+
self.setMassFrac("C", 0.001000)
34+
self.setMassFrac("O16", 0.529107)
35+
self.setMassFrac("NA23", 0.016000)
36+
self.setMassFrac("MG", 0.002000)
37+
self.setMassFrac("AL", 0.033872)
38+
self.setMassFrac("SI", 0.337021)
39+
self.setMassFrac("K", 0.013000)
40+
self.setMassFrac("CA", 0.044000)
41+
self.setMassFrac("FE", 0.014000)
4342

4443
def density(self, Tk=None, Tc=None):
45-
return 2.302 # g/cm3
44+
return 2.3000 # g/cm3

doc/release/0.3.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ New Features
1515

1616
API Changes
1717
-----------
18+
#. Replacing the concrete material with a better reference. (`PR#1717 <https://github.com/terrapower/armi/pull/1717>`_)
1819
#. Renaming ``structuredgrid.py`` to camelCase. (`PR#1650 <https://github.com/terrapower/armi/pull/1650>`_)
1920
#. Removing unused argument from ``Block.coords()``. (`PR#1651 <https://github.com/terrapower/armi/pull/1651>`_)
2021
#. Removing unused method ``HexGrid.allPositionsInThird()``. (`PR#1655 <https://github.com/terrapower/armi/pull/1655>`_)

0 commit comments

Comments
 (0)