diff --git a/CMakeLists.txt b/CMakeLists.txt index 7448b43..0d67399 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,7 +21,7 @@ set(CMAKE_BUILD_TYPE Release) ######### compiler flags ########### set(CMAKE_CXX_EXTENSIONS OFF) -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") @@ -87,7 +87,7 @@ set_target_properties(catima_static POSITION_INDEPENDENT_CODE ON ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib ) -target_link_libraries(catima ${EXTRA_LIBS} ${GSL_LIBRARIES} nurex::nurex) +target_link_libraries(catima ${EXTRA_LIBS} ${GSL_LIBRARIES}) target_link_libraries(catima_static ${EXTRA_LIBS} ${GSL_LIBRARIES}) target_include_directories(catima diff --git a/reactions.cpp b/reactions.cpp index bf1f478..f690af6 100644 --- a/reactions.cpp +++ b/reactions.cpp @@ -1,26 +1,38 @@ #include "catima/reactions.h" + #ifdef NUREX +#include "nurex/Parametrization.h" #include "catima/catima.h" #include "catima/abundance_database.h" +#include "catima/storage.h" #include #include namespace catima{ double reaction_rate1(Projectile &projectile, const Material &target, const Config &c){ - - int num_elements = target.ncomponents(); int ap = lround(projectile.A); int zp = lround(projectile.Z); - nurex::Nucleus nurex_projectile = nurex::get_default_nucleus(ap,zp); - int zt = target.get_element(0).Z; - int at = abundance::get_isotope_a(zt,0); - nurex::Nucleus nurex_target = nurex::get_default_nucleus(at,zt); + int at = abundance::get_isotope_a(zt,0); // most abundand natural isotope mass - double eout = energy_out(projectile,projectile.T, target,c); - std::cout<