crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 05:05:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Whew, there we go. Fixed.

Browse source
This commit is contained in:
Adam G Nelson 2018-06-15 20:39:57 -04:00
parent 39c063830c
commit 3cdb1bbb87
3 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/scattdata.cpp
View file

@ -337,16 +337,24 @@ void ScattDataLegendre::combine(std::vector<ScattData*>& those_scatts,
// Find the minimum and maximum group boundaries
int gmin_;
for (gmin_ = 0; gmin_ < groups; gmin_++) {
bool non_zero = std::all_of(this_matrix[gin][gmin_].begin(),
this_matrix[gin][gmin_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmin_].size(); l++) {
if (this_matrix[gin][gmin_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}
int gmax_;
for (gmax_ = groups - 1; gmax_ >= 0; gmax_--) {
bool non_zero = std::all_of(this_matrix[gin][gmax_].begin(),
this_matrix[gin][gmax_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmax_].size(); l++) {
if (this_matrix[gin][gmax_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}
@ -646,16 +654,24 @@ void ScattDataHistogram::combine(std::vector<ScattData*>& those_scatts,
// Find the minimum and maximum group boundaries
int gmin_;
for (gmin_ = 0; gmin_ < groups; gmin_++) {
bool non_zero = std::all_of(this_matrix[gin][gmin_].begin(),
this_matrix[gin][gmin_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmin_].size(); l++) {
if (this_matrix[gin][gmin_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}
int gmax_;
for (gmax_ = groups - 1; gmax_ >= 0; gmax_--) {
bool non_zero = std::all_of(this_matrix[gin][gmax_].begin(),
this_matrix[gin][gmax_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmax_].size(); l++) {
if (this_matrix[gin][gmax_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}
@ -956,16 +972,24 @@ void ScattDataTabular::combine(std::vector<ScattData*>& those_scatts,
// Find the minimum and maximum group boundaries
int gmin_;
for (gmin_ = 0; gmin_ < groups; gmin_++) {
bool non_zero = std::all_of(this_matrix[gin][gmin_].begin(),
this_matrix[gin][gmin_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmin_].size(); l++) {
if (this_matrix[gin][gmin_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}
int gmax_;
for (gmax_ = groups - 1; gmax_ >= 0; gmax_--) {
bool non_zero = std::all_of(this_matrix[gin][gmax_].begin(),
this_matrix[gin][gmax_].end(),
[](double val){return val != 0.;});
bool non_zero = false;
for (int l = 0; l < this_matrix[gin][gmax_].size(); l++) {
if (this_matrix[gin][gmax_][l] != 0.) {
non_zero = true;
break;
}
}
if (non_zero) break;
}