IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 4c6bff16 authored by Remy Prechelt's avatar Remy Prechelt Committed by ralfulrich
Browse files

Changes to core framework due to API changes.

parent acc57b53
No related branches found
No related tags found
1 merge request!280Refactory 2020
......@@ -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
......
......@@ -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
......@@ -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
......
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