IAP GITLAB

Skip to content
Snippets Groups Projects
Commit 611b966d authored by Maximilian Reininghaus's avatar Maximilian Reininghaus :vulcan:
Browse files

introduce standardAirComposition object

parent 8e7d9024
No related branches found
No related tags found
1 merge request!499Resolve "cxroot module not working anymore after update to latest master"
...@@ -20,13 +20,7 @@ namespace corsika { ...@@ -20,13 +20,7 @@ namespace corsika {
TEnvironmentInterface, TExtraEnv>::create(center, constants::EarthRadius::Mean, TEnvironmentInterface, TExtraEnv>::create(center, constants::EarthRadius::Mean,
std::forward<TArgs>(args)...); std::forward<TArgs>(args)...);
// composition values from AIRES manual builder.setNuclearComposition(standardAirComposition);
builder.setNuclearComposition({{
Code::Nitrogen,
Code::Argon,
Code::Oxygen,
},
{0.7847, 0.0047, 1. - 0.7847 - 0.0047}});
// add the standard atmosphere layers // add the standard atmosphere layers
auto const params = atmosphereParameterList[static_cast<uint8_t>(atmId)]; auto const params = atmosphereParameterList[static_cast<uint8_t>(atmId)];
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <corsika/media/IRefractiveIndexModel.hpp> #include <corsika/media/IRefractiveIndexModel.hpp>
#include <corsika/media/LayeredSphericalAtmosphereBuilder.hpp> #include <corsika/media/LayeredSphericalAtmosphereBuilder.hpp>
#include <corsika/framework/utility/ImplementsMixin.hpp> #include <corsika/framework/utility/ImplementsMixin.hpp>
#include <corsika/media/NuclearComposition.hpp>
// for detail namespace, NoExtraModelInner, NoExtraModel and traits // for detail namespace, NoExtraModelInner, NoExtraModel and traits
#include <corsika/detail/media/LayeredSphericalAtmosphereBuilder.hpp> #include <corsika/detail/media/LayeredSphericalAtmosphereBuilder.hpp>
...@@ -204,6 +205,10 @@ namespace corsika { ...@@ -204,6 +205,10 @@ namespace corsika {
void create_5layer_atmosphere(TEnvironment& env, AtmosphereId const atmId, void create_5layer_atmosphere(TEnvironment& env, AtmosphereId const atmId,
Point const& center, TArgs... args); Point const& center, TArgs... args);
//! The standard/default air composition with fraction values based on CORSIKA 7
static inline NuclearComposition const standardAirComposition{
{Code::Nitrogen, Code::Oxygen, Code::Argon}, {0.78479, .21052, 0.00469}};
} // namespace corsika } // namespace corsika
#include <corsika/detail/media/CORSIKA7Atmospheres.inl> #include <corsika/detail/media/CORSIKA7Atmospheres.inl>
\ No newline at end of file
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