From e7ab675e3e32803cb27e32c321ab9c5d8d49f012 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Thu, 23 Apr 2020 09:51:49 -0500 Subject: [PATCH] Have ufs_get_weight accept a reference instead of pointer --- include/openmc/eigenvalue.h | 2 +- src/eigenvalue.cpp | 6 +++--- src/physics.cpp | 2 +- src/physics_mg.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/openmc/eigenvalue.h b/include/openmc/eigenvalue.h index 0e2d2401d2..8f430f5485 100644 --- a/include/openmc/eigenvalue.h +++ b/include/openmc/eigenvalue.h @@ -69,7 +69,7 @@ void shannon_entropy(); void ufs_count_sites(); //! Get UFS weight corresponding to particle's location -extern "C" double ufs_get_weight(const Particle* p); +double ufs_get_weight(const Particle& p); //! Write data related to k-eigenvalue to statepoint //! \param[in] group HDF5 group diff --git a/src/eigenvalue.cpp b/src/eigenvalue.cpp index be24475fb3..f5d8a9c807 100644 --- a/src/eigenvalue.cpp +++ b/src/eigenvalue.cpp @@ -573,12 +573,12 @@ void ufs_count_sites() } } -double ufs_get_weight(const Particle* p) +double ufs_get_weight(const Particle& p) { // Determine indices on ufs mesh for current location - int mesh_bin = simulation::ufs_mesh->get_bin(p->r()); + int mesh_bin = simulation::ufs_mesh->get_bin(p.r()); if (mesh_bin < 0) { - p->write_restart(); + p.write_restart(); fatal_error("Source site outside UFS mesh!"); } diff --git a/src/physics.cpp b/src/physics.cpp index 1065c200b1..068fff7ce3 100644 --- a/src/physics.cpp +++ b/src/physics.cpp @@ -153,7 +153,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx) { // If uniform fission source weighting is turned on, we increase or decrease // the expected number of fission sites produced - double weight = settings::ufs_on ? ufs_get_weight(p) : 1.0; + double weight = settings::ufs_on ? ufs_get_weight(*p) : 1.0; // Determine the expected number of neutrons produced double nu_t = p->wgt_ / simulation::keff * weight * p->neutron_xs_[ diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp index f63a48d2ad..254379d595 100644 --- a/src/physics_mg.cpp +++ b/src/physics_mg.cpp @@ -92,7 +92,7 @@ create_fission_sites(Particle* p) { // If uniform fission source weighting is turned on, we increase or decrease // the expected number of fission sites produced - double weight = settings::ufs_on ? ufs_get_weight(p) : 1.0; + double weight = settings::ufs_on ? ufs_get_weight(*p) : 1.0; // Determine the expected number of neutrons produced double nu_t = p->wgt_ / simulation::keff * weight *