From c80bee0ea904d06c0ecfedb407bc018ba506cbe8 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Fri, 8 Feb 2019 12:20:56 -0500 Subject: revised measurements to bin correctly, renamed some. not compatible with earlier measurements! --- src/measurements.hpp | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'src/measurements.hpp') diff --git a/src/measurements.hpp b/src/measurements.hpp index aca6dce..1d263c3 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -35,26 +35,23 @@ class ma : public hooks { // std::ofstream stress_file; // measurement storage - std::vector sc; // cluster size distribution - std::vector sa; // avalanche size distribution - std::vector ss; // avalanche size distribution - std::vector sC; // cluster size distribution - std::vector sA; // avalanche size distribution - std::vector sd; // avalanche size distribution - std::vector sD; // avalanche size distribution + std::vector sc; // non-spanning cluster size distribution + std::vector ss; // minimal spanning cluster size distribution + std::vector sm; // spanning cluster size distribution + std::vector sa; // non-final avalanche size distribution + std::vector sl; // final avalanche size distribution + std::vector sd; // pre-fracture damage distribution + std::vector sD; // post-fracture damage distribution std::vector> Ccc; // cluster-cluster correlations std::vector> Css; // surface-surface correlations std::vector> Cmm; // surface-surface correlations std::vector> Caa; // avalanche-avalanche correlations - std::vector> Cdd; // damage-damage distribution std::vector> Cll; // damage-damage distribution - std::vector> Cee; // damage-damage distribution + std::vector> Cdd; // damage-damage distribution std::vector> CDD; // damage-damage distribution std::vector> CsD; // damage-damage distribution uint64_t Nc; - uint64_t NC; uint64_t Na; - uint64_t NA; public: long double lv; -- cgit v1.2.3-54-g00ecf