Skip to content
Snippets Groups Projects
Commit 862a9a18 authored by renchao.lu's avatar renchao.lu
Browse files

[CL] Drop chemical system map.

parent a7dc3f53
No related branches found
No related tags found
No related merge requests found
...@@ -84,11 +84,8 @@ createChemicalSolverInterface<ChemicalSolver::Phreeqc>( ...@@ -84,11 +84,8 @@ createChemicalSolverInterface<ChemicalSolver::Phreeqc>(
auto path_to_database = parseDatabasePath(config); auto path_to_database = parseDatabasePath(config);
// chemical system // chemical system
auto chemical_system_map = auto chemical_system =
*mesh.getProperties().template getPropertyVector<std::size_t>( PhreeqcIOData::createChemicalSystem(config, *meshes[0]);
"bulk_node_ids", MeshLib::MeshItemType::Node, 1);
auto chemical_system = PhreeqcIOData::createChemicalSystem(
config, *meshes[0], chemical_system_map);
// rates // rates
auto reaction_rates = createReactionRates<PhreeqcIOData::ReactionRate>( auto reaction_rates = createReactionRates<PhreeqcIOData::ReactionRate>(
......
...@@ -22,8 +22,7 @@ namespace ChemistryLib ...@@ -22,8 +22,7 @@ namespace ChemistryLib
namespace PhreeqcIOData namespace PhreeqcIOData
{ {
std::unique_ptr<ChemicalSystem> createChemicalSystem( std::unique_ptr<ChemicalSystem> createChemicalSystem(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh, BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh)
MeshLib::PropertyVector<std::size_t> const& chemical_system_map)
{ {
// solution // solution
auto aqueous_solution = createAqueousSolution( auto aqueous_solution = createAqueousSolution(
...@@ -33,14 +32,12 @@ std::unique_ptr<ChemicalSystem> createChemicalSystem( ...@@ -33,14 +32,12 @@ std::unique_ptr<ChemicalSystem> createChemicalSystem(
// kinetic reactants // kinetic reactants
auto kinetic_reactants = createKineticReactants( auto kinetic_reactants = createKineticReactants(
//! \ogs_file_param{prj__chemical_system__kinetic_reactants} //! \ogs_file_param{prj__chemical_system__kinetic_reactants}
config.getConfigSubtreeOptional("kinetic_reactants"), mesh, config.getConfigSubtreeOptional("kinetic_reactants"), mesh);
chemical_system_map);
// equilibrium reactants // equilibrium reactants
auto equilibrium_reactants = createEquilibriumReactants( auto equilibrium_reactants = createEquilibriumReactants(
//! \ogs_file_param{prj__chemical_system__equilibrium_reactants} //! \ogs_file_param{prj__chemical_system__equilibrium_reactants}
config.getConfigSubtreeOptional("equilibrium_reactants"), mesh, config.getConfigSubtreeOptional("equilibrium_reactants"), mesh);
chemical_system_map);
return std::make_unique<ChemicalSystem>(std::move(aqueous_solution), return std::make_unique<ChemicalSystem>(std::move(aqueous_solution),
std::move(kinetic_reactants), std::move(kinetic_reactants),
......
...@@ -20,9 +20,6 @@ class ConfigTree; ...@@ -20,9 +20,6 @@ class ConfigTree;
namespace MeshLib namespace MeshLib
{ {
class Mesh; class Mesh;
template <typename PROP_VAL_TYPE>
class PropertyVector;
} // namespace MeshLib } // namespace MeshLib
namespace ChemistryLib namespace ChemistryLib
...@@ -32,7 +29,6 @@ namespace PhreeqcIOData ...@@ -32,7 +29,6 @@ namespace PhreeqcIOData
struct ChemicalSystem; struct ChemicalSystem;
std::unique_ptr<ChemicalSystem> createChemicalSystem( std::unique_ptr<ChemicalSystem> createChemicalSystem(
BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh, BaseLib::ConfigTree const& config, MeshLib::Mesh const& mesh);
MeshLib::PropertyVector<std::size_t> const& chemical_system_map);
} // namespace PhreeqcIOData } // namespace PhreeqcIOData
} // namespace ChemistryLib } // namespace ChemistryLib
...@@ -21,8 +21,7 @@ namespace PhreeqcIOData ...@@ -21,8 +21,7 @@ namespace PhreeqcIOData
{ {
std::vector<EquilibriumReactant> createEquilibriumReactants( std::vector<EquilibriumReactant> createEquilibriumReactants(
boost::optional<BaseLib::ConfigTree> const& config, boost::optional<BaseLib::ConfigTree> const& config,
MeshLib::Mesh const& mesh, MeshLib::Mesh const& mesh)
MeshLib::PropertyVector<std::size_t> const& chemical_system_map)
{ {
if (!config) if (!config)
{ {
......
...@@ -34,7 +34,6 @@ struct EquilibriumReactant; ...@@ -34,7 +34,6 @@ struct EquilibriumReactant;
std::vector<EquilibriumReactant> createEquilibriumReactants( std::vector<EquilibriumReactant> createEquilibriumReactants(
boost::optional<BaseLib::ConfigTree> const& config, boost::optional<BaseLib::ConfigTree> const& config,
MeshLib::Mesh const& mesh, MeshLib::Mesh const& mesh);
MeshLib::PropertyVector<std::size_t> const& chemical_system_map);
} // namespace PhreeqcIOData } // namespace PhreeqcIOData
} // namespace ChemistryLib } // namespace ChemistryLib
...@@ -21,8 +21,7 @@ namespace PhreeqcIOData ...@@ -21,8 +21,7 @@ namespace PhreeqcIOData
{ {
std::vector<KineticReactant> createKineticReactants( std::vector<KineticReactant> createKineticReactants(
boost::optional<BaseLib::ConfigTree> const& config, boost::optional<BaseLib::ConfigTree> const& config,
MeshLib::Mesh const& mesh, MeshLib::Mesh const& mesh)
MeshLib::PropertyVector<std::size_t> const& chemical_system_map)
{ {
if (!config) if (!config)
{ {
......
...@@ -34,7 +34,6 @@ struct KineticReactant; ...@@ -34,7 +34,6 @@ struct KineticReactant;
std::vector<KineticReactant> createKineticReactants( std::vector<KineticReactant> createKineticReactants(
boost::optional<BaseLib::ConfigTree> const& config, boost::optional<BaseLib::ConfigTree> const& config,
MeshLib::Mesh const& mesh, MeshLib::Mesh const& mesh);
MeshLib::PropertyVector<std::size_t> const& chemical_system_map);
} // namespace PhreeqcIOData } // namespace PhreeqcIOData
} // namespace ChemistryLib } // namespace ChemistryLib
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment