From c05f816184a3b19f38bc5f885cd155c087549c2d Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Fri, 11 Nov 2016 10:22:41 +0100
Subject: [PATCH] [PL] renamed member
---
ProcessLib/Parameter/CurveScaledParameter.h | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/ProcessLib/Parameter/CurveScaledParameter.h b/ProcessLib/Parameter/CurveScaledParameter.h
index 1f5ce15f79a..7d0d80ff3eb 100644
--- a/ProcessLib/Parameter/CurveScaledParameter.h
+++ b/ProcessLib/Parameter/CurveScaledParameter.h
@@ -12,8 +12,8 @@
#include <map>
#include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h"
-#include "ProcessLib/Utils/ProcessUtils.h"
#include "Parameter.h"
+#include "ProcessLib/Utils/ProcessUtils.h"
namespace ProcessLib
{
@@ -21,19 +21,20 @@ template <typename T>
struct CurveScaledParameter final : public Parameter<T> {
CurveScaledParameter(std::string const& name_,
MathLib::PiecewiseLinearInterpolation const& curve,
- std::string const& parameter_name)
- : Parameter<T>(name_), _curve(curve), _parameter_name(parameter_name)
+ std::string const& referenced_parameter_name)
+ : Parameter<T>(name_),
+ _curve(curve),
+ _referenced_parameter_name(referenced_parameter_name)
{
}
bool isTimeDependent() const override { return true; }
-
void initialize(
- std::vector<
- std::unique_ptr<ProcessLib::ParameterBase>> const& parameters)
- override
+ std::vector<std::unique_ptr<ProcessLib::ParameterBase>> const&
+ parameters) override
{
- _parameter = &findParameter<T>(_parameter_name, parameters, 0);
+ _parameter =
+ &findParameter<T>(_referenced_parameter_name, parameters, 0);
_cache.resize(_parameter->getNumberOfComponents());
}
@@ -49,7 +50,7 @@ struct CurveScaledParameter final : public Parameter<T> {
auto const scaling = _curve.getValue(t);
auto const num_comp = _parameter->getNumberOfComponents();
- for (std::size_t c=0; c<num_comp; ++c) {
+ for (std::size_t c = 0; c < num_comp; ++c) {
_cache[c] = scaling * tup[c];
}
return _cache;
@@ -59,7 +60,7 @@ private:
MathLib::PiecewiseLinearInterpolation const& _curve;
Parameter<double> const* _parameter;
mutable std::vector<double> _cache;
- std::string const _parameter_name;
+ std::string const _referenced_parameter_name;
};
std::unique_ptr<ParameterBase> createCurveScaledParameter(
--
GitLab