Remove disturbance mean interval from FF16 and water environments.

traitecoevo · Apr 19, 2021 · cbaa0c9 · cbaa0c9
1 parent 883c5a5
commit cbaa0c9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/inst/include/plant/models/ff16_environment.h b/inst/include/plant/models/ff16_environment.h
@@ -15,7 +15,6 @@ class FF16_Environment : public Environment {
   FF16_Environment() {
     // Define an anonymous function to pass got the environment generator
     time = NA_REAL;
-    //disturbance_regime = 0;
     seed_rain = { 1.0, 1.0, 1.0 };
     seed_rain_index = 0;
     canopy = Canopy();
@@ -26,7 +25,6 @@ class FF16_Environment : public Environment {
                    double k_I,
                    Control control) {
     time = 0.0;
-    //disturbance_regime = disturbance_mean_interval;
     seed_rain = seed_rain_;
     seed_rain_index = 0;
     canopy = Canopy(k_I, control);

diff --git a/inst/include/plant/models/water_environment.h b/inst/include/plant/models/water_environment.h
@@ -15,7 +15,6 @@ class Water_Environment : public Environment {
 
   Water_Environment() {
     time = NA_REAL;
-    disturbance_regime = 30;
     seed_rain = { 1.0, 1.0, 1.0 };
     seed_rain_index = 0;
     k_I = NA_REAL;
@@ -38,7 +37,6 @@ class Water_Environment : public Environment {
                               control.environment_light_nbase,
                               control.environment_light_max_depth);
     time = 0.0;
-    disturbance_regime = disturbance_mean_interval;
     seed_rain = seed_rain_;
     seed_rain_index = 0;
     inflow_rate = 1.0;
@@ -80,7 +78,7 @@ class Water_Environment : public Environment {
   }
 
 
-  // TODO: move these to Environment 
+  // TODO: move these to Environment
   template <typename Function>
   void compute_environment(Function f_compute_competition,
                            double height_max) {