Skip to content

Commit

Permalink
fix component <-> medium error
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximilian Sackel committed Oct 13, 2024
1 parent 226f8d1 commit 8b0da34
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion src/PROPOSAL/PROPOSAL/medium/Medium.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
17 changes: 0 additions & 17 deletions src/pyPROPOSAL/detail/components.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
1 change: 0 additions & 1 deletion src/pyPROPOSAL/detail/medium.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 8b0da34

Please sign in to comment.