Merge pull request #6092 from gassmoeller/update_generator_subsection

Update subsection for random uniform particle generator

benchmarks/annulus/transient/transient_annulus.prm

@@ -85,7 +85,7 @@ subsection Particles
   set Minimum particles per cell = 12
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 49152
     end
   end

benchmarks/rigid_shear/transient/rigid_shear.prm

@@ -126,7 +126,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 8192
     end
   end

benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam_particles.prm

@@ -33,7 +33,7 @@ subsection Particles
   set Particle generator name     = random uniform
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 4e5
     end
   end

benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_particles.prm

@@ -35,7 +35,7 @@ subsection Particles
   set Particle generator name     = random uniform
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1e5
     end
   end

benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_yield_particles.prm

@@ -66,7 +66,7 @@ subsection Particles
   set Particle generator name     = random uniform
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1e5
     end
   end

contrib/utilities/update_scripts/prm_files/move_particles.py

@@ -75,19 +75,38 @@ def move_number_of_particles_to_correct_subsection(parameters):
                         parameters["Particles"]["value"]["Generator"]["value"]["Uniform radial"] = {"comment": "", "value" : dict({}), "type": "subsection"}
                     parameters["Particles"]["value"]["Generator"]["value"]["Uniform radial"]["value"]["Number of particles"] = parameter
 
-                elif generator == "random uniform" or generator == "probability density function":
+                elif generator == "random uniform":
+                    if not "Random uniform" in parameters["Particles"]["value"]["Generator"]["value"]:
+                        parameters["Particles"]["value"]["Generator"]["value"]["Random uniform"] = {"comment": "", "value" : dict({}), "type": "subsection"}
+                    parameters["Particles"]["value"]["Generator"]["value"]["Random uniform"]["value"]["Number of particles"] = parameter
+
+                elif generator == "probability density function":
                     if not "Probability density function" in parameters["Particles"]["value"]["Generator"]["value"]:
                         parameters["Particles"]["value"]["Generator"]["value"]["Probability density function"] = {"comment": "", "value" : dict({}), "type": "subsection"}
                     parameters["Particles"]["value"]["Generator"]["value"]["Probability density function"]["value"]["Number of particles"] = parameter
 
                 # the parameter was not used by other generators. silently delete it
             else:
                 # No generator was manually selected, move the parameter into the default generator subsection
-                if not "Probability density function" in parameters["Particles"]["value"]["Generator"]["value"]:
-                    parameters["Particles"]["value"]["Generator"]["value"]["Probability density function"] = {"comment": "", "value" : dict({}), "type": "subsection"}
-
-                parameters["Particles"]["value"]["Generator"]["value"]["Probability density function"]["value"]["Number of particles"] = parameter
-
+                if not "Random uniform" in parameters["Particles"]["value"]["Generator"]["value"]:
+                    parameters["Particles"]["value"]["Generator"]["value"]["Random uniform"] = {"comment": "", "value" : dict({}), "type": "subsection"}
+
+                parameters["Particles"]["value"]["Generator"]["value"]["Random uniform"]["value"]["Number of particles"] = parameter
+
+    # If 'random uniform' is selected or defaulted, but there is no 'random uniform' subsection, move the 'probability density function' subsection
+    # this is necessary, because for a while the 'probability density function' section was used for the 'random uniform' generator as well
+    for particle_section in ["Particles","Particles 2"]:
+        if particle_section in parameters:
+            if ("Particle generator name" in parameters[particle_section]["value"] and parameters[particle_section]["value"]["Particle generator name"]["value"] == "random uniform") \
+                or not "Particle generator name" in parameters[particle_section]["value"]:
+                if "Generator" in parameters["Particles"]["value"]:
+                    # if the parameter does not already exist in random uniform
+                    if not "Random uniform" in parameters[particle_section]["value"]["Generator"]["value"] \
+                    and "Probability density function" in parameters[particle_section]["value"]["Generator"]["value"]:
+                        subsection = parameters[particle_section]["value"]["Generator"]["value"]["Probability density function"]
+                        parameters[particle_section]["value"]["Generator"]["value"]["Random uniform"] = subsection
+                        del parameters[particle_section]["value"]["Generator"]["value"]["Probability density function"]
+
     return parameters
 
 def move_particle_postprocess_parameters_back(parameters):

cookbooks/composition_active_particles/composition_active_particles.prm

@@ -123,7 +123,7 @@ subsection Particles
   set Particle generator name = random uniform
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 100000
     end
   end

cookbooks/composition_active_particles/doc/particles.part.prm

@@ -11,7 +11,7 @@ subsection Particles
   set Particle generator name   = random uniform
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles         = 100000
     end
   end

cookbooks/composition_passive_particles/composition_passive_particles.prm

@@ -107,7 +107,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 1000
     end
   end

cookbooks/composition_passive_particles/composition_passive_particles_properties.prm

@@ -114,7 +114,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 50000
     end
   end

cookbooks/composition_passive_particles/doc/particle-properties.part.prm

@@ -10,7 +10,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 50000
     end
   end

cookbooks/composition_passive_particles/doc/particles.part.prm

@@ -13,7 +13,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 1000
     end
   end

