diff --git a/MaterialsLib/Adsorption/Reaction.cpp b/MaterialsLib/Adsorption/Reaction.cpp index bc9c390779bf4cb4e1f4df061e4d6b3eac291765..f445ba2f197e5818fc63842556a57b254a2c4e19 100644 --- a/MaterialsLib/Adsorption/Reaction.cpp +++ b/MaterialsLib/Adsorption/Reaction.cpp @@ -30,7 +30,7 @@ namespace Adsorption std::unique_ptr<Reaction> Reaction:: -newInstance(BaseLib::ConfigTreeNew const& conf) +newInstance(BaseLib::ConfigTree const& conf) { auto const type = conf.getConfParam<std::string>("type"); diff --git a/MaterialsLib/Adsorption/Reaction.h b/MaterialsLib/Adsorption/Reaction.h index 41468410d60c55e882ebc55a3235f1848b6c64ea..4e721c98dffdbc1d20f58778bb8c21be2f2c4281 100644 --- a/MaterialsLib/Adsorption/Reaction.h +++ b/MaterialsLib/Adsorption/Reaction.h @@ -11,7 +11,7 @@ #include<memory> -#include "BaseLib/ConfigTreeNew.h" +#include "BaseLib/ConfigTree.h" namespace Adsorption { @@ -19,7 +19,7 @@ namespace Adsorption class Reaction { public: - static std::unique_ptr<Reaction> newInstance(BaseLib::ConfigTreeNew const& rsys); + static std::unique_ptr<Reaction> newInstance(BaseLib::ConfigTree const& rsys); virtual double get_enthalpy(const double p_Ads, const double T_Ads, const double M_Ads) const = 0; virtual double get_reaction_rate(const double p_Ads, const double T_Ads, diff --git a/MaterialsLib/Adsorption/ReactionCaOH2.h b/MaterialsLib/Adsorption/ReactionCaOH2.h index f6da1806c1730f5ca64bb1e524d943638b2f00d9..28e11817a1bce5fc748a9d192c7fe9c077b654ca 100644 --- a/MaterialsLib/Adsorption/ReactionCaOH2.h +++ b/MaterialsLib/Adsorption/ReactionCaOH2.h @@ -24,7 +24,7 @@ namespace Adsorption class ReactionCaOH2 final : public Reaction { public: - explicit ReactionCaOH2(BaseLib::ConfigTreeNew const& conf) + explicit ReactionCaOH2(BaseLib::ConfigTree const& conf) : ode_solver_config{conf.getConfSubtree("ode_solver_config")} { /*auto const param = conf.get_optional<double>("reaction_enthalpy"); @@ -42,7 +42,7 @@ public: double get_reaction_rate(const double /*p_Ads*/, const double /*T_Ads*/, const double /*M_Ads*/, const double /*loading*/) const override; - const BaseLib::ConfigTreeNew& getOdeSolverConfig() const { return ode_solver_config; } + const BaseLib::ConfigTree& getOdeSolverConfig() const { return ode_solver_config; } // TODO merge with get_reaction_rate() double getReactionRate(double const solid_density); @@ -77,7 +77,7 @@ private: static constexpr double tol_u = 1.0 - 1e-4; static constexpr double tol_rho = 0.1; - const BaseLib::ConfigTreeNew ode_solver_config; + const BaseLib::ConfigTree ode_solver_config; template<typename> friend class ProcessLib::TESFEMReactionAdaptorCaOH2;