diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-02-21 14:01:24 -0500 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-02-21 14:01:24 -0500 |
| commit | d944bcc3df0a8d7a10b755b5858c85e61a835a35 (patch) | |
| tree | 611a52a9d51439e9cd39b6ef9bfe35b0e966c38d /src/measurements.hpp | |
| parent | a408c9884e5267a6fd3c9555b1c94e32df92fee5 (diff) | |
| download | fuse_networks-d944bcc3df0a8d7a10b755b5858c85e61a835a35.tar.gz fuse_networks-d944bcc3df0a8d7a10b755b5858c85e61a835a35.tar.bz2 fuse_networks-d944bcc3df0a8d7a10b755b5858c85e61a835a35.zip | |
simplified and sped up measurementsn substantially, correlation functions and some distributions again incompatible
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index e267064..0fd4644 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -19,12 +19,14 @@ 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; double Lx; double Ly; @@ -40,16 +42,14 @@ class ma : public hooks { 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> sd; // pre-fracture damage distribution std::vector<uint64_t> sD; // post-fracture 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>> cll; // damage-damage distribution - std::vector<std::vector<uint64_t>> cdd; // damage-damage distribution - std::vector<std::vector<uint64_t>> cDD; // damage-damage distribution - std::vector<std::vector<uint64_t>> csD; // damage-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> cDD; // damage-damage distribution + std::vector<uint64_t> csD; // damage-damage distribution uint64_t Nc; uint64_t Na; @@ -57,9 +57,9 @@ class ma : public hooks { long double lv; - std::list<std::list<unsigned>> avalanches; + std::list<std::list<graph::coordinate>> avalanches; - ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta, unsigned Ncum); + ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta); ~ma(); void pre_fracture(const network &) override; |