diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-01-24 14:32:47 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-01-24 14:32:47 -0500 |
| commit | d6f6fab35801f4c8eb014736fabdc85b8b90a491 (patch) | |
| tree | cbe6e789d34b7be340631eda6784b2abb40c0d33 /src/measurements.hpp | |
| parent | 9c5779adc0a52cb88ccbfa315cf11544f00148bb (diff) | |
| download | fuse_networks-d6f6fab35801f4c8eb014736fabdc85b8b90a491.tar.gz fuse_networks-d6f6fab35801f4c8eb014736fabdc85b8b90a491.tar.bz2 fuse_networks-d6f6fab35801f4c8eb014736fabdc85b8b90a491.zip | |
removed bin counting measurement, added measurement of higher cumulants of the correlation functions
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index 3d4ff3e..aa41fd1 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -32,6 +32,7 @@ class ma : public hooks { unsigned int My; double beta; Graph G; +// std::ofstream stress_file; // measurement storage std::vector<uint64_t> sc; // cluster size distribution @@ -40,13 +41,13 @@ class ma : public hooks { std::vector<uint64_t> sA; // avalanche size distribution std::vector<uint64_t> sd; // avalanche size distribution std::vector<uint64_t> sb; // bin size 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> Cdd; // damage-damage distribution - std::vector<uint64_t> Cll; // damage-damage distribution - std::vector<uint64_t> Cee; // damage-damage distribution + std::vector<std::vector<uint64_t>> Ccc; // cluster-cluster correlations + std::vector<std::vector<uint64_t>> Css; // surface-surface correlations + std::vector<std::vector<uint64_t>> Cmm; // surface-surface correlations + std::vector<std::vector<uint64_t>> Caa; // avalanche-avalanche correlations + std::vector<std::vector<uint64_t>> Cdd; // damage-damage distribution + std::vector<std::vector<uint64_t>> Cll; // damage-damage distribution + std::vector<std::vector<uint64_t>> Cee; // damage-damage distribution uint64_t Nc; uint64_t NC; uint64_t Na; @@ -58,7 +59,7 @@ class ma : public hooks { std::list<std::list<unsigned int>> avalanches; - ma(double Lx, double Ly, unsigned int Mx, unsigned int My, double beta); + ma(double Lx, double Ly, unsigned int Mx, unsigned int My, double beta, unsigned Ncum); ~ma(); void pre_fracture(const network &) override; |