1
0
Fork 0
mirror of https://github.com/gwm17/catima.git synced 2024-11-23 02:38:51 -05:00

gsl guards

This commit is contained in:
hrocho 2019-10-08 19:51:45 +02:00
parent 4495884093
commit ccd9869587
3 changed files with 4 additions and 15 deletions

View File

@ -1,9 +1,9 @@
#include "integrator.h" #include "integrator.h"
//#ifdef GSL_INTEGRATION #ifdef GSL_INTEGRATION
#include "gsl/gsl_integration.h" #include "gsl/gsl_integration.h"
#include "gsl/gsl_errno.h" #include "gsl/gsl_errno.h"
//#endif #endif
namespace catima{ namespace catima{
integrator_type integrator; integrator_type integrator;

View File

@ -17,12 +17,10 @@
#ifndef REACTIONS_H #ifndef REACTIONS_H
#define REACTIONS_H #define REACTIONS_H
#include "catima/build_config.h" #include "catima/build_config.h"
#ifdef NUREX
#include "catima/structures.h" #include "catima/structures.h"
#include "catima/config.h" #include "catima/config.h"
#include "catima/integrator.h" #include "catima/integrator.h"
#include <cmath> #include <cmath>
#endif
namespace catima{ namespace catima{
@ -58,17 +56,7 @@ double SigmaR_Kox(int Ap, int Zp, double E, int At, int Zt);
inline double p_from_T(double T, double M=1.0){ inline double p_from_T(double T, double M=1.0){
return M*sqrt(T*T + 2*T*atomic_mass_unit); return M*sqrt(T*T + 2*T*atomic_mass_unit);
} }
/*
inline double Ecm_from_T_relativistic(double T, double Ap, double At){
double mp = Ap*atomic_mass_unit;
double mt = At*atomic_mass_unit;
double plab= p_from_T(T,Ap);
double elab = sqrt(plab*plab + mp*mp);
double ecm = sqrt(mp*mp + mt*mt + 2*elab*mt);
double pcm = plab * mt / ecm;
return sqrt(pcm*pcm+mp*mp)-mp;
}
*/
/// calculates Ecm fom T, return in MeV units /// calculates Ecm fom T, return in MeV units
inline double Ecm_from_T(double T, double Ap, double At){ inline double Ecm_from_T(double T, double Ap, double At){
return T*Ap*At/(Ap+At); return T*Ap*At/(Ap+At);

View File

@ -87,6 +87,7 @@ namespace catima{
* Maetrial water({ * Maetrial water({
{1,1,2}, {1,1,2},
{16,8,1}, {16,8,1},
1.0, // optional density
}); });
* \endcode * \endcode
*/ */