From 14af9de1e2b56b2192bd295072ef54d2ff020e02 Mon Sep 17 00:00:00 2001 From: aprilnovak Date: Fri, 17 Feb 2023 19:16:15 -0600 Subject: [PATCH 1/2] Use more generalized error message. Refs #2394 --- src/dagmc.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dagmc.cpp b/src/dagmc.cpp index f21d5d0a9e..154200f3f2 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -182,11 +182,11 @@ void DAGUniverse::init_geometry() model::cell_map[c->id_] = model::cells.size(); } else { warning(fmt::format("DAGMC Cell IDs: {}", dagmc_ids_for_dim(3))); - fatal_error(fmt::format("Cell ID {} exists in both DAGMC Universe {} " - "and the CSG geometry. Setting auto_geom_ids " + fatal_error(fmt::format("DAGMC Universe {} contains cell ID {}, which " + "already exists in the geometry. Setting auto_geom_ids " "to True when initiating the DAGMC Universe may " "resolve this issue", - c->id_, this->id_)); + this->id_, c->id_)); } // --- Materials --- From 5a6162754948b0fc2065c76869c04eb26989177d Mon Sep 17 00:00:00 2001 From: April Novak Date: Sat, 18 Feb 2023 17:18:53 -0800 Subject: [PATCH 2/2] Apply suggestions from code review Co-authored-by: Patrick Shriwise --- src/dagmc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dagmc.cpp b/src/dagmc.cpp index 154200f3f2..01ce8ef11e 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -182,8 +182,8 @@ void DAGUniverse::init_geometry() model::cell_map[c->id_] = model::cells.size(); } else { warning(fmt::format("DAGMC Cell IDs: {}", dagmc_ids_for_dim(3))); - fatal_error(fmt::format("DAGMC Universe {} contains cell ID {}, which " - "already exists in the geometry. Setting auto_geom_ids " + fatal_error(fmt::format("DAGMC Universe {} contains a cell with ID {}, which " + "already exists elsewhere in the geometry. Setting auto_geom_ids " "to True when initiating the DAGMC Universe may " "resolve this issue", this->id_, c->id_));