From a736756d9bbfcbccdf33cce90b593ed6881197a2 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 9 Jul 2020 00:10:36 -0500 Subject: [PATCH] Adjusting some geometry checks. Reading surfaces before cells. Combines with other CSG objects so far! --- src/geometry_aux.cpp | 2 +- src/surface.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/geometry_aux.cpp b/src/geometry_aux.cpp index 94365428f..d45cdcb23 100644 --- a/src/geometry_aux.cpp +++ b/src/geometry_aux.cpp @@ -62,8 +62,8 @@ void read_geometry_xml() pugi::xml_node root = doc.document_element(); // Read surfaces, cells, lattice - read_cells(root); read_surfaces(root); + read_cells(root); read_lattices(root); // Allocate universes, universe cell arrays, and assign base universe diff --git a/src/surface.cpp b/src/surface.cpp index caa3b9ba8..9114b65ad 100644 --- a/src/surface.cpp +++ b/src/surface.cpp @@ -1190,13 +1190,13 @@ void read_surfaces(pugi::xml_node node) break; } } - if (settings::run_mode != RunMode::PLOTTING && !boundary_exists) { - fatal_error("No boundary conditions were applied to any surfaces!"); - } + // if (settings::run_mode != RunMode::PLOTTING && !boundary_exists) { + // fatal_error("No boundary conditions were applied to any surfaces!"); + // } - if (model::surfaces.size() == 0) { - fatal_error("No surfaces found in geometry.xml!"); - } + // if (model::surfaces.size() == 0) { + // fatal_error("No surfaces found in geometry.xml!"); + // } } void free_memory_surfaces()