Skip to content

Commit

Permalink
Merge pull request pyne#1502 from pshriwise/std-isnan
Browse files Browse the repository at this point in the history
  • Loading branch information
@gonuke
gonuke authored Sep 12, 2023
2 parents 8c17fa9 + 0309e78 commit e55e52e
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 28 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Next Version
* Update run conditions for workflows (#1494)
* Fix gamma intensity calculation (#1496)
* Add workflow to build virtual machines based on Dockerfile (#1490)
* Replacing '#define isnan' with 'std::isnan' (#1502)

v0.7.7
======
Expand Down
24 changes: 12 additions & 12 deletions src/data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1325,7 +1325,7 @@ std::vector<std::pair<double, double> >
double xka2 = 0;
double xkb = 0;
double xl = 0;
if (!isnan(k_conv)) {
if (!std::isnan(k_conv)) {
xk = data_access<atomic> (z, offsetof(atomic, k_shell_fluor),
atomic_data_map)*k_conv;
xka = xk / (1.0 + data_access<atomic> (z, offsetof(atomic,
Expand All @@ -1334,12 +1334,12 @@ std::vector<std::pair<double, double> >
ka2_to_ka1), atomic_data_map));
xka2 = xka - xka1;
xkb = xk - xka;
if (!isnan(l_conv)) {
if (!std::isnan(l_conv)) {
xl = (l_conv + k_conv*data_access<atomic> (z, offsetof(atomic,
prob), atomic_data_map))*data_access<atomic> (z, offsetof(atomic,
l_shell_fluor), atomic_data_map);
}
} else if (!isnan(l_conv)) {
} else if (!std::isnan(l_conv)) {
xl = l_conv*data_access<atomic> (z, offsetof(atomic,
l_shell_fluor), atomic_data_map);
}
Expand Down Expand Up @@ -1446,7 +1446,7 @@ int pyne::id_from_level(int nuc, double level, std::string special) {
it!=nuc_upper; ++it) {
if ((std::abs(level - it->second.level) < minv) &&
((char)it->second.special == special.c_str()[0]) &&
!isnan(it->second.level)) {
!std::isnan(it->second.level)) {
minv = std::abs(level - it->second.level);
ret_id = it->second.nuc_id;
}
Expand Down Expand Up @@ -1882,7 +1882,7 @@ template<> void pyne::_load_data<pyne::gamma>() {
status = H5Fclose(nuc_data_h5);

for (int i = 0; i < gamma_length; ++i) {
if ((gamma_array[i].parent_nuc != 0) && !isnan(gamma_array[i].energy))
if ((gamma_array[i].parent_nuc != 0) && !std::isnan(gamma_array[i].energy))
gamma_data[std::make_pair(gamma_array[i].parent_nuc,
gamma_array[i].energy)] = gamma_array[i];
}
Expand Down Expand Up @@ -2038,7 +2038,7 @@ std::vector<std::pair<double, double> > pyne::gamma_xrays(int parent) {
temp = calculate_xray_data(nucname::znum(children[i]),
k_list[i]*decay_br[j].first, l_list[i]*decay_br[j].first);
for (int k = 0; k < temp.size(); ++k) {
if (!isnan(temp[k].second) && !isnan(temp[k].first)) {
if (!std::isnan(temp[k].second) && !std::isnan(temp[k].first)) {
int found = 0;
for (int l = 0; l < result.size(); ++l) {
if (temp[k].first == result[l].first) {
Expand Down Expand Up @@ -2105,7 +2105,7 @@ template<> void pyne::_load_data<pyne::alpha>() {
status = H5Fclose(nuc_data_h5);

for (int i = 0; i < alpha_length; ++i) {
if ((alpha_array[i].from_nuc != 0) && !isnan(alpha_array[i].energy))
if ((alpha_array[i].from_nuc != 0) && !std::isnan(alpha_array[i].energy))
alpha_data[std::make_pair(alpha_array[i].from_nuc, alpha_array[i].energy)]
= alpha_array[i];
}
Expand Down Expand Up @@ -2183,7 +2183,7 @@ template<> void pyne::_load_data<pyne::beta>() {
status = H5Fclose(nuc_data_h5);

for (int i = 0; i < beta_length; ++i) {
if ((beta_array[i].from_nuc != 0) && !isnan(beta_array[i].avg_energy))
if ((beta_array[i].from_nuc != 0) && !std::isnan(beta_array[i].avg_energy))
beta_data[std::make_pair(beta_array[i].from_nuc, beta_array[i].avg_energy)]
= beta_array[i];
}
Expand Down Expand Up @@ -2275,7 +2275,7 @@ template<> void pyne::_load_data<pyne::ecbp>() {
status = H5Fclose(nuc_data_h5);

for (int i = 0; i < ecbp_length; ++i) {
if ((ecbp_array[i].from_nuc != 0) && !isnan(ecbp_array[i].avg_energy))
if ((ecbp_array[i].from_nuc != 0) && !std::isnan(ecbp_array[i].avg_energy))
ecbp_data[std::make_pair(ecbp_array[i].from_nuc, ecbp_array[i].avg_energy)]
= ecbp_array[i];
}
Expand Down Expand Up @@ -2335,7 +2335,7 @@ std::vector<std::pair<double, double> > pyne::ecbp_xrays(int parent) {
temp = calculate_xray_data(nucname::znum(children[i]),
k_list[i]*decay_br[j].first, l_list[i]*decay_br[j].first);
for (int k = 0; k < temp.size(); ++k) {
if (!isnan(temp[k].second) && !isnan(temp[k].first)) {
if (!std::isnan(temp[k].second) && !std::isnan(temp[k].first)) {
int found = 0;
for (int l = 0; l < result.size(); ++l) {
if (temp[k].first == result[l].first) {
Expand Down Expand Up @@ -2440,7 +2440,7 @@ std::vector<std::pair<double, double> > pyne::xrays(int parent) {
temp = calculate_xray_data(nucname::znum(children[i]),
k_list[i]*decay_br[j].first, l_list[i]*decay_br[j].first);
for (int k = 0; k < temp.size(); ++k) {
if (!isnan(temp[k].second) && !isnan(temp[k].first)) {
if (!std::isnan(temp[k].second) && !std::isnan(temp[k].first)) {
int found = 0;
for (int l = 0; l < result.size(); ++l) {
if (temp[k].first == result[l].first) {
Expand Down Expand Up @@ -2472,7 +2472,7 @@ std::vector<std::pair<double, double> > pyne::xrays(int parent) {
temp = calculate_xray_data(nucname::znum(gchildren[i]),
gk_list[i]*decay_nrbr[j].first, gl_list[i]*decay_nrbr[j].first);
for (int k = 0; k < temp.size(); ++k) {
if (!isnan(temp[k].second) && !isnan(temp[k].first)) {
if (!std::isnan(temp[k].second) && !std::isnan(temp[k].first)) {
int found = 0;
for (int l = 0; l < result.size(); ++l) {
if (temp[k].first == result[l].first) {
Expand Down
4 changes: 2 additions & 2 deletions src/enrichment.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ pyne_enr::Cascade pyne_enr::multicomponent(pyne_enr::Cascade & orig_casc, \

while (tolerance < fabs(curr_casc.l_t_per_feed - prev_casc.l_t_per_feed) / curr_casc.l_t_per_feed) {
// Check that parameters are still well-formed
if (isnan(curr_casc.Mstar) || isnan(curr_casc.l_t_per_feed) || \
isnan(prev_casc.Mstar) || isnan(prev_casc.l_t_per_feed))
if (std::isnan(curr_casc.Mstar) || std::isnan(curr_casc.l_t_per_feed) || \
std::isnan(prev_casc.Mstar) || std::isnan(prev_casc.l_t_per_feed))
throw EnrichmentIterationNaN();

prev_casc = curr_casc;
Expand Down
4 changes: 2 additions & 2 deletions src/material.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2000,10 +2000,10 @@ std::vector<std::pair<double, double> > pyne::Material::normalize_radioactivity(
std::vector<std::pair<double, double> > normed;
double sum = 0.0;
for (int i = 0; i < unnormed.size(); ++i) {
if (!isnan(unnormed[i].second)) sum = sum + unnormed[i].second;
if (!std::isnan(unnormed[i].second)) sum = sum + unnormed[i].second;
}
for (int i = 0; i < unnormed.size(); ++i) {
if (!isnan(unnormed[i].second)) {
if (!std::isnan(unnormed[i].second)) {
normed.push_back(
std::make_pair(unnormed[i].first, (unnormed[i].second) / sum));
}
Expand Down
12 changes: 0 additions & 12 deletions src/utils.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,6 @@
#include <vector>
#include <algorithm>

#if (__GNUC__ >= 4)
#include <cmath>
#define isnan(x) std::isnan(x)
#else
#include <math.h>
#define isnan(x) __isnand((double)x)
#endif

#ifdef _WIN32
#define isnan(x) ((x) != (x))
#endif

#ifndef JSON_IS_AMALGAMATION
#define JSON_IS_AMALGAMATION
#endif
Expand Down

0 comments on commit e55e52e

Please sign in to comment.