From f413389834f4d436d6798f39e200e59c89e8e5f0 Mon Sep 17 00:00:00 2001
From: Andre <upwli@student.kit.edu>
Date: Wed, 1 Dec 2021 16:28:56 +0100
Subject: [PATCH] changed int inl file
---
corsika/media/WMM.hpp | 41 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 41 insertions(+)
diff --git a/corsika/media/WMM.hpp b/corsika/media/WMM.hpp
index 054ec1c49..1fa713406 100644
--- a/corsika/media/WMM.hpp
+++ b/corsika/media/WMM.hpp
@@ -1,3 +1,4 @@
+<<<<<<< Updated upstream
/*
* (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
*
@@ -102,3 +103,43 @@ namespace corsika {
return MagneticFieldVector{Cs, magneticfield_geo[0] * 1_nT, magneticfield_geo[1] * 1_nT, magneticfield_geo[2] * -1_nT};
}
}
+=======
+/*
+ * (c) Copyright 2020 CORSIKA Project, corsika-project@lists.kit.edu
+ *
+ * This software is distributed under the terms of the GNU General Public
+ * Licence version 3 (GPL Version 3). See file LICENSE for a full version of
+ * the license.
+ */
+
+#include <boost/filesystem.hpp>
+#include <boost/math/special_functions/factorials.hpp>
+#include <boost/math/special_functions/legendre.hpp>
+
+#include <cmath>
+#include <corsika/framework/core/Logging.hpp>
+#include <corsika/framework/utility/CorsikaData.hpp>
+#include <fstream>
+
+namespace corsika {
+ /**
+ * A magnetic field calculated with the WMM model
+ *
+ * @param year Year of the evaluation, between 2020 and 2025.
+ * @param altitude Height of the location to evaluate the field at,
+ in km between -1 and 850.
+ * @param latitude Latitude of the location to evaluate the field at,
+ in degrees between -90 and 90 (negative for southern hemisphere).
+ * @param longitute Longitude of the location to evaluate the field at,
+ in degrees between -180 and 180 (negative for western hemisphere).
+ *
+ * @returns The magnetic field vector in nT.
+ *
+ */
+
+ inline MagneticFieldVector get_wmm(const CoordinateSystemPtr Cs, const double year,
+ const LengthType altitude, const double latitude, const double longitude);
+} // namespace corsika
+
+#include <corsika/detail/media/WMM.inl>
+>>>>>>> Stashed changes
--
GitLab