From 8ab20082698f40fca3f70c7755aee875372a136e Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Wed, 12 Jun 2019 00:00:54 +0200
Subject: [PATCH] [CL] kinetic reactant constructor.
---
ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp | 4 ++--
ChemistryLib/PhreeqcIOData/KineticReactant.h | 8 +++-----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
index c740c6c3e8d..ac9be9045e4 100644
--- a/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
+++ b/ChemistryLib/PhreeqcIOData/CreateKineticReactant.cpp
@@ -40,8 +40,8 @@ std::vector<KineticReactant> createKineticReactants(
auto parameters =
//! \ogs_file_param{prj__chemical_system__kinetic_reactants__kinetic_reactant__parameters}
- reactant_config.getConfigParameterOptional<std::vector<double>>(
- "parameters");
+ reactant_config.getConfigParameter<std::vector<double>>(
+ "parameters", {});
kinetic_reactants.emplace_back(std::move(name),
std::move(chemical_formula),
diff --git a/ChemistryLib/PhreeqcIOData/KineticReactant.h b/ChemistryLib/PhreeqcIOData/KineticReactant.h
index 4cfd0325cd3..351c8e45aed 100644
--- a/ChemistryLib/PhreeqcIOData/KineticReactant.h
+++ b/ChemistryLib/PhreeqcIOData/KineticReactant.h
@@ -20,16 +20,14 @@ namespace ChemistryLib
{
struct KineticReactant
{
- KineticReactant(std::string name_,
+ KineticReactant(std::string&& name_,
std::string&& chemical_formula_,
double amount_,
- boost::optional<std::vector<double>>
- parameters_)
+ std::vector<double>&& parameters_)
: name(std::move(name_)),
chemical_formula(std::move(chemical_formula_)),
amount(amount_),
- parameters(parameters_ ? std::move(*parameters_)
- : std::vector<double>{})
+ parameters(std::move(parameters_))
{
}
--
GitLab