From d687ce419f6fb7ea33fc4ab5cbfc08f32f15a1fd Mon Sep 17 00:00:00 2001 From: Jonathan Shimwell Date: Sun, 20 Aug 2023 21:29:20 +0100 Subject: [PATCH] added cell name to vol calc print out (#2656) --- src/volume_calc.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/volume_calc.cpp b/src/volume_calc.cpp index b58da4750..8949d5c20 100644 --- a/src/volume_calc.cpp +++ b/src/volume_calc.cpp @@ -534,16 +534,20 @@ int openmc_calculate_volumes() // Display domain volumes for (int j = 0; j < vol_calc.domain_ids_.size(); j++) { - std::string cell_name {""}; + std::string region_name {""}; if (vol_calc.domain_type_ == VolumeCalculation::TallyDomain::CELL) { int cell_idx = model::cell_map[vol_calc.domain_ids_[j]]; - cell_name = model::cells[cell_idx]->name(); - if (cell_name.size()) - cell_name.insert(0, " "); // prepend space for formatting + region_name = model::cells[cell_idx]->name(); + } else if (vol_calc.domain_type_ == + VolumeCalculation::TallyDomain::MATERIAL) { + int mat_idx = model::material_map[vol_calc.domain_ids_[j]]; + region_name = model::materials[mat_idx]->name(); } + if (region_name.size()) + region_name.insert(0, " "); // prepend space for formatting write_message(4, "{}{}{}: {} +/- {} cm^3", domain_type, - vol_calc.domain_ids_[j], cell_name, results[j].volume[0], + vol_calc.domain_ids_[j], region_name, results[j].volume[0], results[j].volume[1]); }