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.

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

Replacing the concrete material with a better reference #1717

Merged
merged 2 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 14 additions & 15 deletions armi/materials/concrete.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
"""
Concrete.

Concrete is often used to provide structural support of nuclear equipment.

It can also provide radiation shielding.
Concrete is often used to provide structural support of nuclear equipment. It can also provide
radiation shielding.
"""

from armi.materials.material import Material
Expand All @@ -26,20 +25,20 @@
class Concrete(Material):
"""Simple concreate material.

http://jolissrch-inter.tokai-sc.jaea.go.jp/pdfdata/JAERI-Data-Code-98-004.pdf
https://web.archive.org/web/20221103120449/https://physics.nist.gov/cgi-bin/Star/compos.pl?matno=144
"""

def setDefaultMassFracs(self):
self.setMassFrac("H", 0.023 / 2.302)
self.setMassFrac("O16", 1.220 / 2.302)
self.setMassFrac("C", 0.0023 / 2.302)
self.setMassFrac("NA23", 0.0368 / 2.302)
self.setMassFrac("MG", 0.005 / 2.302)
self.setMassFrac("AL", 0.078 / 2.302)
self.setMassFrac("SI", 0.775 / 2.302)
self.setMassFrac("K", 0.0299 / 2.302)
self.setMassFrac("CA", 0.100 / 2.302)
self.setMassFrac("FE", 0.032 / 2.302)
self.setMassFrac("H", 0.010000)
self.setMassFrac("C", 0.001000)
self.setMassFrac("O16", 0.529107)
self.setMassFrac("NA23", 0.016000)
self.setMassFrac("MG", 0.002000)
self.setMassFrac("AL", 0.033872)
self.setMassFrac("SI", 0.337021)
self.setMassFrac("K", 0.013000)
self.setMassFrac("CA", 0.044000)
self.setMassFrac("FE", 0.014000)

def density(self, Tk=None, Tc=None):
return 2.302 # g/cm3
return 2.3000 # g/cm3
1 change: 1 addition & 0 deletions doc/release/0.3.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ New Features

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