cookbooks/convection-box-particles/convection-box-particles.prm

@@ -163,7 +163,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1000
     end
   end

cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm

@@ -138,7 +138,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1000
     end
   end

cookbooks/grain_size_ridge/doc/particles.part.prm

@@ -22,7 +22,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 500000
     end
   end

cookbooks/grain_size_ridge/grain_size_ridge.prm

@@ -302,7 +302,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 500000
     end
   end

cookbooks/subduction_initiation/subduction_initiation_particle_in_cell.prm

@@ -62,7 +62,7 @@ subsection Particles
   set Interpolation scheme = cell average
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles      = 350000
     end
   end

include/aspect/particle/generator/random_uniform.h

@@ -21,7 +21,7 @@
 #ifndef _aspect_particle_generator_random_uniform_h
 #define _aspect_particle_generator_random_uniform_h
 
-#include <aspect/particle/generator/probability_density_function.h>
+#include <aspect/particle/generator/interface.h>
 
 namespace aspect
 {

source/particle/generator/random_uniform.cc

@@ -49,7 +49,7 @@ namespace aspect
       {
         prm.enter_subsection("Generator");
         {
-          prm.enter_subsection("Probability density function");
+          prm.enter_subsection("Random uniform");
           {
             prm.declare_entry ("Number of particles", "1000",
                                Patterns::Double (0.),
@@ -92,7 +92,7 @@ namespace aspect
       {
         prm.enter_subsection("Generator");
         {
-          prm.enter_subsection("Probability density function");
+          prm.enter_subsection("Random uniform");
           {
             n_particles = static_cast<types::particle_index>(prm.get_double ("Number of particles"));
             random_cell_selection = prm.get_bool("Random cell selection");

tests/annulus_transient.prm

@@ -92,7 +92,7 @@ subsection Particles
   set Minimum particles per cell = 12
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 49152
     end
   end

tests/checkpoint_03_particles.prm

@@ -90,7 +90,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1000
     end
   end

tests/checkpoint_04_particles_no_output.prm

@@ -90,7 +90,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1000
     end
   end

tests/checkpoint_08_particles_multiple_systems.prm

@@ -91,7 +91,7 @@ subsection Particles
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 100
     end
   end
@@ -106,7 +106,7 @@ subsection Particles 2
   end
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 100
     end
   end

tests/composition_passive_particles.prm

@@ -104,7 +104,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 10
     end
   end

tests/cookbook_mantle_convection_annulus.prm

@@ -29,7 +29,7 @@ subsection Particles
       set Radial layers  = 50
     end
 
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles           = 123
     end
   end

tests/grain_size_growth_one_cell_particles.prm

@@ -35,7 +35,7 @@ subsection Particles
   set Integration scheme = rk2
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 50000
     end
   end

tests/grain_size_growth_particles.prm

@@ -42,7 +42,7 @@ subsection Particles
   set Integration scheme = rk2
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 10
     end
   end

tests/grain_size_phase_function.prm

@@ -136,7 +136,7 @@ subsection Particles
   set List of particle properties = grain size
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 10000
     end
   end

tests/gs_drucker_prager_extension.prm

@@ -86,7 +86,7 @@ subsection Particles
   set List of particle properties = grain size
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 10000
     end
   end

tests/gs_drucker_prager_extension_adiabatic.prm

@@ -85,7 +85,7 @@ subsection Particles
   set List of particle properties = grain size
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 10000
     end
   end

tests/matrix_nonzeros_2.prm

@@ -92,7 +92,7 @@ subsection Particles
   set Interpolation scheme = cell average
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 100
     end
   end

tests/matrix_nonzeros_3.prm

@@ -98,7 +98,7 @@ subsection Particles
   set Interpolation scheme = cell average
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 100
     end
   end

tests/nonlinear_channel_flow_tractions_Newton_Stokes_particles.prm

@@ -31,7 +31,7 @@ subsection Particles
   set Load balancing strategy = remove and add particles
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 512
     end
   end

tests/particle_count_statistics.prm

@@ -84,7 +84,7 @@ end
 
 subsection Particles
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles = 1000
     end
   end

tests/particle_exclude_all_properties.prm

@@ -110,7 +110,7 @@ subsection Particles
   set List of particle properties = initial position, initial composition, velocity # lpo, integrated strain invariant #function, initial composition, initial position, pT path
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 100
     end
   end

tests/particle_exclude_one_property.prm

@@ -110,7 +110,7 @@ subsection Particles
   set List of particle properties = initial position, initial composition, velocity # lpo, integrated strain invariant #function, initial composition, initial position, pT path
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 100
     end
   end

tests/particle_exclude_one_property_vtu.prm

@@ -110,7 +110,7 @@ subsection Particles
   set List of particle properties = initial position, initial composition, velocity # lpo, integrated strain invariant #function, initial composition, initial position, pT path
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 100
     end
   end

tests/particle_exclude_three_properties_vtu.prm

@@ -110,7 +110,7 @@ subsection Particles
   set List of particle properties = initial position, initial composition, velocity # lpo, integrated strain invariant #function, initial composition, initial position, pT path
 
   subsection Generator
-    subsection Probability density function
+    subsection Random uniform
       set Number of particles        = 100
     end
   end