diff --git a/ChemistryLib/CreateChemicalSolverInterface.cpp b/ChemistryLib/CreateChemicalSolverInterface.cpp index 11f677e6121ea016ae1645a21061241a5b3681f6..d440999141a2cb2066b95098c10aed82341766d5 100644 --- a/ChemistryLib/CreateChemicalSolverInterface.cpp +++ b/ChemistryLib/CreateChemicalSolverInterface.cpp @@ -84,11 +84,8 @@ createChemicalSolverInterface<ChemicalSolver::Phreeqc>( auto path_to_database = parseDatabasePath(config); // chemical system - auto chemical_system_map = - *mesh.getProperties().template getPropertyVector<std::size_t>( - "bulk_node_ids", MeshLib::MeshItemType::Node, 1); - auto chemical_system = PhreeqcIOData::createChemicalSystem( - config, *meshes[0], chemical_system_map); + auto chemical_system = + PhreeqcIOData::createChemicalSystem(config, *meshes[0]); // rates auto reaction_rates = createReactionRates<PhreeqcIOData::ReactionRate>( diff --git a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp index dc4c1a3fac0ac26347a44921a8e1580787d710d1..62e3bde9ae367d416b3f02e890a1982ce5e3a347 100644 --- a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.cpp @@ -22,8 +22,7 @@ namespace ChemistryLib namespace PhreeqcIOData { std::unique_ptr<ChemicalSystem> createChemicalSystem( - BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map) + BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh) { // solution auto aqueous_solution = createAqueousSolution( @@ -33,14 +32,12 @@ std::unique_ptr<ChemicalSystem> createChemicalSystem( // kinetic reactants auto kinetic_reactants = createKineticReactants( //! \ogs_file_param{prj__chemical_system__kinetic_reactants} - config.getConfigSubtreeOptional("kinetic_reactants"), mesh, - chemical_system_map); + config.getConfigSubtreeOptional("kinetic_reactants"), mesh); // equilibrium reactants auto equilibrium_reactants = createEquilibriumReactants( //! \ogs_file_param{prj__chemical_system__equilibrium_reactants} - config.getConfigSubtreeOptional("equilibrium_reactants"), mesh, - chemical_system_map); + config.getConfigSubtreeOptional("equilibrium_reactants"), mesh); return std::make_unique<ChemicalSystem>(std::move(aqueous_solution), std::move(kinetic_reactants), diff --git a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.h b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.h index 59962d127534d1407aaa6c0b6c5eca093220276b..8050ec680531f2ee69223adab6cc0f6f9e0b077e 100644 --- a/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.h +++ b/ChemistryLib/PhreeqcIOData/CreateChemicalSystem.h @@ -20,9 +20,6 @@ class ConfigTree; namespace MeshLib { class Mesh; - -template <typename PROP_VAL_TYPE> -class PropertyVector; } // namespace MeshLib namespace ChemistryLib @@ -32,7 +29,6 @@ namespace PhreeqcIOData struct ChemicalSystem; std::unique_ptr<ChemicalSystem> createChemicalSystem( - BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map); + BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh); } // namespace PhreeqcIOData } // namespace ChemistryLib diff --git a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp index 690e591efa6402ff790d11c6e6d35a2704c861be..01084a919f1b413117d34ca8263884e7376624e5 100644 --- a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.cpp @@ -21,8 +21,7 @@ namespace PhreeqcIOData { std::vector<EquilibriumReactant> createEquilibriumReactants( boost::optional<BaseLib::ConfigTree> const& config, - MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map) + MeshLib::Mesh const& mesh) { if (!config) { diff --git a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.h b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.h index 3b8650f23f90ed2fbb4e9c4775016a122328c05b..d8604e1fb67710a5237bb7d0cc1d14da6fd56ff4 100644 --- a/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.h +++ b/ChemistryLib/PhreeqcIOData/CreateEquilibriumReactants.h @@ -34,7 +34,6 @@ struct EquilibriumReactant; std::vector<EquilibriumReactant> createEquilibriumReactants( boost::optional<BaseLib::ConfigTree> const& config, - MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map); + MeshLib::Mesh const& mesh); } // namespace PhreeqcIOData } // namespace ChemistryLib diff --git a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp index 5d0563fdb993795417db396dc182bf431fb5f018..1d3af1d9068e9bcf09fe338b4e59af810c75598e 100644 --- a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp @@ -21,8 +21,7 @@ namespace PhreeqcIOData { std::vector<KineticReactant> createKineticReactants( boost::optional<BaseLib::ConfigTree> const& config, - MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map) + MeshLib::Mesh const& mesh) { if (!config) { diff --git a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.h b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.h index e7e62951cc904aee2dd9c66e33889c4448a5daa5..490b3cb0d6e5ed644abafefc7c7952b41b73160e 100644 --- a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.h +++ b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.h @@ -34,7 +34,6 @@ struct KineticReactant; std::vector<KineticReactant> createKineticReactants( boost::optional<BaseLib::ConfigTree> const& config, - MeshLib::Mesh const& mesh, - MeshLib::PropertyVector<std::size_t> const& chemical_system_map); + MeshLib::Mesh const& mesh); } // namespace PhreeqcIOData } // namespace ChemistryLib