From e7cc856e9dc5054192793cc97caa796115563a2b Mon Sep 17 00:00:00 2001
From: Andre <upwli@student.kit.edu>
Date: Sun, 12 Dec 2021 11:32:14 +0100
Subject: [PATCH] epoch interpolation
---
corsika/detail/media/GeomagneticModel.inl | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/corsika/detail/media/GeomagneticModel.inl b/corsika/detail/media/GeomagneticModel.inl
index fc3f0711d..51dfd348e 100644
--- a/corsika/detail/media/GeomagneticModel.inl
+++ b/corsika/detail/media/GeomagneticModel.inl
@@ -95,24 +95,19 @@ namespace corsika {
int iYear = int(year);
int iEpoch = 0;
- int next_Epoch = 0;
for (auto parIt = parameters_.rbegin(); parIt != parameters_.rend(); ++parIt) {
if (parIt->first <= iYear) {
iEpoch = parIt->first;
break;
}
- if (parIt->first >= iYear) {
- next_Epoch = parIt->first;
- break;
- }
}
double epoch = double(iEpoch);
CORSIKA_LOG_DEBUG("Found Epoch {} for year {}", iEpoch, year);
if (iEpoch == 0) {
CORSIKA_LOG_WARN("Year {} is before first EPOCH. Results unclear.", year);
}
- if (altitude < -1_km || altitude > 850_km) {
- CORSIKA_LOG_WARN("Altitude should be between -1_km and 850_km.");
+ if (altitude < -1_km || altitude > 600_km) {
+ CORSIKA_LOG_WARN("Altitude should be between -1_km and 600_km.");
}
if (latitude <= -90 || latitude >= 90) {
CORSIKA_LOG_ERROR("Latitude has to be between -90 and 90 degree.");
@@ -147,10 +142,10 @@ namespace corsika {
// Time interpolation
p.g = p.g + (year - epoch) * p.dg;
p.h = p.h + (year - epoch) * p.dh;
- if (next_Epoch != 0) {
- ParameterLine next_p = parameters_[next_Epoch][j];
- p.g = p.g + (next_p.g - p.g) * (year - epoch) / (double(next_Epoch) - epoch);
- p.h = p.h + (next_p.h - p.h) * (year - epoch) / (double(next_Epoch) - epoch);
+ if (iEpoch < 2020) {
+ ParameterLine next_p = parameters_[iEpoch + 5][j];
+ p.g = p.g + (next_p.g - p.g) * (year - epoch) / 5;
+ p.h = p.h + (next_p.h - p.h) * (year - epoch) / 5;
}
legendre = pow(-1, p.m) * std::assoc_legendre(p.n, p.m, sin(lat_sph));
--
GitLab