From 578652bf9d57a94a362b4c8a6d36c1755a214863 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Sat, 9 Feb 2019 22:13:14 -0500 Subject: now collect correlatino functions and size distributions for truncated and untruncated measurements --- src/measurements.hpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/measurements.hpp') diff --git a/src/measurements.hpp b/src/measurements.hpp index 1d263c3..c735163 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -42,6 +42,13 @@ class ma : public hooks { std::vector sl; // final avalanche size distribution std::vector sd; // pre-fracture damage distribution std::vector sD; // post-fracture damage 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 @@ -50,6 +57,14 @@ class ma : public hooks { std::vector> Cdd; // damage-damage distribution std::vector> CDD; // damage-damage distribution std::vector> CsD; // damage-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> cll; // 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 Na; -- cgit v1.2.3-54-g00ecf