From 2e403e7855ea4898039ff07716c2a31e075d11f8 Mon Sep 17 00:00:00 2001 From: "sonatav2@illinois.edu" <42747051+sonatav2@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:32:48 -0500 Subject: [PATCH 1/2] Adds Fe, Mo, and T and corrects Q/W/s/Es values using Yamamura and Tawara 1996, addressing #212 --- scripts/materials.py | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/scripts/materials.py b/scripts/materials.py index 1cbffa8..f3fc0a6 100644 --- a/scripts/materials.py +++ b/scripts/materials.py @@ -21,6 +21,9 @@ 'Es': 7.37, 'Ec': 1.0, 'Eb': 3.0, + 'Q': 1.70, + 'W': 1.84, + 's': 2.5 } chromium = { @@ -296,3 +299,34 @@ 'Ec': 1.0, 'Es': 0. } + +tritium = { + 'symbol': 'T', + 'name': 'tritium', + 'Z': 1.0, + 'm': 3.0, + 'Ec': 0.1, + 'Es': 1.5, +} + +iron = { + 'symbol': 'Fe', + 'name': 'iron', + 'Z': 26.0, + 'm': 55.845, + 'Q': 0.75, + 'W': 1.20, + 's': 2.5, + 'Es': 4.28, +} + +molybdenum = { + 'symbol': 'Mo', + 'name': 'molybdenum', + 'Z': 42.0, + 'm': 95.95, + 'Q': 0.85, + 'W': 2.39, + 's': 2.8, + 'Es': 6.82, +} From 19d783ec04b3678ca43a76d82dcbe42215df01f1 Mon Sep 17 00:00:00 2001 From: "sonatav2@illinois.edu" <42747051+sonatav2@users.noreply.github.com> Date: Tue, 3 Dec 2024 08:37:01 -0500 Subject: [PATCH 2/2] Adds Fe, Mo, and T and corrects Q/W/s/Es values using Yamamura and Tawara 1996, addressing #212 --- scripts/materials.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/materials.py b/scripts/materials.py index f3fc0a6..d732c07 100644 --- a/scripts/materials.py +++ b/scripts/materials.py @@ -6,7 +6,7 @@ 'Es': 4.84, 'Ec': 3.5, 'Eb': 3., - 'Q': 0.58, + 'Q': 0.54, 'n': 5.67e28, 'W': 2.57, 's': 2.5 @@ -132,10 +132,10 @@ 'Z': 5.0, 'm': 10.811, 'n': 1.309E29, - 'Es': 5.76, + 'Es': 5.77, 'Eb': 0., 'Ec': 5., - 'Q': 4.6, + 'Q': 2.62, 'W': 4.39, 's': 2.5 } @@ -250,10 +250,10 @@ 'Z': 74.0, 'm': 183.84, 'n': 6.306E28, - 'Es': 8.79, + 'Es': 8.9, 'Eb': 0., 'Ec': 3.0, - 'Q': 1.10, + 'Q': 0.72, 'W': 2.14, 's': 2.8 }