From f6bebf50d7199418cae280f78a031d9ec47b3877 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Aug 2021 12:30:39 -0500 Subject: [PATCH 1/4] Add missing 'override' specifications in cell.h --- include/openmc/cell.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/openmc/cell.h b/include/openmc/cell.h index 5f6d33c974..6f9d879413 100644 --- a/include/openmc/cell.h +++ b/include/openmc/cell.h @@ -244,14 +244,14 @@ public: explicit CSGCell(pugi::xml_node cell_node); - bool contains(Position r, Direction u, int32_t on_surface) const; + bool contains(Position r, Direction u, int32_t on_surface) const override; std::pair distance( - Position r, Direction u, int32_t on_surface, Particle* p) const; + Position r, Direction u, int32_t on_surface, Particle* p) const override; void to_hdf5_inner(hid_t group_id) const override; - BoundingBox bounding_box() const; + BoundingBox bounding_box() const override; protected: bool contains_simple(Position r, Direction u, int32_t on_surface) const; From 2d53bda17e55e3013ae44978118b88274d6f8d9e Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Aug 2021 12:31:47 -0500 Subject: [PATCH 2/4] Update fmt submodule --- vendor/fmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/fmt b/vendor/fmt index 65ac626c58..d141cdbeb0 160000 --- a/vendor/fmt +++ b/vendor/fmt @@ -1 +1 @@ -Subproject commit 65ac626c5856f5aad1f1542e79407a6714357043 +Subproject commit d141cdbeb0fb422a3fb7173b285fd38e0d1772dc From 7969bb14880df4f44a963ad7c42a7235b93e3128 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Aug 2021 13:10:28 -0500 Subject: [PATCH 3/4] Use include instead of --- CMakeLists.txt | 2 -- include/openmc/cell.h | 2 +- include/openmc/material.h | 2 +- include/openmc/nuclide.h | 2 +- include/openmc/photon.h | 2 +- include/openmc/reaction.h | 2 +- include/openmc/tallies/filter.h | 2 +- include/openmc/tallies/filter_azimuthal.h | 2 +- include/openmc/tallies/filter_cell.h | 2 +- include/openmc/tallies/filter_cell_instance.h | 2 +- include/openmc/tallies/filter_collision.h | 2 +- include/openmc/tallies/filter_delayedgroup.h | 2 +- include/openmc/tallies/filter_energy.h | 2 +- include/openmc/tallies/filter_material.h | 2 +- include/openmc/tallies/filter_mu.h | 2 +- include/openmc/tallies/filter_polar.h | 2 +- include/openmc/tallies/filter_sph_harm.h | 2 +- include/openmc/tallies/filter_surface.h | 2 +- include/openmc/tallies/filter_universe.h | 2 +- include/openmc/tallies/tally.h | 2 +- include/openmc/volume_calc.h | 2 +- src/cell.cpp | 2 +- src/mesh.cpp | 2 +- src/surface.cpp | 2 +- src/tallies/filter_mesh.cpp | 2 +- src/tallies/filter_sph_harm.cpp | 2 +- src/tallies/filter_zernike.cpp | 2 +- 27 files changed, 26 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7326e7f352..75c66a2336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,8 +214,6 @@ add_subdirectory(vendor/xtensor) # GSL header-only library #=============================================================================== -set(GSL_LITE_OPT_INSTALL_COMPAT_HEADER ON CACHE BOOL - "Install MS-GSL compatibility header ") add_subdirectory(vendor/gsl-lite) # Make sure contract violations throw exceptions diff --git a/include/openmc/cell.h b/include/openmc/cell.h index 6f9d879413..d56fd5f81e 100644 --- a/include/openmc/cell.h +++ b/include/openmc/cell.h @@ -10,7 +10,7 @@ #include "hdf5.h" #include "pugixml.hpp" -#include +#include #include "openmc/constants.h" #include "openmc/memory.h" // for unique_ptr diff --git a/include/openmc/material.h b/include/openmc/material.h index 5fc52eba83..709d205738 100644 --- a/include/openmc/material.h +++ b/include/openmc/material.h @@ -6,7 +6,7 @@ #include "pugixml.hpp" #include "xtensor/xtensor.hpp" -#include +#include #include #include "openmc/bremsstrahlung.h" diff --git a/include/openmc/nuclide.h b/include/openmc/nuclide.h index f961e9808d..b05c76bbb8 100644 --- a/include/openmc/nuclide.h +++ b/include/openmc/nuclide.h @@ -7,7 +7,7 @@ #include #include // for pair -#include +#include #include #include "openmc/array.h" diff --git a/include/openmc/photon.h b/include/openmc/photon.h index bf64fa50c6..09783fdb4d 100644 --- a/include/openmc/photon.h +++ b/include/openmc/photon.h @@ -7,7 +7,7 @@ #include "openmc/vector.h" #include "xtensor/xtensor.hpp" -#include +#include #include #include diff --git a/include/openmc/reaction.h b/include/openmc/reaction.h index 6b276db200..46705acf5e 100644 --- a/include/openmc/reaction.h +++ b/include/openmc/reaction.h @@ -7,7 +7,7 @@ #include #include "hdf5.h" -#include +#include #include "openmc/reaction_product.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter.h b/include/openmc/tallies/filter.h index b0145f0e18..2eecfe0e4e 100644 --- a/include/openmc/tallies/filter.h +++ b/include/openmc/tallies/filter.h @@ -6,7 +6,7 @@ #include #include "pugixml.hpp" -#include +#include #include "openmc/constants.h" #include "openmc/hdf5_interface.h" diff --git a/include/openmc/tallies/filter_azimuthal.h b/include/openmc/tallies/filter_azimuthal.h index 4cda9163f5..2272b500ab 100644 --- a/include/openmc/tallies/filter_azimuthal.h +++ b/include/openmc/tallies/filter_azimuthal.h @@ -4,7 +4,7 @@ #include "openmc/vector.h" #include -#include +#include #include "openmc/tallies/filter.h" diff --git a/include/openmc/tallies/filter_cell.h b/include/openmc/tallies/filter_cell.h index 6e2463f24a..46d89811d3 100644 --- a/include/openmc/tallies/filter_cell.h +++ b/include/openmc/tallies/filter_cell.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_cell_instance.h b/include/openmc/tallies/filter_cell_instance.h index d74850df75..4de3fcd292 100644 --- a/include/openmc/tallies/filter_cell_instance.h +++ b/include/openmc/tallies/filter_cell_instance.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/cell.h" #include "openmc/tallies/filter.h" diff --git a/include/openmc/tallies/filter_collision.h b/include/openmc/tallies/filter_collision.h index 46c64c5535..3724b06cfe 100644 --- a/include/openmc/tallies/filter_collision.h +++ b/include/openmc/tallies/filter_collision.h @@ -1,7 +1,7 @@ #ifndef OPENMC_TALLIES_FILTER_COLLISIONS_H #define OPENMC_TALLIES_FILTER_COLLISIONS_H -#include +#include #include #include "openmc/tallies/filter.h" diff --git a/include/openmc/tallies/filter_delayedgroup.h b/include/openmc/tallies/filter_delayedgroup.h index 868807f05d..72ffa1db5a 100644 --- a/include/openmc/tallies/filter_delayedgroup.h +++ b/include/openmc/tallies/filter_delayedgroup.h @@ -1,7 +1,7 @@ #ifndef OPENMC_TALLIES_FILTER_DELAYEDGROUP_H #define OPENMC_TALLIES_FILTER_DELAYEDGROUP_H -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_energy.h b/include/openmc/tallies/filter_energy.h index c820f28fb4..000aaa28b9 100644 --- a/include/openmc/tallies/filter_energy.h +++ b/include/openmc/tallies/filter_energy.h @@ -1,7 +1,7 @@ #ifndef OPENMC_TALLIES_FILTER_ENERGY_H #define OPENMC_TALLIES_FILTER_ENERGY_H -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_material.h b/include/openmc/tallies/filter_material.h index 8a67c1a751..f58fc99385 100644 --- a/include/openmc/tallies/filter_material.h +++ b/include/openmc/tallies/filter_material.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_mu.h b/include/openmc/tallies/filter_mu.h index de934d1562..5299f6dd48 100644 --- a/include/openmc/tallies/filter_mu.h +++ b/include/openmc/tallies/filter_mu.h @@ -1,7 +1,7 @@ #ifndef OPENMC_TALLIES_FILTER_MU_H #define OPENMC_TALLIES_FILTER_MU_H -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_polar.h b/include/openmc/tallies/filter_polar.h index 23c00e6190..e06aca1e04 100644 --- a/include/openmc/tallies/filter_polar.h +++ b/include/openmc/tallies/filter_polar.h @@ -3,7 +3,7 @@ #include -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_sph_harm.h b/include/openmc/tallies/filter_sph_harm.h index 498590d3cc..5f5bf84f2e 100644 --- a/include/openmc/tallies/filter_sph_harm.h +++ b/include/openmc/tallies/filter_sph_harm.h @@ -3,7 +3,7 @@ #include -#include +#include #include "openmc/tallies/filter.h" diff --git a/include/openmc/tallies/filter_surface.h b/include/openmc/tallies/filter_surface.h index 368fd09d06..358963fde8 100644 --- a/include/openmc/tallies/filter_surface.h +++ b/include/openmc/tallies/filter_surface.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/filter_universe.h b/include/openmc/tallies/filter_universe.h index afe583b2d7..fde0b63979 100644 --- a/include/openmc/tallies/filter_universe.h +++ b/include/openmc/tallies/filter_universe.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/tallies/filter.h" #include "openmc/vector.h" diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h index 39e0b0af2b..13b8317ee4 100644 --- a/include/openmc/tallies/tally.h +++ b/include/openmc/tallies/tally.h @@ -10,7 +10,7 @@ #include "pugixml.hpp" #include "xtensor/xfixed.hpp" #include "xtensor/xtensor.hpp" -#include +#include #include #include diff --git a/include/openmc/volume_calc.h b/include/openmc/volume_calc.h index 33cc7343a4..db96f250f9 100644 --- a/include/openmc/volume_calc.h +++ b/include/openmc/volume_calc.h @@ -9,7 +9,7 @@ #include "pugixml.hpp" #include "xtensor/xtensor.hpp" -#include +#include #include namespace openmc { diff --git a/src/cell.cpp b/src/cell.cpp index 109b66dde8..fe138a089b 100644 --- a/src/cell.cpp +++ b/src/cell.cpp @@ -10,7 +10,7 @@ #include #include -#include +#include #include "openmc/capi.h" #include "openmc/constants.h" diff --git a/src/mesh.cpp b/src/mesh.cpp index 4798bfcf56..232b34ad00 100644 --- a/src/mesh.cpp +++ b/src/mesh.cpp @@ -2,7 +2,7 @@ #include // for copy, equal, min, min_element #include // for ceil #include // for size_t -#include +#include #include #ifdef OPENMC_MPI diff --git a/src/surface.cpp b/src/surface.cpp index c19de1e00c..73a5aaaf08 100644 --- a/src/surface.cpp +++ b/src/surface.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "openmc/array.h" #include "openmc/container_util.h" diff --git a/src/tallies/filter_mesh.cpp b/src/tallies/filter_mesh.cpp index a5f52e95a9..3f895b4f85 100644 --- a/src/tallies/filter_mesh.cpp +++ b/src/tallies/filter_mesh.cpp @@ -1,7 +1,7 @@ #include "openmc/tallies/filter_mesh.h" #include -#include +#include #include "openmc/capi.h" #include "openmc/constants.h" diff --git a/src/tallies/filter_sph_harm.cpp b/src/tallies/filter_sph_harm.cpp index 29976f3a1f..359df379b2 100644 --- a/src/tallies/filter_sph_harm.cpp +++ b/src/tallies/filter_sph_harm.cpp @@ -3,7 +3,7 @@ #include // For pair #include -#include +#include #include "openmc/capi.h" #include "openmc/error.h" diff --git a/src/tallies/filter_zernike.cpp b/src/tallies/filter_zernike.cpp index 65004983ca..eb4c8bdfd0 100644 --- a/src/tallies/filter_zernike.cpp +++ b/src/tallies/filter_zernike.cpp @@ -5,7 +5,7 @@ #include // For pair #include -#include +#include #include "openmc/capi.h" #include "openmc/error.h" From 7aba7bbb68e99c93e0f011225a42299685b28f02 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Wed, 25 Aug 2021 15:08:06 -0500 Subject: [PATCH 4/4] When writing depletion chain, don't use 'Nothing' for missing product --- openmc/deplete/nuclide.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openmc/deplete/nuclide.py b/openmc/deplete/nuclide.py index edba9748c7..992248246e 100644 --- a/openmc/deplete/nuclide.py +++ b/openmc/deplete/nuclide.py @@ -294,7 +294,8 @@ class Nuclide: for mode_type, daughter, br in self.decay_modes: mode_elem = ET.SubElement(elem, 'decay') mode_elem.set('type', mode_type) - mode_elem.set('target', daughter or "Nothing") + if daughter: + mode_elem.set('target', daughter) mode_elem.set('branching_ratio', str(br)) elem.set('reactions', str(len(self.reactions)))