summaryrefslogtreecommitdiff
path: root/src/measurements.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/measurements.hpp')
-rw-r--r--src/measurements.hpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/measurements.hpp b/src/measurements.hpp
index 0fd4644..600c6ac 100644
--- a/src/measurements.hpp
+++ b/src/measurements.hpp
@@ -28,11 +28,8 @@ class ma : public hooks {
fftw_plan reverse_plan;
*/
unsigned N;
- double Lx;
- double Ly;
unsigned Mx;
unsigned My;
- double beta;
Graph G;
// std::ofstream stress_file;
@@ -56,10 +53,11 @@ class ma : public hooks {
public:
long double lv;
-
std::list<std::list<graph::coordinate>> avalanches;
+ std::string model_string;
ma(double Lx, double Ly, unsigned Mx, unsigned My, double beta);
+ ma(unsigned n, double a, unsigned Mx, unsigned My, double beta);
~ma();
void pre_fracture(const network &) override;