Move most active_tally lists to C++

This commit is contained in:
Sterling Harper 2019-01-26 16:26:03 -05:00
parent 8c4a74ec84
commit e99fd9e7e4
9 changed files with 219 additions and 124 deletions

View file

@ -30,6 +30,8 @@ public:
int32_t n_filter_bins() const {return n_filter_bins_;}
int type_ {TALLY_VOLUME}; //!< volume, surface current
//! Event type that contributes to this tally
int estimator_ {ESTIMATOR_TRACKLENGTH};
@ -64,12 +66,12 @@ extern "C" double total_weight;
namespace model {
extern std::vector<std::unique_ptr<Tally>> tallies;
extern std::vector<int> active_tallies;
extern std::vector<int> active_analog_tallies;
extern std::vector<int> active_tracklength_tallies;
extern std::vector<int> active_meshsurf_tallies;
extern std::vector<int> active_collision_tallies;
extern std::vector<int> active_tallies;
extern std::vector<int> active_surface_tallies;
//extern std::vector<int> active_meshsurf_tallies;
//extern std::vector<int> active_surface_tallies;
}
// Threadprivate variables