From 18ca9c64f05c4d885b12b1703242f1a0a6183404 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 18 Oct 2024 15:38:08 +0200 Subject: [PATCH 1/4] Update particle generator subsection --- .../prm_files/move_particles.py | 31 +++++++++++++++---- source/particle/generator/random_uniform.cc | 4 +-- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/contrib/utilities/update_scripts/prm_files/move_particles.py b/contrib/utilities/update_scripts/prm_files/move_particles.py index 54f4544ddf1..b37568b5af0 100644 --- a/contrib/utilities/update_scripts/prm_files/move_particles.py +++ b/contrib/utilities/update_scripts/prm_files/move_particles.py @@ -75,7 +75,12 @@ 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 @@ -83,11 +88,25 @@ def move_number_of_particles_to_correct_subsection(parameters): # 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): diff --git a/source/particle/generator/random_uniform.cc b/source/particle/generator/random_uniform.cc index ec335739f5e..ca52c45e4d2 100644 --- a/source/particle/generator/random_uniform.cc +++ b/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(prm.get_double ("Number of particles")); random_cell_selection = prm.get_bool("Random cell selection"); From 804d04edcd3d859e26ccc855463a9c93b9d6cd12 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 18 Oct 2024 15:41:48 +0200 Subject: [PATCH 2/4] Update prm files --- benchmarks/annulus/transient/transient_annulus.prm | 2 +- benchmarks/rigid_shear/transient/rigid_shear.prm | 2 +- .../viscoelastic_bending_beam_particles.prm | 2 +- .../viscoelastic_stress_build-up_particles.prm | 2 +- .../viscoelastic_stress_build-up_yield_particles.prm | 2 +- .../composition_active_particles.prm | 2 +- .../composition_active_particles/doc/particles.part.prm | 2 +- .../composition_passive_particles.prm | 2 +- .../composition_passive_particles_properties.prm | 2 +- .../doc/particle-properties.part.prm | 2 +- .../composition_passive_particles/doc/particles.part.prm | 2 +- .../convection-box-particles/convection-box-particles.prm | 2 +- .../tutorial-onset-of-convection/model_input/tutorial.prm | 2 +- cookbooks/grain_size_ridge/doc/particles.part.prm | 2 +- cookbooks/grain_size_ridge/grain_size_ridge.prm | 2 +- .../subduction_initiation_particle_in_cell.prm | 2 +- tests/annulus_transient.prm | 2 +- tests/checkpoint_03_particles.prm | 2 +- tests/checkpoint_04_particles_no_output.prm | 2 +- tests/checkpoint_08_particles_multiple_systems.prm | 4 ++-- tests/composition_passive_particles.prm | 2 +- tests/cookbook_mantle_convection_annulus.prm | 2 +- tests/grain_size_growth_one_cell_particles.prm | 2 +- tests/grain_size_growth_particles.prm | 2 +- tests/grain_size_phase_function.prm | 2 +- tests/gs_drucker_prager_extension.prm | 2 +- tests/gs_drucker_prager_extension_adiabatic.prm | 2 +- tests/matrix_nonzeros_2.prm | 2 +- tests/matrix_nonzeros_3.prm | 2 +- ...linear_channel_flow_tractions_Newton_Stokes_particles.prm | 2 +- tests/nsinker_bfbt.prm | 2 ++ tests/particle_count_statistics.prm | 2 +- tests/particle_exclude_all_properties.prm | 2 +- tests/particle_exclude_one_property.prm | 2 +- tests/particle_exclude_one_property_vtu.prm | 2 +- tests/particle_exclude_three_properties_vtu.prm | 2 +- tests/particle_exclude_two_properties_vtu.prm | 2 +- tests/particle_fast_evaluate_many_compositions.prm | 2 +- tests/particle_fast_evaluate_multiple_compositions.prm | 2 +- tests/particle_generator_random_uniform.prm | 2 +- tests/particle_generator_random_uniform_3mpi_1particle.prm | 2 +- tests/particle_generator_random_uniform_3mpi_2particle.prm | 2 +- tests/particle_generator_random_uniform_3mpi_3particle.prm | 2 +- tests/particle_generator_random_uniform_3mpi_4particle.prm | 2 +- .../particle_generator_random_uniform_deterministic_cell.prm | 2 +- tests/particle_generator_random_uniform_empty_rank.prm | 2 +- tests/particle_integrator_euler.prm | 2 +- tests/particle_integrator_rk4.prm | 2 +- tests/particle_interpolator_cell_average.prm | 2 +- tests/particle_interpolator_cell_average_2.prm | 2 +- tests/particle_interpolator_distance_weighted_average.prm | 2 +- tests/particle_interpolator_empty_cells.prm | 2 +- tests/particle_interpolator_from_ghost_cells.prm | 2 +- tests/particle_interpolator_nearest_neighbor.prm | 5 ----- ...icle_interpolator_quadratic_least_squares_2d_periodic.prm | 2 +- tests/particle_interpolator_time_dependence.prm | 2 +- tests/particle_load_balancing_none.prm | 2 +- tests/particle_load_balancing_removal.prm | 2 +- tests/particle_load_balancing_removal_addition.prm | 2 +- .../particle_load_balancing_removal_addition_properties.prm | 2 +- .../particle_load_balancing_repartition_multiple_systems.prm | 2 ++ tests/particle_multiple_systems.prm | 4 ++-- tests/particle_multiple_systems_hdf5.prm | 4 ++-- tests/particle_multiple_systems_vtu.prm | 4 ++-- tests/particle_output_gnuplot.prm | 2 +- tests/particle_output_hdf5.prm | 2 +- tests/particle_output_multiple_formats.prm | 2 +- tests/particle_output_none.prm | 2 +- tests/particle_output_vtu.prm | 2 +- tests/particle_output_vtu_group.prm | 2 +- tests/particle_output_vtu_temp.prm | 2 +- tests/particle_periodic_boundaries.prm | 2 +- tests/particle_periodic_boundaries_dc.prm | 2 +- tests/particle_periodic_boundaries_rk4.prm | 2 +- tests/particle_property_initial_composition.prm | 2 +- tests/particle_property_integrated_strain_invariant.prm | 2 +- tests/particle_property_integrated_strain_pure_shear.prm | 2 +- tests/particle_property_integrated_strain_simple_shear.prm | 2 +- ...rticle_property_multiple_functions_with_interpolation.prm | 2 +- tests/particle_property_post_initialize_function.prm | 2 +- tests/update_script_2/updated2.prm | 2 +- tests/van_keken_smooth_particle.prm | 2 +- tests/visco_plastic_vep_stress_build-up_yield_particles.prm | 2 +- ...sco_plastic_yield_noninitial-plastic-strain_particles.prm | 2 +- ...isco_plastic_yield_plastic_strain_weakening_particles.prm | 2 +- ...stic_yield_plastic_viscous_strain_weakening_particles.prm | 2 +- tests/visco_plastic_yield_strain_weakening_particles.prm | 2 +- ...isco_plastic_yield_viscous_strain_weakening_particles.prm | 2 +- tests/viscoelastic_bending_beam_particles.prm | 2 +- tests/viscoelastic_numerical_elastic_time_step_particles.prm | 2 +- tests/world_builder_select_grains.prm | 2 +- 91 files changed, 96 insertions(+), 97 deletions(-) diff --git a/benchmarks/annulus/transient/transient_annulus.prm b/benchmarks/annulus/transient/transient_annulus.prm index b43427e64ad..5e4b6da9f78 100644 --- a/benchmarks/annulus/transient/transient_annulus.prm +++ b/benchmarks/annulus/transient/transient_annulus.prm @@ -81,7 +81,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 diff --git a/benchmarks/rigid_shear/transient/rigid_shear.prm b/benchmarks/rigid_shear/transient/rigid_shear.prm index f078af9d729..52b9e80adc9 100644 --- a/benchmarks/rigid_shear/transient/rigid_shear.prm +++ b/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 diff --git a/benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam_particles.prm b/benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam_particles.prm index fffcc43c368..8f2fb4c2c68 100644 --- a/benchmarks/viscoelastic_bending_beam/viscoelastic_bending_beam_particles.prm +++ b/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 diff --git a/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_particles.prm b/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_particles.prm index ce15c75bc0d..427f2439829 100644 --- a/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_particles.prm +++ b/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 diff --git a/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_yield_particles.prm b/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_yield_particles.prm index 467c1d09fc2..1d915b02615 100644 --- a/benchmarks/viscoelastic_stress_build-up/viscoelastic_stress_build-up_yield_particles.prm +++ b/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 diff --git a/cookbooks/composition_active_particles/composition_active_particles.prm b/cookbooks/composition_active_particles/composition_active_particles.prm index 124e4383cf8..0ef74b3ddf8 100644 --- a/cookbooks/composition_active_particles/composition_active_particles.prm +++ b/cookbooks/composition_active_particles/composition_active_particles.prm @@ -119,7 +119,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 diff --git a/cookbooks/composition_active_particles/doc/particles.part.prm b/cookbooks/composition_active_particles/doc/particles.part.prm index d43080c8b9e..029d6a315fc 100644 --- a/cookbooks/composition_active_particles/doc/particles.part.prm +++ b/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 diff --git a/cookbooks/composition_passive_particles/composition_passive_particles.prm b/cookbooks/composition_passive_particles/composition_passive_particles.prm index e7bcbabe929..10c908db7c6 100644 --- a/cookbooks/composition_passive_particles/composition_passive_particles.prm +++ b/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 diff --git a/cookbooks/composition_passive_particles/composition_passive_particles_properties.prm b/cookbooks/composition_passive_particles/composition_passive_particles_properties.prm index d5f29bcf12d..43961ab6876 100644 --- a/cookbooks/composition_passive_particles/composition_passive_particles_properties.prm +++ b/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 diff --git a/cookbooks/composition_passive_particles/doc/particle-properties.part.prm b/cookbooks/composition_passive_particles/doc/particle-properties.part.prm index 51f951526e7..4778261c8ef 100644 --- a/cookbooks/composition_passive_particles/doc/particle-properties.part.prm +++ b/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 diff --git a/cookbooks/composition_passive_particles/doc/particles.part.prm b/cookbooks/composition_passive_particles/doc/particles.part.prm index 6036ea43824..abe53e954d2 100644 --- a/cookbooks/composition_passive_particles/doc/particles.part.prm +++ b/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 diff --git a/cookbooks/convection-box-particles/convection-box-particles.prm b/cookbooks/convection-box-particles/convection-box-particles.prm index b4a8978e456..6e445bbafa7 100644 --- a/cookbooks/convection-box-particles/convection-box-particles.prm +++ b/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 diff --git a/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm b/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm index 1c33a21fda4..0911d4ec538 100644 --- a/cookbooks/convection-box/tutorial-onset-of-convection/model_input/tutorial.prm +++ b/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 diff --git a/cookbooks/grain_size_ridge/doc/particles.part.prm b/cookbooks/grain_size_ridge/doc/particles.part.prm index b1842b55fb9..c8f7b4b913e 100644 --- a/cookbooks/grain_size_ridge/doc/particles.part.prm +++ b/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 diff --git a/cookbooks/grain_size_ridge/grain_size_ridge.prm b/cookbooks/grain_size_ridge/grain_size_ridge.prm index 7eb89b850bd..6878863b095 100644 --- a/cookbooks/grain_size_ridge/grain_size_ridge.prm +++ b/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 diff --git a/cookbooks/subduction_initiation/subduction_initiation_particle_in_cell.prm b/cookbooks/subduction_initiation/subduction_initiation_particle_in_cell.prm index 2b40ad29d20..1670b503081 100644 --- a/cookbooks/subduction_initiation/subduction_initiation_particle_in_cell.prm +++ b/cookbooks/subduction_initiation/subduction_initiation_particle_in_cell.prm @@ -58,7 +58,7 @@ subsection Particles set Interpolation scheme = cell average subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 350000 end end diff --git a/tests/annulus_transient.prm b/tests/annulus_transient.prm index 5caec07a760..bb289abc891 100644 --- a/tests/annulus_transient.prm +++ b/tests/annulus_transient.prm @@ -88,7 +88,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 diff --git a/tests/checkpoint_03_particles.prm b/tests/checkpoint_03_particles.prm index 483a6f84e35..89593d6caee 100644 --- a/tests/checkpoint_03_particles.prm +++ b/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 diff --git a/tests/checkpoint_04_particles_no_output.prm b/tests/checkpoint_04_particles_no_output.prm index 1994ec4bb68..3c5f996e219 100644 --- a/tests/checkpoint_04_particles_no_output.prm +++ b/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 diff --git a/tests/checkpoint_08_particles_multiple_systems.prm b/tests/checkpoint_08_particles_multiple_systems.prm index 457e5b77560..a5a112fe08f 100644 --- a/tests/checkpoint_08_particles_multiple_systems.prm +++ b/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 diff --git a/tests/composition_passive_particles.prm b/tests/composition_passive_particles.prm index 6c54199b045..93b5858b1b1 100644 --- a/tests/composition_passive_particles.prm +++ b/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 diff --git a/tests/cookbook_mantle_convection_annulus.prm b/tests/cookbook_mantle_convection_annulus.prm index b23e7ed85da..9dcbe46c1fd 100644 --- a/tests/cookbook_mantle_convection_annulus.prm +++ b/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 diff --git a/tests/grain_size_growth_one_cell_particles.prm b/tests/grain_size_growth_one_cell_particles.prm index 23d6fd08c8d..3910541706f 100644 --- a/tests/grain_size_growth_one_cell_particles.prm +++ b/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 diff --git a/tests/grain_size_growth_particles.prm b/tests/grain_size_growth_particles.prm index 5a43e8a6d79..fb79979d3f9 100644 --- a/tests/grain_size_growth_particles.prm +++ b/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 diff --git a/tests/grain_size_phase_function.prm b/tests/grain_size_phase_function.prm index f3c5c4ff500..4358bb14dc6 100644 --- a/tests/grain_size_phase_function.prm +++ b/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 diff --git a/tests/gs_drucker_prager_extension.prm b/tests/gs_drucker_prager_extension.prm index 5908d26fe51..d20be4295e9 100644 --- a/tests/gs_drucker_prager_extension.prm +++ b/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 diff --git a/tests/gs_drucker_prager_extension_adiabatic.prm b/tests/gs_drucker_prager_extension_adiabatic.prm index 5ab9011c1ca..5d3f73b08de 100644 --- a/tests/gs_drucker_prager_extension_adiabatic.prm +++ b/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 diff --git a/tests/matrix_nonzeros_2.prm b/tests/matrix_nonzeros_2.prm index 638cb28ebfd..758e33f3556 100644 --- a/tests/matrix_nonzeros_2.prm +++ b/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 diff --git a/tests/matrix_nonzeros_3.prm b/tests/matrix_nonzeros_3.prm index de70799971b..20dd9d30973 100644 --- a/tests/matrix_nonzeros_3.prm +++ b/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 diff --git a/tests/nonlinear_channel_flow_tractions_Newton_Stokes_particles.prm b/tests/nonlinear_channel_flow_tractions_Newton_Stokes_particles.prm index d5c54cc776c..07a0f7c39be 100644 --- a/tests/nonlinear_channel_flow_tractions_Newton_Stokes_particles.prm +++ b/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 diff --git a/tests/nsinker_bfbt.prm b/tests/nsinker_bfbt.prm index c461bda7d0b..c040091700c 100644 --- a/tests/nsinker_bfbt.prm +++ b/tests/nsinker_bfbt.prm @@ -2,6 +2,7 @@ set Dimension = 3 include $ASPECT_SOURCE_DIR/benchmarks/nsinker/nsinker.prm + # Follow as closely as possible the parameters from Rudi et al. (2017) subsection Solver parameters subsection Stokes solver parameters @@ -18,6 +19,7 @@ subsection Solver parameters set AMG aggregation threshold = 0.02 end end + subsection Mesh refinement set Initial adaptive refinement = 0 set Initial global refinement = 1 diff --git a/tests/particle_count_statistics.prm b/tests/particle_count_statistics.prm index b4270531b50..0ccc406180a 100644 --- a/tests/particle_count_statistics.prm +++ b/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 diff --git a/tests/particle_exclude_all_properties.prm b/tests/particle_exclude_all_properties.prm index bf9b2feb9e8..119c0ebd703 100644 --- a/tests/particle_exclude_all_properties.prm +++ b/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 diff --git a/tests/particle_exclude_one_property.prm b/tests/particle_exclude_one_property.prm index ce3ab8714ea..927bcead081 100644 --- a/tests/particle_exclude_one_property.prm +++ b/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 diff --git a/tests/particle_exclude_one_property_vtu.prm b/tests/particle_exclude_one_property_vtu.prm index 89189f41500..da5da36552c 100644 --- a/tests/particle_exclude_one_property_vtu.prm +++ b/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 diff --git a/tests/particle_exclude_three_properties_vtu.prm b/tests/particle_exclude_three_properties_vtu.prm index c144738f218..5fed1ec17db 100644 --- a/tests/particle_exclude_three_properties_vtu.prm +++ b/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 diff --git a/tests/particle_exclude_two_properties_vtu.prm b/tests/particle_exclude_two_properties_vtu.prm index 38373ef7bc2..ffb057169e4 100644 --- a/tests/particle_exclude_two_properties_vtu.prm +++ b/tests/particle_exclude_two_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 diff --git a/tests/particle_fast_evaluate_many_compositions.prm b/tests/particle_fast_evaluate_many_compositions.prm index 3134e3b543e..e930906d541 100644 --- a/tests/particle_fast_evaluate_many_compositions.prm +++ b/tests/particle_fast_evaluate_many_compositions.prm @@ -109,7 +109,7 @@ subsection Particles set List of particle properties = composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_fast_evaluate_multiple_compositions.prm b/tests/particle_fast_evaluate_multiple_compositions.prm index 6e445da7ecd..2d12e6e5526 100644 --- a/tests/particle_fast_evaluate_multiple_compositions.prm +++ b/tests/particle_fast_evaluate_multiple_compositions.prm @@ -109,7 +109,7 @@ subsection Particles set List of particle properties = composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_generator_random_uniform.prm b/tests/particle_generator_random_uniform.prm index 7ad7b6f0f44..9708a9faa71 100644 --- a/tests/particle_generator_random_uniform.prm +++ b/tests/particle_generator_random_uniform.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = true set Number of particles = 256 end diff --git a/tests/particle_generator_random_uniform_3mpi_1particle.prm b/tests/particle_generator_random_uniform_3mpi_1particle.prm index 86364a4af97..24713be65bd 100644 --- a/tests/particle_generator_random_uniform_3mpi_1particle.prm +++ b/tests/particle_generator_random_uniform_3mpi_1particle.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = true set Number of particles = 1 end diff --git a/tests/particle_generator_random_uniform_3mpi_2particle.prm b/tests/particle_generator_random_uniform_3mpi_2particle.prm index b8be7bde0ea..0fea245d460 100644 --- a/tests/particle_generator_random_uniform_3mpi_2particle.prm +++ b/tests/particle_generator_random_uniform_3mpi_2particle.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = true set Number of particles = 2 end diff --git a/tests/particle_generator_random_uniform_3mpi_3particle.prm b/tests/particle_generator_random_uniform_3mpi_3particle.prm index 79281a87281..f57758b1a0b 100644 --- a/tests/particle_generator_random_uniform_3mpi_3particle.prm +++ b/tests/particle_generator_random_uniform_3mpi_3particle.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = true set Number of particles = 3 end diff --git a/tests/particle_generator_random_uniform_3mpi_4particle.prm b/tests/particle_generator_random_uniform_3mpi_4particle.prm index 5895a8b5cd2..4ef03ff8f3e 100644 --- a/tests/particle_generator_random_uniform_3mpi_4particle.prm +++ b/tests/particle_generator_random_uniform_3mpi_4particle.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = true set Number of particles = 4 end diff --git a/tests/particle_generator_random_uniform_deterministic_cell.prm b/tests/particle_generator_random_uniform_deterministic_cell.prm index 9d7b0a27b85..02e6c2c8c59 100644 --- a/tests/particle_generator_random_uniform_deterministic_cell.prm +++ b/tests/particle_generator_random_uniform_deterministic_cell.prm @@ -102,7 +102,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = false set Number of particles = 256 end diff --git a/tests/particle_generator_random_uniform_empty_rank.prm b/tests/particle_generator_random_uniform_empty_rank.prm index 24f5c9372c3..369ef94fa4b 100644 --- a/tests/particle_generator_random_uniform_empty_rank.prm +++ b/tests/particle_generator_random_uniform_empty_rank.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Random cell selection = false set Number of particles = 1 end diff --git a/tests/particle_integrator_euler.prm b/tests/particle_integrator_euler.prm index c22c0388f19..e6471c9430b 100644 --- a/tests/particle_integrator_euler.prm +++ b/tests/particle_integrator_euler.prm @@ -102,7 +102,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_integrator_rk4.prm b/tests/particle_integrator_rk4.prm index ae322391790..864b9ddced6 100644 --- a/tests/particle_integrator_rk4.prm +++ b/tests/particle_integrator_rk4.prm @@ -102,7 +102,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_interpolator_cell_average.prm b/tests/particle_interpolator_cell_average.prm index 093b8447566..290f5f2c4ad 100644 --- a/tests/particle_interpolator_cell_average.prm +++ b/tests/particle_interpolator_cell_average.prm @@ -115,7 +115,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Variable names = x,z set Function expression = x*x*z set Number of particles = 100000 diff --git a/tests/particle_interpolator_cell_average_2.prm b/tests/particle_interpolator_cell_average_2.prm index 3c52035d981..16afc014f33 100644 --- a/tests/particle_interpolator_cell_average_2.prm +++ b/tests/particle_interpolator_cell_average_2.prm @@ -111,7 +111,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 20000 end end diff --git a/tests/particle_interpolator_distance_weighted_average.prm b/tests/particle_interpolator_distance_weighted_average.prm index b08cabba89d..f8665a1ba97 100644 --- a/tests/particle_interpolator_distance_weighted_average.prm +++ b/tests/particle_interpolator_distance_weighted_average.prm @@ -115,7 +115,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Variable names = x,z set Function expression = x*x*z set Number of particles = 100000 diff --git a/tests/particle_interpolator_empty_cells.prm b/tests/particle_interpolator_empty_cells.prm index 5a181f5ebd4..f7108d7ac57 100644 --- a/tests/particle_interpolator_empty_cells.prm +++ b/tests/particle_interpolator_empty_cells.prm @@ -92,7 +92,7 @@ subsection Particles set Load balancing strategy = remove and add particles subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 2500 end end diff --git a/tests/particle_interpolator_from_ghost_cells.prm b/tests/particle_interpolator_from_ghost_cells.prm index aff86907db8..9cfb1d55501 100644 --- a/tests/particle_interpolator_from_ghost_cells.prm +++ b/tests/particle_interpolator_from_ghost_cells.prm @@ -94,7 +94,7 @@ subsection Particles set Load balancing strategy = none subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 400 end end diff --git a/tests/particle_interpolator_nearest_neighbor.prm b/tests/particle_interpolator_nearest_neighbor.prm index a23cbf2630b..d592599f88c 100644 --- a/tests/particle_interpolator_nearest_neighbor.prm +++ b/tests/particle_interpolator_nearest_neighbor.prm @@ -114,11 +114,6 @@ subsection Particles set Load balancing strategy = add particles subsection Generator - subsection Probability density function - set Variable names = x,z - set Function expression = 1 #x*x*z - end - subsection Uniform box set Number of particles = 1000 end diff --git a/tests/particle_interpolator_quadratic_least_squares_2d_periodic.prm b/tests/particle_interpolator_quadratic_least_squares_2d_periodic.prm index e4edfb25312..dba5446b67c 100644 --- a/tests/particle_interpolator_quadratic_least_squares_2d_periodic.prm +++ b/tests/particle_interpolator_quadratic_least_squares_2d_periodic.prm @@ -33,7 +33,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10000 end end diff --git a/tests/particle_interpolator_time_dependence.prm b/tests/particle_interpolator_time_dependence.prm index d66a831ea4f..3345414f3c4 100644 --- a/tests/particle_interpolator_time_dependence.prm +++ b/tests/particle_interpolator_time_dependence.prm @@ -101,7 +101,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 20000 end end diff --git a/tests/particle_load_balancing_none.prm b/tests/particle_load_balancing_none.prm index 42bd0ffcf35..e7f853fffb3 100644 --- a/tests/particle_load_balancing_none.prm +++ b/tests/particle_load_balancing_none.prm @@ -99,7 +99,7 @@ subsection Particles set Integration scheme = euler subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1000 end end diff --git a/tests/particle_load_balancing_removal.prm b/tests/particle_load_balancing_removal.prm index 0878376e9a9..763a12f87b3 100644 --- a/tests/particle_load_balancing_removal.prm +++ b/tests/particle_load_balancing_removal.prm @@ -96,7 +96,7 @@ subsection Particles set Integration scheme = euler subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 100 end end diff --git a/tests/particle_load_balancing_removal_addition.prm b/tests/particle_load_balancing_removal_addition.prm index 3ce8355a91a..e20e822f726 100644 --- a/tests/particle_load_balancing_removal_addition.prm +++ b/tests/particle_load_balancing_removal_addition.prm @@ -99,7 +99,7 @@ subsection Particles set Integration scheme = euler subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 100 end end diff --git a/tests/particle_load_balancing_removal_addition_properties.prm b/tests/particle_load_balancing_removal_addition_properties.prm index 1e05c5acb9f..113eb9b4d5e 100644 --- a/tests/particle_load_balancing_removal_addition_properties.prm +++ b/tests/particle_load_balancing_removal_addition_properties.prm @@ -99,7 +99,7 @@ subsection Particles set Integration scheme = euler subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 100 end end diff --git a/tests/particle_load_balancing_repartition_multiple_systems.prm b/tests/particle_load_balancing_repartition_multiple_systems.prm index 577ac06a10c..4a85b638920 100644 --- a/tests/particle_load_balancing_repartition_multiple_systems.prm +++ b/tests/particle_load_balancing_repartition_multiple_systems.prm @@ -90,9 +90,11 @@ subsection Mesh refinement set Time steps between mesh refinement = 1 set Coarsening fraction = 0.05 set Refinement fraction = 0.3 + subsection Maximum refinement function set Function expression = 3 end + subsection Minimum refinement function set Function expression = 3 end diff --git a/tests/particle_multiple_systems.prm b/tests/particle_multiple_systems.prm index b6126936f2b..68c8a921a18 100644 --- a/tests/particle_multiple_systems.prm +++ b/tests/particle_multiple_systems.prm @@ -84,7 +84,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end @@ -100,7 +100,7 @@ subsection Particles 2 end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_multiple_systems_hdf5.prm b/tests/particle_multiple_systems_hdf5.prm index 105b847c7ae..7c48551b71f 100644 --- a/tests/particle_multiple_systems_hdf5.prm +++ b/tests/particle_multiple_systems_hdf5.prm @@ -85,7 +85,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end @@ -101,7 +101,7 @@ subsection Particles 2 end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_multiple_systems_vtu.prm b/tests/particle_multiple_systems_vtu.prm index 12da18c0b74..92f574f6401 100644 --- a/tests/particle_multiple_systems_vtu.prm +++ b/tests/particle_multiple_systems_vtu.prm @@ -85,7 +85,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end @@ -101,7 +101,7 @@ subsection Particles 2 end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_gnuplot.prm b/tests/particle_output_gnuplot.prm index a01d1e7b972..cfd36ad1b1e 100644 --- a/tests/particle_output_gnuplot.prm +++ b/tests/particle_output_gnuplot.prm @@ -100,7 +100,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_hdf5.prm b/tests/particle_output_hdf5.prm index 373198fd6c0..ba85a33445f 100644 --- a/tests/particle_output_hdf5.prm +++ b/tests/particle_output_hdf5.prm @@ -100,7 +100,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_multiple_formats.prm b/tests/particle_output_multiple_formats.prm index 2a48a19db93..7136d99c386 100644 --- a/tests/particle_output_multiple_formats.prm +++ b/tests/particle_output_multiple_formats.prm @@ -99,7 +99,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_none.prm b/tests/particle_output_none.prm index 847d7f8d6c7..11a23443a15 100644 --- a/tests/particle_output_none.prm +++ b/tests/particle_output_none.prm @@ -102,7 +102,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 30 end end diff --git a/tests/particle_output_vtu.prm b/tests/particle_output_vtu.prm index 9304b79c6ca..d35063adb8f 100644 --- a/tests/particle_output_vtu.prm +++ b/tests/particle_output_vtu.prm @@ -100,7 +100,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_vtu_group.prm b/tests/particle_output_vtu_group.prm index da030887079..f1dabb2a5b2 100644 --- a/tests/particle_output_vtu_group.prm +++ b/tests/particle_output_vtu_group.prm @@ -103,7 +103,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_output_vtu_temp.prm b/tests/particle_output_vtu_temp.prm index 11df7012a84..f4979476eb4 100644 --- a/tests/particle_output_vtu_temp.prm +++ b/tests/particle_output_vtu_temp.prm @@ -102,7 +102,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_periodic_boundaries.prm b/tests/particle_periodic_boundaries.prm index 26f0cdc0ac1..fc9d85f6193 100644 --- a/tests/particle_periodic_boundaries.prm +++ b/tests/particle_periodic_boundaries.prm @@ -107,7 +107,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_periodic_boundaries_dc.prm b/tests/particle_periodic_boundaries_dc.prm index 2d3b4db6be2..5e77f226690 100644 --- a/tests/particle_periodic_boundaries_dc.prm +++ b/tests/particle_periodic_boundaries_dc.prm @@ -28,7 +28,7 @@ subsection Particles set Interpolation scheme = bilinear least squares subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10000 end end diff --git a/tests/particle_periodic_boundaries_rk4.prm b/tests/particle_periodic_boundaries_rk4.prm index 6e5c2de2ea2..52cfc754255 100644 --- a/tests/particle_periodic_boundaries_rk4.prm +++ b/tests/particle_periodic_boundaries_rk4.prm @@ -106,7 +106,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_property_initial_composition.prm b/tests/particle_property_initial_composition.prm index 29c45a5e97e..c480e0d4bdf 100644 --- a/tests/particle_property_initial_composition.prm +++ b/tests/particle_property_initial_composition.prm @@ -99,7 +99,7 @@ subsection Particles set List of particle properties = initial composition subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_property_integrated_strain_invariant.prm b/tests/particle_property_integrated_strain_invariant.prm index 3afb9c1e3b5..8904c3e2aff 100644 --- a/tests/particle_property_integrated_strain_invariant.prm +++ b/tests/particle_property_integrated_strain_invariant.prm @@ -105,7 +105,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 100 end end diff --git a/tests/particle_property_integrated_strain_pure_shear.prm b/tests/particle_property_integrated_strain_pure_shear.prm index 0785b14ce83..262055afa4d 100644 --- a/tests/particle_property_integrated_strain_pure_shear.prm +++ b/tests/particle_property_integrated_strain_pure_shear.prm @@ -85,7 +85,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_property_integrated_strain_simple_shear.prm b/tests/particle_property_integrated_strain_simple_shear.prm index a478e50f2db..ec1f0f2ed58 100644 --- a/tests/particle_property_integrated_strain_simple_shear.prm +++ b/tests/particle_property_integrated_strain_simple_shear.prm @@ -84,7 +84,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/particle_property_multiple_functions_with_interpolation.prm b/tests/particle_property_multiple_functions_with_interpolation.prm index f0f07233c12..499529e53b2 100644 --- a/tests/particle_property_multiple_functions_with_interpolation.prm +++ b/tests/particle_property_multiple_functions_with_interpolation.prm @@ -108,7 +108,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Variable names = x,z set Function expression = x*x*z set Number of particles = 1024 diff --git a/tests/particle_property_post_initialize_function.prm b/tests/particle_property_post_initialize_function.prm index 041646d981c..f849ac4ad61 100644 --- a/tests/particle_property_post_initialize_function.prm +++ b/tests/particle_property_post_initialize_function.prm @@ -98,7 +98,7 @@ subsection Particles set List of particle properties = initial position, initial composition, PostInitializeParticleProperty, velocity subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 100 end end diff --git a/tests/update_script_2/updated2.prm b/tests/update_script_2/updated2.prm index cf003367e9b..95c0c664877 100644 --- a/tests/update_script_2/updated2.prm +++ b/tests/update_script_2/updated2.prm @@ -128,7 +128,7 @@ end subsection Particles subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 50 end end diff --git a/tests/van_keken_smooth_particle.prm b/tests/van_keken_smooth_particle.prm index 54a54304bbb..cd21bf506f6 100644 --- a/tests/van_keken_smooth_particle.prm +++ b/tests/van_keken_smooth_particle.prm @@ -101,7 +101,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 10 end end diff --git a/tests/visco_plastic_vep_stress_build-up_yield_particles.prm b/tests/visco_plastic_vep_stress_build-up_yield_particles.prm index 04841c66be4..635acf1d99c 100644 --- a/tests/visco_plastic_vep_stress_build-up_yield_particles.prm +++ b/tests/visco_plastic_vep_stress_build-up_yield_particles.prm @@ -84,7 +84,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 12e3 end end diff --git a/tests/visco_plastic_yield_noninitial-plastic-strain_particles.prm b/tests/visco_plastic_yield_noninitial-plastic-strain_particles.prm index b4d660ab000..5177cfe1683 100644 --- a/tests/visco_plastic_yield_noninitial-plastic-strain_particles.prm +++ b/tests/visco_plastic_yield_noninitial-plastic-strain_particles.prm @@ -52,7 +52,7 @@ subsection Particles set Interpolation scheme = nearest neighbor subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1e5 end end diff --git a/tests/visco_plastic_yield_plastic_strain_weakening_particles.prm b/tests/visco_plastic_yield_plastic_strain_weakening_particles.prm index a2479627110..2629511d468 100644 --- a/tests/visco_plastic_yield_plastic_strain_weakening_particles.prm +++ b/tests/visco_plastic_yield_plastic_strain_weakening_particles.prm @@ -24,7 +24,7 @@ subsection Particles set Interpolation scheme = nearest neighbor subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1e5 end end diff --git a/tests/visco_plastic_yield_plastic_viscous_strain_weakening_particles.prm b/tests/visco_plastic_yield_plastic_viscous_strain_weakening_particles.prm index b837029ab9f..2499914e607 100644 --- a/tests/visco_plastic_yield_plastic_viscous_strain_weakening_particles.prm +++ b/tests/visco_plastic_yield_plastic_viscous_strain_weakening_particles.prm @@ -24,7 +24,7 @@ subsection Particles set Interpolation scheme = nearest neighbor subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1e5 end end diff --git a/tests/visco_plastic_yield_strain_weakening_particles.prm b/tests/visco_plastic_yield_strain_weakening_particles.prm index f711b92cede..014c805d737 100644 --- a/tests/visco_plastic_yield_strain_weakening_particles.prm +++ b/tests/visco_plastic_yield_strain_weakening_particles.prm @@ -24,7 +24,7 @@ subsection Particles set Interpolation scheme = nearest neighbor subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1e5 end end diff --git a/tests/visco_plastic_yield_viscous_strain_weakening_particles.prm b/tests/visco_plastic_yield_viscous_strain_weakening_particles.prm index ceef25a2d34..2ecb1289561 100644 --- a/tests/visco_plastic_yield_viscous_strain_weakening_particles.prm +++ b/tests/visco_plastic_yield_viscous_strain_weakening_particles.prm @@ -24,7 +24,7 @@ subsection Particles set Interpolation scheme = nearest neighbor subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 1e5 end end diff --git a/tests/viscoelastic_bending_beam_particles.prm b/tests/viscoelastic_bending_beam_particles.prm index a45ca541d1d..876872cfe0d 100644 --- a/tests/viscoelastic_bending_beam_particles.prm +++ b/tests/viscoelastic_bending_beam_particles.prm @@ -45,7 +45,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 4.5e3 end end diff --git a/tests/viscoelastic_numerical_elastic_time_step_particles.prm b/tests/viscoelastic_numerical_elastic_time_step_particles.prm index 6eba26eeb96..fd943255954 100644 --- a/tests/viscoelastic_numerical_elastic_time_step_particles.prm +++ b/tests/viscoelastic_numerical_elastic_time_step_particles.prm @@ -67,7 +67,7 @@ subsection Particles set Particle generator name = random uniform subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 12e3 end end diff --git a/tests/world_builder_select_grains.prm b/tests/world_builder_select_grains.prm index 8d1f22d0877..0184998cda5 100644 --- a/tests/world_builder_select_grains.prm +++ b/tests/world_builder_select_grains.prm @@ -88,7 +88,7 @@ subsection Particles end subsection Generator - subsection Probability density function + subsection Random uniform set Number of particles = 50 end end From 4a0a277dc52cf3b7a926190adee4b5adb4c3286e Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 18 Oct 2024 15:44:45 +0200 Subject: [PATCH 3/4] Update header include --- include/aspect/particle/generator/random_uniform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/aspect/particle/generator/random_uniform.h b/include/aspect/particle/generator/random_uniform.h index cb697c08e52..26d99fdb410 100644 --- a/include/aspect/particle/generator/random_uniform.h +++ b/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 +#include namespace aspect { From 0272415b4919d0a92efbfbdb0ef0bae11fe7cbd9 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Fri, 18 Oct 2024 17:03:16 +0200 Subject: [PATCH 4/4] Fix some tests --- tests/particle_interpolator_cell_average.prm | 2 -- tests/particle_interpolator_distance_weighted_average.prm | 2 -- .../particle_property_multiple_functions_with_interpolation.prm | 2 -- 3 files changed, 6 deletions(-) diff --git a/tests/particle_interpolator_cell_average.prm b/tests/particle_interpolator_cell_average.prm index 290f5f2c4ad..78e9512bb7f 100644 --- a/tests/particle_interpolator_cell_average.prm +++ b/tests/particle_interpolator_cell_average.prm @@ -116,8 +116,6 @@ subsection Particles subsection Generator subsection Random uniform - set Variable names = x,z - set Function expression = x*x*z set Number of particles = 100000 end end diff --git a/tests/particle_interpolator_distance_weighted_average.prm b/tests/particle_interpolator_distance_weighted_average.prm index f8665a1ba97..68781fde88a 100644 --- a/tests/particle_interpolator_distance_weighted_average.prm +++ b/tests/particle_interpolator_distance_weighted_average.prm @@ -116,8 +116,6 @@ subsection Particles subsection Generator subsection Random uniform - set Variable names = x,z - set Function expression = x*x*z set Number of particles = 100000 end end diff --git a/tests/particle_property_multiple_functions_with_interpolation.prm b/tests/particle_property_multiple_functions_with_interpolation.prm index 499529e53b2..c0e25b9e784 100644 --- a/tests/particle_property_multiple_functions_with_interpolation.prm +++ b/tests/particle_property_multiple_functions_with_interpolation.prm @@ -109,8 +109,6 @@ subsection Particles subsection Generator subsection Random uniform - set Variable names = x,z - set Function expression = x*x*z set Number of particles = 1024 end end