From 87bd04c9557d3bb586b78fac9b4e16c739b54d36 Mon Sep 17 00:00:00 2001 From: jstilley Date: Wed, 29 May 2024 10:48:11 -0700 Subject: [PATCH 1/2] Fixing dead link in concrete material --- armi/materials/concrete.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/armi/materials/concrete.py b/armi/materials/concrete.py index dced8404b..a65ee13b6 100644 --- a/armi/materials/concrete.py +++ b/armi/materials/concrete.py @@ -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 @@ -26,7 +25,7 @@ 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/20130122161516/http://jolissrch-inter.tokai-sc.jaea.go.jp/pdfdata/JAERI-Data-Code-98-004.pdf """ def setDefaultMassFracs(self): From dbd4e5d0b27d28fbf41e662907551d05f315be6f Mon Sep 17 00:00:00 2001 From: jstilley Date: Fri, 31 May 2024 09:04:12 -0700 Subject: [PATCH 2/2] Updating them concrete material, and reference --- armi/materials/concrete.py | 24 ++++++++++++------------ doc/release/0.3.rst | 1 + 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/armi/materials/concrete.py b/armi/materials/concrete.py index a65ee13b6..38e28724f 100644 --- a/armi/materials/concrete.py +++ b/armi/materials/concrete.py @@ -25,20 +25,20 @@ class Concrete(Material): """Simple concreate material. - https://web.archive.org/web/20130122161516/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 diff --git a/doc/release/0.3.rst b/doc/release/0.3.rst index 8c236a780..cbeac2122 100644 --- a/doc/release/0.3.rst +++ b/doc/release/0.3.rst @@ -15,6 +15,7 @@ New Features API Changes ----------- +#. Replacing the concrete material with a better reference. (`PR#1717 `_) #. Renaming ``structuredgrid.py`` to camelCase. (`PR#1650 `_) #. Removing unused argument from ``Block.coords()``. (`PR#1651 `_) #. Removing unused method ``HexGrid.allPositionsInThird()``. (`PR#1655 `_)