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

Update determination of temperatures to load given temperature range

Browse source
This commit is contained in:
Paul Romano 2021-03-09 13:03:34 -06:00
parent 1bad13d5f6
commit 9933b7f0f8
1 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/nuclide.cpp
View file

@ -83,29 +83,25 @@ Nuclide::Nuclide(hid_t group, const std::vector<double>& temperature)
}
// Determine actual temperatures to read -- start by checking whether a
// temperature range was given, in which case all temperatures in the range
// are loaded irrespective of what temperatures actually appear in the model
// temperature range was given (indicated by T_max > 0), in which case all
// temperatures in the range are loaded irrespective of what temperatures
// actually appear in the model
std::vector<int> temps_to_read;
int n = temperature.size();
double T_min = n > 0 ? settings::temperature_range[0] : 0.0;
double T_max = n > 0 ? settings::temperature_range[1] : INFTY;
if (T_max > 0.0) {
// For each interval (T_j, T_j+1), if either T_j or T_j+1 are within the
// temperature range, load data for *both* T_j and T_j+1
int n = temps_available.size();
for (int j = 0; j < n; ++j) {
if ((T_min <= temps_available[j] && temps_available[j] < T_max)) {
int T_j = std::round(temps_available[j]);
if (!contains(temps_to_read, T_j)) {
temps_to_read.push_back(T_j);
}
}
if (j < n - 1 && T_min <= temps_available[j+1] && temps_available[j+1] < T_max) {
int T_j1 = std::round(temps_available[j+1]);
if (!contains(temps_to_read, T_j1)) {
temps_to_read.push_back(T_j1);
}
}
// Determine first available temperature below or equal to T_min
auto T_min_it = std::upper_bound(temps_available.begin(), temps_available.end(), T_min);
if (T_min_it != temps_available.begin()) --T_min_it;
// Determine first available temperature above or equal to T_max
auto T_max_it = std::lower_bound(temps_available.begin(), temps_available.end(), T_max);
if (T_max_it != temps_available.end()) ++T_max_it;
// Add corresponding temperatures to vector
for (auto it = T_min_it; it != T_max_it; ++it) {
temps_to_read.push_back(std::round(*it));
}
}