From 4fbecb2aeb30787d00f41e68535b5467da338c1e Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Tue, 8 Jan 2019 10:53:05 +0100
Subject: [PATCH] maxStepLength as parameter for NullModel
---
CMakeLists.txt | 2 +-
Framework/Cascade/Cascade.h | 3 ++-
Processes/NullModel/NullModel.h | 6 +++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b7a37854c..4a6364a5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ endif()
# enable warnings and disallow non-standard language
set(CMAKE_CXX_FLAGS "-Wall -pedantic -Wextra -Wno-ignored-qualifiers")
set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g")
# clang produces a lot of unecessary warnings without this:
add_compile_options("$<$<CXX_COMPILER_ID:Clang>:-Wno-nonportable-include-path>")
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index 6aed37d64..ae8b18932 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -47,7 +47,8 @@ namespace corsika::cascade {
void Run() {
while (!fStack.IsEmpty()) {
while (!fStack.IsEmpty()) {
- Particle& pNext = *fStack.GetNextParticle();
+ auto pNext = fStack.GetNextParticle();
+ //std::cout << pNext
Step(pNext);
}
// do cascade equations, which can put new particles on Stack,
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index e1fc5b3ff..428069f12 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -17,11 +17,11 @@
namespace corsika::process::null_model {
class NullModel : public corsika::process::ContinuousProcess<NullModel> {
- corsika::units::si::LengthType fMaxStepLength{
- corsika::units::si::meter * std::numeric_limits<double>::infinity()};
+ corsika::units::si::LengthType const fMaxStepLength;
public:
- NullModel(corsika::units::si::LengthType maxStepLength)
+ NullModel(corsika::units::si::LengthType maxStepLength =
+ corsika::units::si::meter * std::numeric_limits<double>::infinity())
: fMaxStepLength(maxStepLength) {}
void Init();
--
GitLab