From 4c6bff169e69af96993dd1f9382a48e3b67f52c7 Mon Sep 17 00:00:00 2001
From: Remy Prechelt <prechelt@hawaii.edu>
Date: Mon, 16 Nov 2020 23:19:13 -1000
Subject: [PATCH] Changes to core framework due to API changes.
---
corsika/detail/framework/core/Cascade.inl | 2 +-
corsika/media/DensityFunction.hpp | 6 +++---
corsika/media/LinearApproximationIntegrator.hpp | 17 ++++++++---------
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/corsika/detail/framework/core/Cascade.inl b/corsika/detail/framework/core/Cascade.inl
index 6fc0a88aa..841a9f620 100644
--- a/corsika/detail/framework/core/Cascade.inl
+++ b/corsika/detail/framework/core/Cascade.inl
@@ -106,7 +106,7 @@ namespace corsika {
// convert next_step from grammage to length
LengthType const distance_interact =
- currentLogicalNode->GetModelProperties().ArclengthFromGrammage(step,
+ currentLogicalNode->GetModelProperties().arclengthFromGrammage(step,
next_interact);
// determine the maximum geometric step length
diff --git a/corsika/media/DensityFunction.hpp b/corsika/media/DensityFunction.hpp
index 8daf12dfa..b22b54961 100644
--- a/corsika/media/DensityFunction.hpp
+++ b/corsika/media/DensityFunction.hpp
@@ -21,13 +21,13 @@ namespace corsika {
: public TIntegrator<DensityFunction<TDerivableRho, TIntegrator>> {
friend class TIntegrator<DensityFunction<TDerivableRho, TIntegrator>>;
- TDerivableRho fRho; //!< functor for density
+ TDerivableRho rho_; //!< functor for density
public:
DensityFunction(TDerivableRho rho)
- : fRho(rho) {}
+ : rho_(rho) {}
- MassDensityType EvaluateAt(corsika::Point const& p) const { return fRho(p); }
+ MassDensityType evaluateAt(corsika::Point const& p) const { return rho_(p); }
};
} // namespace corsika
diff --git a/corsika/media/LinearApproximationIntegrator.hpp b/corsika/media/LinearApproximationIntegrator.hpp
index ccacc9d60..ac49879dd 100644
--- a/corsika/media/LinearApproximationIntegrator.hpp
+++ b/corsika/media/LinearApproximationIntegrator.hpp
@@ -15,20 +15,19 @@
namespace corsika {
- template <class TDerived>
+ template <typename TDerived>
class LinearApproximationIntegrator {
-
- auto const& GetImplementation() const;
+ auto const& getImplementation() const;
public:
- inline auto IntegrateGrammage(corsika::Trajectory<corsika::Line> const& line,
- LengthType length) const;
+ auto integrateGrammage(Trajectory<Line> const& line,
+ units::si::LengthType length) const;
- inline auto ArclengthFromGrammage(corsika::Trajectory<corsika::Line> const& line,
- GrammageType grammage) const;
+ auto arclengthFromGrammage(Trajectory<Line> const& line,
+ units::si::GrammageType grammage) const;
- inline auto MaximumLength(corsika::Trajectory<corsika::Line> const& line,
- [[maybe_unused]] double relError) const;
+ auto maximumLength(Trajectory<Line> const& line,
+ [[maybe_unused]] double relError) const;
};
} // namespace corsika
--
GitLab