diff --git a/src/PROPOSAL/PROPOSAL/medium/Medium.h b/src/PROPOSAL/PROPOSAL/medium/Medium.h index 7e4f1e3c..4bdc4b67 100644 --- a/src/PROPOSAL/PROPOSAL/medium/Medium.h +++ b/src/PROPOSAL/PROPOSAL/medium/Medium.h @@ -284,7 +284,7 @@ MEDIUM_DEF(Phlogopite) MEDIUM_DEF(Annite) // Mica - white glimmer (solid solution) MEDIUM_DEF(Muscovite) -MEDIUM_DEF(Paragonit) +// MEDIUM_DEF(Paragonit) // Olivine Group 3% MEDIUM_DEF(Liebenbergite) diff --git a/src/pyPROPOSAL/detail/components.cxx b/src/pyPROPOSAL/detail/components.cxx index 462d8677..13562916 100644 --- a/src/pyPROPOSAL/detail/components.cxx +++ b/src/pyPROPOSAL/detail/components.cxx @@ -114,21 +114,4 @@ void init_components(py::module& m) { .def_property_readonly("hash", &Component::GetHash, R"pbdoc( Hash value of component. )pbdoc"); - - COMPONENT_DEF(m_sub, Hydrogen) - COMPONENT_DEF(m_sub, Carbon) - COMPONENT_DEF(m_sub, Nitrogen) - COMPONENT_DEF(m_sub, Oxygen) - COMPONENT_DEF(m_sub, Sodium) - COMPONENT_DEF(m_sub, Magnesium) - COMPONENT_DEF(m_sub, Sulfur) - COMPONENT_DEF(m_sub, Argon) - COMPONENT_DEF(m_sub, Potassium) - COMPONENT_DEF(m_sub, Calcium) - COMPONENT_DEF(m_sub, Iron) - COMPONENT_DEF(m_sub, Copper) - COMPONENT_DEF(m_sub, Lead) - COMPONENT_DEF(m_sub, Uranium) - COMPONENT_DEF(m_sub, StandardRock) - COMPONENT_DEF(m_sub, FrejusRock) } diff --git a/src/pyPROPOSAL/detail/medium.cxx b/src/pyPROPOSAL/detail/medium.cxx index 78d9e244..9b092675 100644 --- a/src/pyPROPOSAL/detail/medium.cxx +++ b/src/pyPROPOSAL/detail/medium.cxx @@ -147,7 +147,6 @@ void init_medium(py::module& m) MEDIUM_DEF(m_sub, Phlogopite) MEDIUM_DEF(m_sub, Annite) MEDIUM_DEF(m_sub, Muscovite) - MEDIUM_DEF(m_sub, Paragonit) MEDIUM_DEF(m_sub, Liebenbergite) MEDIUM_DEF(m_sub, Kaolinite) MEDIUM_DEF(m_sub, Calcit)