diff --git a/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp b/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp index 8a2d213c4e2a96e833c68ebd29305a8c0856a25f..7ea3250f458b23cead179179b4f69548d435f051 100644 --- a/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp +++ b/ChemistryLib/PhreeqcIOData/AqueousSolution.cpp @@ -48,8 +48,10 @@ void AqueousSolution::print(std::ostream& os, for (auto const& component : components) { - os << component.name << " " << (*component.amount)[chemical_system_id] - << "\n"; + os << component.name << " " << (*component.amount)[chemical_system_id]; + component.chemical_formula.empty() + ? os << "\n" + : os << " as " << component.chemical_formula << "\n"; } os << "\n\n"; diff --git a/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp b/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp index b417c69166bc4e61ff76e1b4a20a27732b4f753c..5c223863556c90be3f446dde8991572f1a39b6c5 100644 --- a/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateSolutionComponent.cpp @@ -24,14 +24,15 @@ std::vector<Component> createSolutionComponents( auto components_config = config.getConfigSubtree("components"); for ( - auto const& comp_config : + auto const& component_config : //! \ogs_file_param{prj__chemical_system__solution__components__component} components_config.getConfigSubtreeList("component")) { - auto const component_name = comp_config.getValue<std::string>(); + auto const component_name = component_config.getValue<std::string>(); auto const chemical_formula = //! \ogs_file_attr{prj__chemical_system__solution__components__component__chemical_formula} - comp_config.getConfigAttribute<std::string>("chemical_formula", ""); + component_config.getConfigAttribute<std::string>("chemical_formula", + ""); components.emplace_back(component_name, chemical_formula); }