diff --git a/conanfile.txt b/conanfile.txt index 906a16ab8e42727d794633b364b772f6644cfd75..4bd98bd6a0baaedbbc3ee2f51bc42c160579eee5 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -1,5 +1,6 @@ [requires] -spdlog/1.8.0 +readline/8.0 # this is only needed to fix a missing dependency in "bison" which is pulled-in by arrow +spdlog/1.8.5 catch2/2.13.3 eigen/3.3.8 boost/1.75.0 @@ -11,6 +12,7 @@ arrow/2.0.0 cmake [options] +readline:shared=True arrow:shared=False arrow:parquet=True arrow:fPIC=False @@ -23,3 +25,4 @@ arrow:with_grpc=False arrow:with_utf8proc=False arrow:with_zstd=False arrow:with_bz2=False + diff --git a/corsika/detail/output/BaseOutput.inl b/corsika/detail/output/BaseOutput.inl index 21631fea9e13963280bf6049a67fab047d3cfbcd..39710531edf5070d90fbcae3e368ca4e9e688169 100644 --- a/corsika/detail/output/BaseOutput.inl +++ b/corsika/detail/output/BaseOutput.inl @@ -10,6 +10,6 @@ namespace corsika { BaseOutput::BaseOutput() - : shower_(0){} + : shower_(0) {} -} +} // namespace corsika diff --git a/corsika/detail/output/OutputManager.inl b/corsika/detail/output/OutputManager.inl index f7936166cc09e586ec28f573be33b7bb0c10ab0b..15b361507126a1da8d7989b0e23180d867f2de76 100644 --- a/corsika/detail/output/OutputManager.inl +++ b/corsika/detail/output/OutputManager.inl @@ -21,7 +21,7 @@ namespace corsika { void OutputManager::writeNode(YAML::Node const& node, - std::filesystem::path const& path) const { + boost::filesystem::path const& path) const { // construct a YAML emitter for this config file YAML::Emitter out; @@ -92,7 +92,7 @@ namespace corsika { auto const path{root_ / name}; // create the directory for this process. - std::filesystem::create_directory(path); + boost::filesystem::create_directory(path); // get the config for this output auto config = outputs_.at(name).get().getConfig(); @@ -106,12 +106,12 @@ namespace corsika { OutputManager::OutputManager( std::string const& name, - std::filesystem::path const& dir = std::filesystem::current_path()) + boost::filesystem::path const& dir = boost::filesystem::current_path()) : name_(name) , root_(dir / name) { // check if this directory already exists - if (std::filesystem::exists(root_)) { + if (boost::filesystem::exists(root_)) { logger->warn( "Output directory '{}' already exists! This is currenty not supported.", root_.string()); @@ -119,7 +119,7 @@ namespace corsika { } // construct the directory for this library - std::filesystem::create_directory(root_); + boost::filesystem::create_directory(root_); // write the top level config file writeTopLevelConfig(); diff --git a/corsika/output/BaseOutput.hpp b/corsika/output/BaseOutput.hpp index a5ebc483ab2475e2718eab29ec88bc3e8d58be75..023b9b884ccb0594f4d95f9beefb9eebe6c4a5d5 100644 --- a/corsika/output/BaseOutput.hpp +++ b/corsika/output/BaseOutput.hpp @@ -7,8 +7,7 @@ */ #pragma once -//#include <memory> -#include <filesystem> +#include <boost/filesystem> #include <yaml-cpp/yaml.h> @@ -29,7 +28,7 @@ namespace corsika { /** * Called at the start of each run. */ - virtual void startOfLibrary(std::filesystem::path const& directory) = 0; + virtual void startOfLibrary(boost::filesystem::path const& directory) = 0; /** * Called at the start of each event/shower. diff --git a/corsika/output/OutputManager.hpp b/corsika/output/OutputManager.hpp index 76105f2b6390e4a138b13e1239e7776032d730c7..aa6c52a8dfaeef500e9e42e3ac6843094e1724b4 100644 --- a/corsika/output/OutputManager.hpp +++ b/corsika/output/OutputManager.hpp @@ -9,7 +9,7 @@ #include <chrono> #include <string> -#include <filesystem> +#include <boost/filesystem.hpp> #include <corsika/output/BaseOutput.hpp> #include <corsika/framework/core/Logging.hpp> @@ -32,7 +32,7 @@ namespace corsika { OutputState state_{OutputState::NoInit}; ///< The current state of this manager. std::string const name_; ///< The name of this simulation file. - std::filesystem::path const root_; ///< The top-level directory for the output. + boost::filesystem::path const root_; ///< The top-level directory for the output. int count_{0}; ///< The current ID of this shower. std::chrono::time_point<std::chrono::system_clock> const start_time{ std::chrono::system_clock::now()}; ///< The time the manager is created. @@ -45,7 +45,7 @@ namespace corsika { /** * Write a YAML-node to a file. */ - void writeNode(YAML::Node const& node, std::filesystem::path const& path) const; + void writeNode(YAML::Node const& node, boost::filesystem::path const& path) const; /** * Write the top-level config of this simulation. @@ -69,7 +69,7 @@ namespace corsika { * @param name The name of this output collection. * @param dir The directory where the output directory will be stored. */ - OutputManager(std::string const& name, std::filesystem::path const& dir); + OutputManager(std::string const& name, boost::filesystem::path const& dir); /** * Handle graceful closure of the outputs upon destruction. diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp index 7c17d97eb19a84585a6a10e6019ccb55ebb93a62..4b0b25f53cda1d8c3662c108f7f84d4ad26e302b 100644 --- a/examples/cascade_proton_example.cpp +++ b/examples/cascade_proton_example.cpp @@ -23,7 +23,6 @@ #include <corsika/media/MediumPropertyModel.hpp> #include <corsika/media/UniformMagneticField.hpp> - #include <corsika/setup/SetupEnvironment.hpp> #include <corsika/setup/SetupStack.hpp> #include <corsika/setup/SetupTrajectory.hpp> diff --git a/modules/conex b/modules/conex index 820f042b6a055276d465437c74160ef7c199b646..332e22472595377694e16163c76507f4c722556f 160000 --- a/modules/conex +++ b/modules/conex @@ -1 +1 @@ -Subproject commit 820f042b6a055276d465437c74160ef7c199b646 +Subproject commit 332e22472595377694e16163c76507f4c722556f