update get_min_position and fix particle_histogram_addition_singlecell

Author: JarettBakerDunn

benchmarks/particle_distribution/addition_algorithm_comparison_constantV_data.csv

@@ -1,8 +1,8 @@
 Particle Addition Algorithm,Time Averaged Cell Score Standard Deviation,Time Averaged Mean Score,Time Averaged Maximum Score
 "Random, constant V",0.021392537313432835,0.007291044776119403,0.17071542288557215
 "Histogram, constant V",0.013744776119402984,0.004796019900497512,0.09791393034825871
-"Gaussian, constant V",0.011992039800995025,0.00433681592039801,0.07456616915422885
-"Cutoff-w1, constant V",0.008707462686567165,0.002514925373134328,0.05777462686567164
-"Cutoff-c1, constant V",0.008741791044776119,0.002350746268656716,0.060731840796019905
-"Uniform, constant V",0.014054228855721392,0.00551592039800995,0.07942238805970149
-"Triangular, constant V",0.008707462686567165,0.002514925373134328,0.05777462686567164
+"Gaussian, constant V",0.012381592039800996,0.004479601990049751,0.07742139303482586
+"Cutoff-w1, constant V",0.008975124378109453,0.0025407960199004976,0.061141293532338305
+"Cutoff-c1, constant V",0.008644776119402986,0.002418407960199005,0.06105870646766169
+"Uniform, constant V",0.012350746268656716,0.004520398009950248,0.07983034825870647
+"Triangular, constant V",0.008975124378109453,0.0025407960199004976,0.061141293532338305

benchmarks/particle_distribution/addition_algorithm_comparison_oscillatingV_data.csv

@@ -1,8 +1,8 @@
 Particle Addition Algorithm,Time Averaged Cell Score Standard Deviation,Time Averaged Mean Score,Time Averaged Maximum Score
 "Random, oscillating V",0.01756865671641791,0.005158706467661692,0.12560049751243782
 "Histogram, oscillating V",0.014391542288557211,0.0038726368159203986,0.10112537313432836
-"Gaussian, oscillating V",0.013983084577114427,0.003772139303482587,0.09152835820895523
-"Cutoff-w1, oscillating V",0.011802487562189054,0.0025592039800995023,0.08679552238805971
-"Cutoff-c1, oscillating V",0.011725373134328356,0.0025134328358208955,0.08731293532338309
-"Uniform, oscillating V",0.015202985074626864,0.004738805970149254,0.0932771144278607
-"Triangular, oscillating V",0.011802487562189054,0.0025592039800995023,0.08679552238805971
+"Gaussian, oscillating V",0.013679104477611942,0.0037542288557213927,0.09291940298507463
+"Cutoff-w1, oscillating V",0.01167960199004975,0.002507960199004975,0.0880860696517413
+"Cutoff-c1, oscillating V",0.01169452736318408,0.0024512437810945277,0.08780447761194031
+"Uniform, oscillating V",0.013403980099502487,0.0037497512437810947,0.09195373134328359
+"Triangular, oscillating V",0.01167960199004975,0.002507960199004975,0.0880860696517413

benchmarks/particle_distribution/doc/ave-score-constant-addition.png

@@ -199,8 +199,8 @@ namespace aspect
         /**
          * Returns the location of the minimum of the point-density function.
          */
-        Point<dim>
-        get_min_position() const;
+        std::vector<Point<dim>>
+        get_min_positions() const;
 
         /**
          * Returns the standard deviation of the point-density function.
@@ -272,9 +272,11 @@ namespace aspect
         Point<dim> max_position;
 
         /**
-         * `min_position` holds position within the cell where the minimum point density was measured.
+         * `min_positions` holds positions within the cell where the minimum point density was measured.
+         * This is a std::vector because there is a chance that there will be multiple minimum positions
+         * with the same value, especially when particles are already arranged in a regular pattern.
          */
-        Point<dim> min_position;
+        std::vector<Point<dim>> min_positions;
 
         /**
          * `standard_deviation` holds the standard_deviation of the point-density function after it has been computed.

benchmarks/particle_distribution/doc/ave-score-oscillate-addition.png

@@ -301,9 +301,17 @@ namespace aspect
                             {
                               max_position = position_in_cell;
                             }
+
+                          // if this value is less than the min, we found a new minimum value, clear the list
                           if (this_value < min)
                             {
-                              min_position = position_in_cell;
+                              min_positions.clear();
+                              min_positions.push_back(position_in_cell);
+                            }
+                          else if (this_value == min)
+                            {
+                              // Add this position to the vector of identical minimum values
+                              min_positions.push_back(position_in_cell);
                             }
 
                           max = std::max(max, this_value);
@@ -322,9 +330,16 @@ namespace aspect
                         {
                           max_position = position_in_cell;
                         }
+                      // if this value is less than the min, we found a new minimum value, clear the list
                       if (this_value < min)
                         {
-                          min_position = position_in_cell;
+                          min_positions.clear();
+                          min_positions.push_back(position_in_cell);
+                        }
+                      else if (this_value == min)
+                        {
+                          // Add this position to the vector of identical minimum values
+                          min_positions.push_back(position_in_cell);
                         }
 
                       max = std::max(max, this_value);
@@ -415,10 +430,10 @@ namespace aspect
 
 
     template <int dim>
-    Point<dim>
-    ParticlePDF<dim>::get_min_position() const
+    std::vector<Point<dim>>
+    ParticlePDF<dim>::get_min_positions() const
     {
-      return min_position;
+      return min_positions;
     }