From c3f780c88dd2034f09994bb21dc9b09778f00d20 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 16 Oct 2020 14:31:45 +0200
Subject: [PATCH] fixed some warnings
---
Environment/MediumProperties.h | 21 ++++++++++++-------
Environment/MediumPropertyModel.h | 5 +----
Environment/testEnvironment.cc | 18 +++++++---------
Framework/Utilities/SaveBoostHistogram.hpp | 2 +-
.../CONEXSourceCut/testCONEXSourceCut.cc | 2 +-
Setup/SetupEnvironment.h | 4 ++--
6 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/Environment/MediumProperties.h b/Environment/MediumProperties.h
index 4e3d433d0..969f34c0c 100644
--- a/Environment/MediumProperties.h
+++ b/Environment/MediumProperties.h
@@ -17,10 +17,19 @@ namespace corsika::environment {
* components.
**/
- enum class MediumType { Unknown, Element, RadioactiveElement, InorganicCompound, OrganicCompound, Polymer, Mixture, BiologicalDosimetry };
+ enum class MediumType {
+ Unknown,
+ Element,
+ RadioactiveElement,
+ InorganicCompound,
+ OrganicCompound,
+ Polymer,
+ Mixture,
+ BiologicalDosimetry
+ };
enum class State { Unknown, Solid, Liquid, Gas, DiatomicGas };
-
+
enum class Medium : int16_t;
using MediumIntType = std::underlying_type<Medium>::type;
@@ -51,8 +60,8 @@ namespace corsika::environment {
double dlt0_;
std::string name() const { return name_; }
- std::string pretty_name() const {return pretty_name_; }
- double weight() const {return weight_; }
+ std::string pretty_name() const { return pretty_name_; }
+ double weight() const { return weight_; }
int weight_significant_figure() const { return weight_significant_figure_; }
int weight_error_last_digit() const { return weight_error_last_digit_; }
double Z_over_A() const { return Z_over_A_; }
@@ -72,14 +81,12 @@ namespace corsika::environment {
} // namespace corsika::environment
-
#include <corsika/environment/GeneratedMediaProperties.inc>
-
namespace corsika::environment {
constexpr MediumData const& mediumData(Medium const m) {
return detail::medium_data[static_cast<MediumIntType>(m)];
}
-
+
} // namespace corsika::environment
diff --git a/Environment/MediumPropertyModel.h b/Environment/MediumPropertyModel.h
index ca5bcb51c..bf05be4dc 100644
--- a/Environment/MediumPropertyModel.h
+++ b/Environment/MediumPropertyModel.h
@@ -48,10 +48,7 @@ namespace corsika::environment {
return medium_;
}
- void set_medium(Medium v) {
- medium_ = v;
- }
-
+ void set_medium(Medium v) { medium_ = v; }
}; // END: class MediumPropertyModel
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 4d478b9b2..5373670a0 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -16,10 +16,10 @@
#include <corsika/environment/InhomogeneousMedium.h>
#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
#include <corsika/environment/LinearApproximationIntegrator.h>
+#include <corsika/environment/MediumPropertyModel.h>
#include <corsika/environment/NuclearComposition.h>
#include <corsika/environment/SlidingPlanarExponential.h>
#include <corsika/environment/UniformMagneticField.h>
-#include <corsika/environment/MediumPropertyModel.h>
#include <corsika/environment/UniformRefractiveIndex.h>
#include <corsika/environment/VolumeTreeNode.h>
#include <corsika/geometry/Line.h>
@@ -399,20 +399,18 @@ TEST_CASE("UniformRefractiveIndex w/ Homogeneous") {
CHECK((medium.ArclengthFromGrammage(trajectory, density * 5_m) / 5_m) == Approx(1));
}
-
TEST_CASE("MediumProperties") {
// test access of medium properties via enum and class types
-
+
const Medium type = Medium::AirDry1Atm;
const MediumData& air = mediumData(type);
- CHECK(air.Ieff() == 85.7 );
- CHECK(air.Cbar() == 10.5961 );
- CHECK(air.x0() == 1.7418 );
- CHECK(air.x1() == 4.2759 );
- CHECK(air.sk() == 3.3994 );
- CHECK(air.dlt0() == 0.0 );
-
+ CHECK(air.Ieff() == 85.7);
+ CHECK(air.Cbar() == 10.5961);
+ CHECK(air.x0() == 1.7418);
+ CHECK(air.x1() == 4.2759);
+ CHECK(air.sk() == 3.3994);
+ CHECK(air.dlt0() == 0.0);
}
TEST_CASE("MediumPropertyModel w/ Homogeneous") {
diff --git a/Framework/Utilities/SaveBoostHistogram.hpp b/Framework/Utilities/SaveBoostHistogram.hpp
index 55bf48292..c6ffbe064 100644
--- a/Framework/Utilities/SaveBoostHistogram.hpp
+++ b/Framework/Utilities/SaveBoostHistogram.hpp
@@ -41,7 +41,7 @@ namespace corsika::utl {
std::vector<char> axis_types;
axis_types.reserve(rank);
- for (int i = 0; i < rank; ++i) {
+ for (unsigned int i = 0; i < rank; ++i) {
auto const& ax = h.axis(i);
unsigned const has_underflow = (ax.options() & 0x01) ? 1 : 0;
unsigned const has_overflow = (ax.options() & 0x02) ? 1 : 0;
diff --git a/Processes/CONEXSourceCut/testCONEXSourceCut.cc b/Processes/CONEXSourceCut/testCONEXSourceCut.cc
index a29ea3d32..dabed2edf 100644
--- a/Processes/CONEXSourceCut/testCONEXSourceCut.cc
+++ b/Processes/CONEXSourceCut/testCONEXSourceCut.cc
@@ -10,8 +10,8 @@
#include <corsika/environment/Environment.h>
#include <corsika/environment/LayeredSphericalAtmosphereBuilder.h>
-#include <corsika/environment/UniformMagneticField.h>
#include <corsika/environment/MediumPropertyModel.h>
+#include <corsika/environment/UniformMagneticField.h>
#include <corsika/geometry/Point.h>
#include <corsika/geometry/RootCoordinateSystem.h>
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 239a0105b..f4265e3dd 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -30,8 +30,8 @@ namespace corsika::setup {
#include <corsika/environment/HomogeneousMedium.h>
#include <corsika/environment/InhomogeneousMedium.h>
-#include <corsika/environment/UniformMagneticField.h>
#include <corsika/environment/MediumPropertyModel.h>
+#include <corsika/environment/UniformMagneticField.h>
/**
* standard environment for unit testing. This can be moved to
@@ -59,7 +59,7 @@ namespace corsika::setup::testing {
* construct suited environment medium model:
*/
using MyHomogeneousModel =
- environment::MediumPropertyModel<environment::UniformMagneticField<
+ environment::MediumPropertyModel<environment::UniformMagneticField<
environment::HomogeneousMedium<setup::EnvironmentInterface>>>;
world->SetModelProperties<MyHomogeneousModel>(
--
GitLab