diff --git a/include/openmc/tallies/tally_filter_azimuthal.h b/include/openmc/tallies/tally_filter_azimuthal.h index 556cfff922..091fde7c97 100644 --- a/include/openmc/tallies/tally_filter_azimuthal.h +++ b/include/openmc/tallies/tally_filter_azimuthal.h @@ -19,11 +19,11 @@ namespace openmc { class AzimuthalFilter : public TallyFilter { public: - virtual std::string type() const override {return "azimuthal";} + std::string type() const override {return "azimuthal";} - virtual ~AzimuthalFilter() override = default; + ~AzimuthalFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { auto bins = get_node_array(node, "bins"); @@ -49,7 +49,7 @@ public: n_bins_ = bins_.size() - 1; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -67,14 +67,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "bins", bins_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_cell.h b/include/openmc/tallies/tally_filter_cell.h index c3b39eeb86..ecef014a00 100644 --- a/include/openmc/tallies/tally_filter_cell.h +++ b/include/openmc/tallies/tally_filter_cell.h @@ -20,18 +20,18 @@ namespace openmc { class CellFilter : public TallyFilter { public: - virtual std::string type() const override {return "cell";} + std::string type() const override {return "cell";} - virtual ~CellFilter() override = default; + ~CellFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { cells_ = get_node_array(node, "bins"); n_bins_ = cells_.size(); } - virtual void + void initialize() override { for (auto& c : cells_) { @@ -50,7 +50,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -64,7 +64,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -73,7 +73,7 @@ public: write_dataset(filter_group, "bins", cell_ids); } - virtual std::string + std::string text_label(int bin) const override { return "Cell " + std::to_string(cells[cells_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_cellborn.h b/include/openmc/tallies/tally_filter_cellborn.h index df77fe2b82..a7e5634dd0 100644 --- a/include/openmc/tallies/tally_filter_cellborn.h +++ b/include/openmc/tallies/tally_filter_cellborn.h @@ -12,9 +12,9 @@ namespace openmc { class CellbornFilter : public CellFilter { public: - virtual std::string type() const override {return "cellborn";} + std::string type() const override {return "cellborn";} - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -26,7 +26,7 @@ public: } } - virtual std::string + std::string text_label(int bin) const override { return "Birth Cell " + std::to_string(cells[cells_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_cellfrom.h b/include/openmc/tallies/tally_filter_cellfrom.h index a45b977196..40bc382270 100644 --- a/include/openmc/tallies/tally_filter_cellfrom.h +++ b/include/openmc/tallies/tally_filter_cellfrom.h @@ -13,9 +13,9 @@ namespace openmc { class CellFromFilter : public CellFilter { public: - virtual std::string type() const override {return "cellfrom";} + std::string type() const override {return "cellfrom";} - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -29,7 +29,7 @@ public: } } - virtual std::string + std::string text_label(int bin) const override { return "Cell from " + std::to_string(cells[cells_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_distribcell.h b/include/openmc/tallies/tally_filter_distribcell.h index 45894c8a5c..ab36d0b873 100644 --- a/include/openmc/tallies/tally_filter_distribcell.h +++ b/include/openmc/tallies/tally_filter_distribcell.h @@ -19,11 +19,11 @@ namespace openmc { class DistribcellFilter : public TallyFilter { public: - virtual std::string type() const override {return "distribcell";} + std::string type() const override {return "distribcell";} - virtual ~DistribcellFilter() override = default; + ~DistribcellFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { auto cells = get_node_array(node, "bins"); @@ -33,7 +33,7 @@ public: cell_ = cells[0]; } - virtual void + void initialize() override { auto search = cell_map.find(cell_); @@ -48,7 +48,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -75,14 +75,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "bins", cells[cell_]->id_); } - virtual std::string + std::string text_label(int bin) const override { auto map = cells[cell_]->distribcell_index_; diff --git a/include/openmc/tallies/tally_filter_energyfunc.h b/include/openmc/tallies/tally_filter_energyfunc.h index 87b40dc461..73f31008ad 100644 --- a/include/openmc/tallies/tally_filter_energyfunc.h +++ b/include/openmc/tallies/tally_filter_energyfunc.h @@ -22,7 +22,7 @@ namespace openmc { class EnergyFunctionFilter : public TallyFilter { public: - virtual std::string type() const override {return "energyfunction";} + std::string type() const override {return "energyfunction";} EnergyFunctionFilter() : TallyFilter {} @@ -30,9 +30,9 @@ public: n_bins_ = 1; } - virtual ~EnergyFunctionFilter() override = default; + ~EnergyFunctionFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { if (!settings::run_CE) @@ -50,7 +50,7 @@ public: y_ = get_node_array(node, "y"); } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -67,7 +67,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -75,7 +75,7 @@ public: write_dataset(filter_group, "y", y_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_legendre.h b/include/openmc/tallies/tally_filter_legendre.h index 42ee1a0f60..c72cd6a192 100644 --- a/include/openmc/tallies/tally_filter_legendre.h +++ b/include/openmc/tallies/tally_filter_legendre.h @@ -18,18 +18,18 @@ namespace openmc { class LegendreFilter : public TallyFilter { public: - virtual std::string type() const override {return "legendre";} + std::string type() const override {return "legendre";} - virtual ~LegendreFilter() override = default; + ~LegendreFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { order_ = std::stoi(get_node_value(node, "order")); n_bins_ = order_ + 1; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -41,14 +41,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "order", order_); } - virtual std::string + std::string text_label(int bin) const override { return "Legendre expansion, P" + std::to_string(bin - 1); diff --git a/include/openmc/tallies/tally_filter_material.h b/include/openmc/tallies/tally_filter_material.h index 41e551ef04..971788331d 100644 --- a/include/openmc/tallies/tally_filter_material.h +++ b/include/openmc/tallies/tally_filter_material.h @@ -20,18 +20,18 @@ namespace openmc { class MaterialFilter : public TallyFilter { public: - virtual std::string type() const override {return "material";} + std::string type() const override {return "material";} - virtual ~MaterialFilter() override = default; + ~MaterialFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { materials_ = get_node_array(node, "bins"); n_bins_ = materials_.size(); } - virtual void + void initialize() override { for (auto& m : materials_) { @@ -51,7 +51,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -63,7 +63,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -72,7 +72,7 @@ public: write_dataset(filter_group, "bins", material_ids); } - virtual std::string + std::string text_label(int bin) const override { return "Material " + std::to_string(materials[materials_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_mesh.h b/include/openmc/tallies/tally_filter_mesh.h index ca97a9b680..c0c13c6554 100644 --- a/include/openmc/tallies/tally_filter_mesh.h +++ b/include/openmc/tallies/tally_filter_mesh.h @@ -21,11 +21,11 @@ namespace openmc { class MeshFilter : public TallyFilter { public: - virtual std::string type() const override {return "mesh";} + std::string type() const override {return "mesh";} - virtual ~MeshFilter() override = default; + ~MeshFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { auto bins_ = get_node_array(node, "bins"); @@ -48,7 +48,7 @@ public: for (auto dim : meshes[mesh_]->shape_) n_bins_ *= dim; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -63,14 +63,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "bins", meshes[mesh_]->id_); } - virtual std::string + std::string text_label(int bin) const override { auto& mesh = *meshes[mesh_]; diff --git a/include/openmc/tallies/tally_filter_meshsurface.h b/include/openmc/tallies/tally_filter_meshsurface.h index 6588f646aa..abc5ef80d1 100644 --- a/include/openmc/tallies/tally_filter_meshsurface.h +++ b/include/openmc/tallies/tally_filter_meshsurface.h @@ -15,9 +15,9 @@ namespace openmc { class MeshSurfaceFilter : public MeshFilter { public: - virtual std::string type() const override {return "meshsurface";} + std::string type() const override {return "meshsurface";} - virtual void + void from_xml(pugi::xml_node node) override { MeshFilter::from_xml(node); @@ -25,7 +25,7 @@ public: for (auto dim : meshes[mesh_]->shape_) n_bins_ *= dim; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -33,7 +33,7 @@ public: for (auto b : match.bins_) match.weights_.push_back(1.0); } - virtual std::string + std::string text_label(int bin) const override { auto& mesh = *meshes[mesh_]; diff --git a/include/openmc/tallies/tally_filter_mu.h b/include/openmc/tallies/tally_filter_mu.h index be11e29362..93fc7020af 100644 --- a/include/openmc/tallies/tally_filter_mu.h +++ b/include/openmc/tallies/tally_filter_mu.h @@ -20,11 +20,11 @@ namespace openmc { class MuFilter : public TallyFilter { public: - virtual std::string type() const override {return "mu";} + std::string type() const override {return "mu";} - virtual ~MuFilter() override = default; + ~MuFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { auto bins = get_node_array(node, "bins"); @@ -50,7 +50,7 @@ public: n_bins_ = bins_.size() - 1; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -61,14 +61,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "bins", bins_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_polar.h b/include/openmc/tallies/tally_filter_polar.h index 4916c30880..5dcd283403 100644 --- a/include/openmc/tallies/tally_filter_polar.h +++ b/include/openmc/tallies/tally_filter_polar.h @@ -19,11 +19,11 @@ namespace openmc { class PolarFilter : public TallyFilter { public: - virtual std::string type() const override {return "polar";} + std::string type() const override {return "polar";} - virtual ~PolarFilter() override = default; + ~PolarFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { auto bins = get_node_array(node, "bins"); @@ -49,7 +49,7 @@ public: n_bins_ = bins_.size() - 1; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -67,14 +67,14 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); write_dataset(filter_group, "bins", bins_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_sph_harm.h b/include/openmc/tallies/tally_filter_sph_harm.h index e31c2ed65c..79577f67c7 100644 --- a/include/openmc/tallies/tally_filter_sph_harm.h +++ b/include/openmc/tallies/tally_filter_sph_harm.h @@ -21,11 +21,11 @@ enum class SphericalHarmonicsCosine { class SphericalHarmonicsFilter : public TallyFilter { public: - virtual std::string type() const override {return "sphericalharmonics";} + std::string type() const override {return "sphericalharmonics";} - virtual ~SphericalHarmonicsFilter() override = default; + ~SphericalHarmonicsFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { order_ = std::stoi(get_node_value(node, "order")); @@ -46,7 +46,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -75,7 +75,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -87,7 +87,7 @@ public: } } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_sptl_legendre.h b/include/openmc/tallies/tally_filter_sptl_legendre.h index 49415a5853..19176b42b0 100644 --- a/include/openmc/tallies/tally_filter_sptl_legendre.h +++ b/include/openmc/tallies/tally_filter_sptl_legendre.h @@ -22,11 +22,11 @@ enum class LegendreAxis { class SpatialLegendreFilter : public TallyFilter { public: - virtual std::string type() const override {return "spatiallegendre";} + std::string type() const override {return "spatiallegendre";} - virtual ~SpatialLegendreFilter() override = default; + ~SpatialLegendreFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { order_ = std::stoi(get_node_value(node, "order")); @@ -48,7 +48,7 @@ public: n_bins_ = order_ + 1; } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -76,7 +76,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -92,7 +92,7 @@ public: write_dataset(filter_group, "max", max_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; diff --git a/include/openmc/tallies/tally_filter_surface.h b/include/openmc/tallies/tally_filter_surface.h index d8e4075f90..fa98be8bed 100644 --- a/include/openmc/tallies/tally_filter_surface.h +++ b/include/openmc/tallies/tally_filter_surface.h @@ -20,18 +20,18 @@ namespace openmc { class SurfaceFilter : public TallyFilter { public: - virtual std::string type() const override {return "surface";} + std::string type() const override {return "surface";} - virtual ~SurfaceFilter() override = default; + ~SurfaceFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { surfaces_ = get_node_array(node, "bins"); n_bins_ = surfaces_.size(); } - virtual void + void initialize() override { for (auto& s : surfaces_) { @@ -51,7 +51,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -66,7 +66,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -75,7 +75,7 @@ public: write_dataset(filter_group, "bins", surface_ids); } - virtual std::string + std::string text_label(int bin) const override { return "Surface " + std::to_string(surfaces[surfaces_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_universe.h b/include/openmc/tallies/tally_filter_universe.h index 930856c6a2..9654f7625e 100644 --- a/include/openmc/tallies/tally_filter_universe.h +++ b/include/openmc/tallies/tally_filter_universe.h @@ -20,18 +20,18 @@ namespace openmc { class UniverseFilter : public TallyFilter { public: - virtual std::string type() const override {return "universe";} + std::string type() const override {return "universe";} - virtual ~UniverseFilter() override = default; + ~UniverseFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { universes_ = get_node_array(node, "bins"); n_bins_ = universes_.size(); } - virtual void + void initialize() override { for (auto& u : universes_) { @@ -51,7 +51,7 @@ public: } } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -64,7 +64,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -73,7 +73,7 @@ public: write_dataset(filter_group, "bins", universe_ids); } - virtual std::string + std::string text_label(int bin) const override { return "Universe " + std::to_string(universes[universes_[bin-1]]->id_); diff --git a/include/openmc/tallies/tally_filter_zernike.h b/include/openmc/tallies/tally_filter_zernike.h index c074d171fa..397750ebda 100644 --- a/include/openmc/tallies/tally_filter_zernike.h +++ b/include/openmc/tallies/tally_filter_zernike.h @@ -19,11 +19,11 @@ namespace openmc { class ZernikeFilter : public TallyFilter { public: - virtual std::string type() const override {return "zernike";} + std::string type() const override {return "zernike";} - virtual ~ZernikeFilter() override = default; + ~ZernikeFilter() = default; - virtual void + void from_xml(pugi::xml_node node) override { order_ = std::stoi(get_node_value(node, "order")); @@ -33,7 +33,7 @@ public: calc_n_bins(); } - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -54,7 +54,7 @@ public: } } - virtual void + void to_statepoint(hid_t filter_group) const override { TallyFilter::to_statepoint(filter_group); @@ -64,7 +64,7 @@ public: write_dataset(filter_group, "r", r_); } - virtual std::string + std::string text_label(int bin) const override { std::stringstream out; @@ -92,11 +92,9 @@ public: class ZernikeRadialFilter : public ZernikeFilter { public: - virtual std::string type() const override {return "zernikeradial";} + std::string type() const override {return "zernikeradial";} - virtual ~ZernikeRadialFilter() override = default; - - virtual void + void get_all_bins(Particle* p, int estimator, TallyFilterMatch& match) const override { @@ -116,13 +114,13 @@ public: } } - virtual std::string + std::string text_label(int bin) const override { return "Zernike expansion, Z" + std::to_string(2*(bin-1)) + ",0"; } - virtual void calc_n_bins() override {n_bins_ = order_ / 2 + 1;} + void calc_n_bins() override {n_bins_ = order_ / 2 + 1;} }; } // namespace openmc