From f54372bfcebcf3a4e7198c5dea92547106d05f39 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 8 May 2020 13:45:44 -0500 Subject: [PATCH] Removed temperature_min/max modifications --- src/finalize.cpp | 4 ++-- src/nuclide.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/finalize.cpp b/src/finalize.cpp index 7a4a0490b..b5d5eb038 100644 --- a/src/finalize.cpp +++ b/src/finalize.cpp @@ -127,8 +127,8 @@ int openmc_finalize() data::energy_max = {INFTY, INFTY}; data::energy_min = {0.0, 0.0}; - data::temperature_min = INFTY; - data::temperature_max = 0.0; + data::temperature_min = 0.0; + data::temperature_max = INFTY; model::root_universe = -1; openmc::openmc_set_seed(DEFAULT_SEED); diff --git a/src/nuclide.cpp b/src/nuclide.cpp index f3bfccc34..22fd56855 100644 --- a/src/nuclide.cpp +++ b/src/nuclide.cpp @@ -30,8 +30,8 @@ namespace openmc { namespace data { std::array energy_min {0.0, 0.0}; std::array energy_max {INFTY, INFTY}; -double temperature_min {INFTY}; -double temperature_max {0.0}; +double temperature_min {0.0}; +double temperature_max {INFTY}; std::vector> nuclides; std::unordered_map nuclide_map; } // namespace data @@ -159,8 +159,8 @@ Nuclide::Nuclide(hid_t group, const std::vector& temperature, int i_nucl double T_min_read = *std::min_element(temps_to_read.cbegin(), temps_to_read.cend()); double T_max_read = *std::max_element(temps_to_read.cbegin(), temps_to_read.cend()); - data::temperature_min = std::min(data::temperature_min, T_min_read); - data::temperature_max = std::max(data::temperature_max, T_max_read); + data::temperature_min = std::max(data::temperature_min, T_min_read); + data::temperature_max = std::min(data::temperature_max, T_max_read); hid_t energy_group = open_group(group, "energy"); for (const auto& T : temps_to_read) {