diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-04-24 23:31:40 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2019-04-24 23:31:40 -0400 |
| commit | cb1b2e6822bdd1d1644ff2dad2d6157858e105b0 (patch) | |
| tree | 8f4cb4225d2856e87ff797d58466759dedd39882 /src/measurements.hpp | |
| parent | afe7000d6147cefd030413cb3d051c2a6260f608 (diff) | |
| download | fuse_networks-cb1b2e6822bdd1d1644ff2dad2d6157858e105b0.tar.gz fuse_networks-cb1b2e6822bdd1d1644ff2dad2d6157858e105b0.tar.bz2 fuse_networks-cb1b2e6822bdd1d1644ff2dad2d6157858e105b0.zip | |
many changes to introduce two-component, elastic-like fracture
Diffstat (limited to 'src/measurements.hpp')
| -rw-r--r-- | src/measurements.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp index 610c266..7c9d49c 100644 --- a/src/measurements.hpp +++ b/src/measurements.hpp @@ -35,6 +35,7 @@ class ma : public hooks { // 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 @@ -56,11 +57,11 @@ class ma : public hooks { public: long double lv; - std::list<std::list<graph::coordinate>> avalanches; + std::list<std::list<unsigned>> avalanches; std::list<unsigned> last_avalanche; std::string model_string; - ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta); + ma(unsigned Lx, unsigned Ly, double beta); ma(unsigned n, double a, unsigned Mx, unsigned My, double beta); ~ma(); |