IAP GITLAB
Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
corsika
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Air Shower Physics
corsika
Commits
611b966d
Commit
611b966d
authored
1 year ago
by
Maximilian Reininghaus
Browse files
Options
Downloads
Patches
Plain Diff
introduce standardAirComposition object
parent
8e7d9024
No related branches found
No related tags found
1 merge request
!499
Resolve "cxroot module not working anymore after update to latest master"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
corsika/detail/media/CORSIKA7Atmospheres.inl
+1
-7
1 addition, 7 deletions
corsika/detail/media/CORSIKA7Atmospheres.inl
corsika/media/CORSIKA7Atmospheres.hpp
+6
-1
6 additions, 1 deletion
corsika/media/CORSIKA7Atmospheres.hpp
with
7 additions
and
8 deletions
corsika/detail/media/CORSIKA7Atmospheres.inl
+
1
−
7
View file @
611b966d
...
@@ -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
)];
...
...
This diff is collapsed.
Click to expand it.
corsika/media/CORSIKA7Atmospheres.hpp
+
6
−
1
View file @
611b966d
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment