diff --git a/CMakeLists.txt b/CMakeLists.txt index 203e292..7448b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ find_package(nurex QUIET) if(nurex_FOUND) message(STATUS "nurex library found") set(NUREX ON) +list(APPEND EXTRA_LIBS nurex::nurex) endif(nurex_FOUND) diff --git a/reactions.cpp b/reactions.cpp index 4618067..bf1f478 100644 --- a/reactions.cpp +++ b/reactions.cpp @@ -1,21 +1,29 @@ #include "catima/reactions.h" #ifdef NUREX +#include "catima/catima.h" +#include "catima/abundance_database.h" #include +#include namespace catima{ -double reaction_rate(Projectile &projectile, const Material &target, const Config &c){ +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 = get_default_nucleus(ap,zp); + nurex::Nucleus nurex_projectile = nurex::get_default_nucleus(ap,zp); - int zt = lround(target.get_element(0).Z; + int zt = target.get_element(0).Z; int at = abundance::get_isotope_a(zt,0); - nurex::Nucleus nurex_target = get_default_nucleus(at,zt); - + nurex::Nucleus nurex_target = nurex::get_default_nucleus(at,zt); + + double eout = energy_out(projectile,projectile.T, target,c); + std::cout<