From 011515ea4a6a363e3000b4f957593135964d04ea Mon Sep 17 00:00:00 2001 From: jdkio <68720233+jdkio@users.noreply.github.com> Date: Wed, 12 Feb 2025 11:01:27 -0500 Subject: [PATCH] Fix rock density --- duneggd/LocalTools/materialdefinition.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/duneggd/LocalTools/materialdefinition.py b/duneggd/LocalTools/materialdefinition.py index 01a7bd47..e53eaf0b 100644 --- a/duneggd/LocalTools/materialdefinition.py +++ b/duneggd/LocalTools/materialdefinition.py @@ -56,19 +56,17 @@ def define_materials( g ): TiO2 = g.matter.Molecule("TiO2", density="4.23*g/cc", elements=(("titanium",1),("oxygen",2))) Fe2O3 = g.matter.Molecule("Fe2O3", density="5.24*g/cc", elements=(("iron",2),("oxygen",3))) - rock = g.matter.Mixture( "Rock", density = "2.82*g/cc", + rock = g.matter.Mixture( "Rock", density = "2.33*g/cc", components = ( - ("SiO2", 0.5267), - ("FeO", 0.1174), - ("Al2O3", 0.1025), - ("oxygen", 0.0771), - ("MgO", 0.0473), - ("CO2", 0.0422), - ("CaO", 0.0382), - ("carbon", 0.0240), - ("sulfur", 0.0186), - ("Na2O", 0.0053), - ("P2O5", 0.0007), + ("hydrogen", 0.0147547), + ("carbon", 0.0114328), + ("oxygen", 0.0431255), + ("calcium", 0.0431250), + ("sodium", 0.0028548), + ("aluminum", 0.0946920), + ("iron", 0.0179492), + ("silicon", 0.2420140), + ("potassium", 0.0093778), )) dirt = g.matter.Mixture( "Dirt", density = "1.7*g/cc",