Merge branch 'develop' into timer-bugfix

include/openmc/constants.h

@@ -420,6 +420,7 @@ constexpr int DIFF_NUCLIDE_DENSITY {2};
 constexpr int DIFF_TEMPERATURE {3};
 
 constexpr int C_NONE {-1};
+constexpr int F90_NONE {0}; //TODO: replace usage of this with C_NONE
 
 // Interpolation rules
 enum class Interpolation {

include/openmc/tallies/filter.h

@@ -2,6 +2,7 @@
 #define OPENMC_TALLIES_FILTER_H
 
 #include <cstdint>
+#include <memory>
 #include <string>
 #include <vector>
 
@@ -81,7 +82,7 @@ extern "C" int32_t n_filters;
 extern std::vector<FilterMatch> filter_matches;
 #pragma omp threadprivate(filter_matches)
 
-extern std::vector<Filter*> tally_filters;
+extern std::vector<std::unique_ptr<Filter>> tally_filters;
 
 //==============================================================================
 

include/openmc/tallies/filter_delayedgroup.h

@@ -0,0 +1,37 @@
+#ifndef OPENMC_TALLIES_FILTER_DELAYEDGROUP_H
+#define OPENMC_TALLIES_FILTER_DELAYEDGROUP_H
+
+#include <vector>
+
+#include "openmc/tallies/filter.h"
+
+namespace openmc {
+
+//==============================================================================
+//! Bins outgoing fission neutrons in their delayed groups.
+//!
+//! The get_all_bins functionality is not actually used.  The bins are manually
+//! iterated over in the scoring subroutines.
+//==============================================================================
+
+class DelayedGroupFilter : public Filter
+{
+public:
+  ~DelayedGroupFilter() = default;
+
+  std::string type() const override {return "delayedgroup";}
+
+  void from_xml(pugi::xml_node node) override;
+
+  void get_all_bins(const Particle* p, int estimator, FilterMatch& match)
+  const override;
+
+  void to_statepoint(hid_t filter_group) const override;
+
+  std::string text_label(int bin) const override;
+
+  std::vector<int> groups_;
+};
+
+} // namespace openmc
+#endif // OPENMC_TALLIES_FILTER_DELAYEDGROUP_H

include/openmc/tallies/filter_energy.h

@@ -0,0 +1,55 @@
+#ifndef OPENMC_TALLIES_FILTER_ENERGY_H
+#define OPENMC_TALLIES_FILTER_ENERGY_H
+
+#include <vector>
+
+#include "openmc/tallies/filter.h"
+
+namespace openmc {
+
+//==============================================================================
+//! Bins the incident neutron energy.
+//==============================================================================
+
+class EnergyFilter : public Filter
+{
+public:
+  ~EnergyFilter() = default;
+
+  std::string type() const override {return "energy";}
+
+  void from_xml(pugi::xml_node node) override;
+
+  void get_all_bins(const Particle* p, int estimator, FilterMatch& match)
+  const override;
+
+  void to_statepoint(hid_t filter_group) const override;
+
+  std::string text_label(int bin) const override;
+
+  std::vector<double> bins_;
+
+  //! True if transport group number can be used directly to get bin number
+  bool matches_transport_groups_ {false};
+};
+
+//==============================================================================
+//! Bins the outgoing neutron energy.
+//!
+//! Only scattering events use the get_all_bins functionality.  Nu-fission
+//! tallies manually iterate over the filter bins.
+//==============================================================================
+
+class EnergyoutFilter : public EnergyFilter
+{
+public:
+  std::string type() const override {return "energyout";}
+
+  void get_all_bins(const Particle* p, int estimator, FilterMatch& match)
+  const override;
+
+  std::string text_label(int bin) const override;
+};
+
+} // namespace openmc
+#endif // OPENMC_TALLIES_FILTER_ENERGY_H

include/openmc/tallies/filter_particle.h

@@ -0,0 +1,34 @@
+#ifndef OPENMC_TALLIES_FILTER_PARTICLE_H
+#define OPENMC_TALLIES_FILTER_PARTICLE_H
+
+#include <vector>
+
+#include "openmc/tallies/filter.h"
+
+namespace openmc {
+
+//==============================================================================
+//! Bins by type of particle (e.g. neutron, photon).
+//==============================================================================
+
+class ParticleFilter : public Filter
+{
+public:
+  ~ParticleFilter() = default;
+
+  std::string type() const override {return "particle";}
+
+  void from_xml(pugi::xml_node node) override;
+
+  void get_all_bins(const Particle* p, int estimator, FilterMatch& match)
+  const override;
+
+  void to_statepoint(hid_t filter_group) const override;
+
+  std::string text_label(int bin) const override;
+
+  std::vector<int> particles_;
+};
+
+} // namespace openmc
+#endif // OPENMC_TALLIES_FILTER_PARTICLE_H