From 7382d35679a63f9544393a9b601cfb4252a9a4bb Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 5 Mar 2019 07:05:33 -0600 Subject: [PATCH] Respond to @smharper comments on #1183 --- src/cross_sections.cpp | 2 +- src/dagmc.cpp | 2 +- src/simulation.cpp | 2 +- src/source.cpp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cross_sections.cpp b/src/cross_sections.cpp index 9a4e52df0..e91cfc875 100644 --- a/src/cross_sections.cpp +++ b/src/cross_sections.cpp @@ -312,7 +312,7 @@ read_ce_cross_sections(const std::vector>& nuc_temps, } } // thermal_tables_ - // Finish setting up.material_s (normalizing densities, etc.) + // Finish setting up materials (normalizing densities, etc.) mat->finalize(); } // materials diff --git a/src/dagmc.cpp b/src/dagmc.cpp index 0f1814fc6..34027ce7c 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -221,7 +221,7 @@ void load_dagmc_geometry() c->material_.push_back(MATERIAL_VOID); } else { if (using_uwuw) { - // lookup.material_ in uwuw if the were present + // lookup material in uwuw if the were present std::string uwuw_mat = DMD.volume_material_property_data_eh[vol_handle]; if (uwuw.material_library.count(uwuw_mat) != 0) { // Note: material numbers are set by UWUW diff --git a/src/simulation.cpp b/src/simulation.cpp index b6c9a6b10..7d30ccea9 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -73,7 +73,7 @@ int openmc_simulation_init() t->init_results(); } - // Set up.material_ nuclide index mapping + // Set up material nuclide index mapping for (auto& mat : model::materials) { mat->init_nuclide_index(); } diff --git a/src/source.cpp b/src/source.cpp index 6b24270a4..36d66394c 100644 --- a/src/source.cpp +++ b/src/source.cpp @@ -157,10 +157,11 @@ Particle::Bank SourceDistribution::sample() const // Sample spatial distribution site.r = space_->sample(); + double xyz[] {site.r.x, site.r.y, site.r.z}; // Now search to see if location exists in geometry int32_t cell_index, instance; - int err = openmc_find_cell(&site.r.x, &cell_index, &instance); + int err = openmc_find_cell(xyz, &cell_index, &instance); found = (err != OPENMC_E_GEOMETRY); // Check if spatial site is in fissionable material