diff options
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index 7c9d49c..51f7080 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -19,40 +19,20 @@ class ma : public hooks { // - interface for turning on and off specific measurements // private: - /* - double *fftw_forward_in; - fftw_complex *fftw_forward_out; - fftw_complex *fftw_reverse_in; - double *fftw_reverse_out; - fftw_plan forward_plan; - fftw_plan reverse_plan; - */ - unsigned N; - unsigned Mx; - unsigned My; Graph G; -// std::ofstream stress_file; + + unsigned num; // measurement storage - std::vector<uint64_t> sc; // non-spanning cluster size distribution std::vector<uint64_t> sn; // non-spanning cluster size distribution std::vector<uint64_t> ss; // minimal spanning cluster size distribution std::vector<uint64_t> sm; // spanning cluster size distribution - std::vector<uint64_t> sa; // non-final avalanche size distribution std::vector<uint64_t> sl; // final avalanche size distribution std::vector<uint64_t> sb; // final avalanche size distribution - std::vector<uint64_t> sD; // post-fracture damage distribution - std::vector<uint64_t> ccc; // cluster-cluster correlations - std::vector<uint64_t> css; // surface-surface correlations - std::vector<uint64_t> cmm; // surface-surface correlations - std::vector<uint64_t> caa; // avalanche-avalanche correlations - std::vector<uint64_t> cll; // damage-damage distribution - std::vector<uint64_t> cbb; // damage-damage distribution - std::vector<uint64_t> cDD; // damage-damage distribution - std::vector<uint64_t> csD; // damage-damage distribution - uint64_t Nc; - uint64_t Na; - uint64_t Nb; + std::vector<uint64_t> sd; // final avalanche size distribution + std::vector<uint64_t> sc; // non-spanning cluster size distribution + std::vector<uint64_t> sa; // non-final avalanche size distribution + std::vector<uint64_t> sA; // non-final avalanche size distribution public: long double lv; |