From 7601d6bec7d46e6cc88c19b61357027f9bef87e3 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 13 Jun 2024 19:15:42 -0400 Subject: [PATCH 1/2] Fix some benchmark scripts --- .../annulus/transient/run_all_models.sh | 15 ++++++++------- .../rigid_shear/transient/run_all_models.sh | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/benchmarks/annulus/transient/run_all_models.sh b/benchmarks/annulus/transient/run_all_models.sh index 9bdc081ff77..e7e9f8bf3da 100755 --- a/benchmarks/annulus/transient/run_all_models.sh +++ b/benchmarks/annulus/transient/run_all_models.sh @@ -70,13 +70,14 @@ for refinement in 2 3 4; do echo "subsection Postprocess" >> particles.prm echo " set List of postprocessors = visualization, velocity statistics, AnnulusPostprocessor, rotation statistics, particles, particle count statistics" >> particles.prm - echo " subsection Particles" >> particles.prm - echo " set Number of particles = $number_of_particles" >> particles.prm - echo " set Integration scheme = rk2" >> particles.prm - echo " subsection Integrator" >> particles.prm - echo " subsection RK2" >> particles.prm - echo " set Higher order accurate in time = $higher_order_time" >> particles.prm - echo " end" >> particles.prm + echo "end" >> particles.prm + + echo "subsection Particles" >> particles.prm + echo " set Number of particles = $number_of_particles" >> particles.prm + echo " set Integration scheme = rk2" >> particles.prm + echo " subsection Integrator" >> particles.prm + echo " subsection RK2" >> particles.prm + echo " set Higher order accurate in time = $higher_order_time" >> particles.prm echo " end" >> particles.prm echo " end" >> particles.prm echo "end" >> particles.prm diff --git a/benchmarks/rigid_shear/transient/run_all_models.sh b/benchmarks/rigid_shear/transient/run_all_models.sh index bbcd4258a77..09131cd60b8 100755 --- a/benchmarks/rigid_shear/transient/run_all_models.sh +++ b/benchmarks/rigid_shear/transient/run_all_models.sh @@ -68,15 +68,16 @@ for refinement in 2 3 4 5 6 7; do echo "subsection Postprocess" >> particles.prm echo " set List of postprocessors = visualization, particles, rigid shear, velocity statistics, particle count statistics" >> particles.prm - echo " subsection Particles" >> particles.prm - echo " set Number of particles = $number_of_particles" >> particles.prm - echo " set Integration scheme = rk2" >> particles.prm - echo " set Interpolation scheme = $interpolation_scheme" >> particles.prm - echo " set Particle generator name = random uniform" >> particles.prm - echo " subsection Integrator" >> particles.prm - echo " subsection RK2" >> particles.prm - echo " set Higher order accurate in time = $higher_order_time" >> particles.prm - echo " end" >> particles.prm + echo "end" >> particles.prm + + echo "subsection Particles" >> particles.prm + echo " set Number of particles = $number_of_particles" >> particles.prm + echo " set Integration scheme = rk2" >> particles.prm + echo " set Interpolation scheme = $interpolation_scheme" >> particles.prm + echo " set Particle generator name = random uniform" >> particles.prm + echo " subsection Integrator" >> particles.prm + echo " subsection RK2" >> particles.prm + echo " set Higher order accurate in time = $higher_order_time" >> particles.prm echo " end" >> particles.prm echo " end" >> particles.prm echo "end" >> particles.prm From 2992e880fb6927ec632130e45714bba369cddcb8 Mon Sep 17 00:00:00 2001 From: Rene Gassmoeller Date: Thu, 13 Jun 2024 19:33:55 -0400 Subject: [PATCH 2/2] Update parameters in benchmark scripts --- benchmarks/annulus/transient/run_all_models.sh | 6 +++++- .../rigid_shear/steady-state/run_all_models.sh | 12 ++++-------- benchmarks/rigid_shear/transient/run_all_models.sh | 6 +++++- .../transient/run_all_models.sh | 10 ++++------ 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/benchmarks/annulus/transient/run_all_models.sh b/benchmarks/annulus/transient/run_all_models.sh index e7e9f8bf3da..daf6bb5c876 100755 --- a/benchmarks/annulus/transient/run_all_models.sh +++ b/benchmarks/annulus/transient/run_all_models.sh @@ -73,7 +73,11 @@ for refinement in 2 3 4; do echo "end" >> particles.prm echo "subsection Particles" >> particles.prm - echo " set Number of particles = $number_of_particles" >> particles.prm + echo " subsection Generator" >> particles.prm + echo " subsection Probability density function" >> particles.prm + echo " set Number of particles = $number_of_particles" >> particles.prm + echo " end" >> particles.prm + echo " end" >> particles.prm echo " set Integration scheme = rk2" >> particles.prm echo " subsection Integrator" >> particles.prm echo " subsection RK2" >> particles.prm diff --git a/benchmarks/rigid_shear/steady-state/run_all_models.sh b/benchmarks/rigid_shear/steady-state/run_all_models.sh index 0182fd751e7..a0a48e79b9b 100755 --- a/benchmarks/rigid_shear/steady-state/run_all_models.sh +++ b/benchmarks/rigid_shear/steady-state/run_all_models.sh @@ -19,10 +19,7 @@ for stokes_degree in 2 3; do echo " set Use locally conservative discretization = $discontinuous_pressure" >> current.prm echo "end" >> current.prm - number_of_particles=`echo "$particles_per_direction * $particles_per_direction * 2 ^ (2 * $refinement)" | bc -l` - echo "subsection Postprocess" >> current.prm - echo " subsection Particles" >> current.prm - echo " set Number of particles = $number_of_particles" >> current.prm + echo "subsection Particles" >> current.prm echo " set Particle generator name = $generator" >> current.prm # If using longer runtimes it is necessary to add particles to @@ -34,10 +31,9 @@ for stokes_degree in 2 3; do echo " set Interpolation scheme = $interpolator" >> current.prm echo " set Integration scheme = $integrator" >> current.prm - echo " subsection Generator" >> current.prm - echo " subsection Reference cell" >> current.prm - echo " set Number of particles per cell per direction = $particles_per_direction" >> current.prm - echo " end" >> current.prm + echo " subsection Generator" >> current.prm + echo " subsection Reference cell" >> current.prm + echo " set Number of particles per cell per direction = $particles_per_direction" >> current.prm echo " end" >> current.prm echo " end" >> current.prm echo "end" >> current.prm diff --git a/benchmarks/rigid_shear/transient/run_all_models.sh b/benchmarks/rigid_shear/transient/run_all_models.sh index 09131cd60b8..9a5b6f0ca7f 100755 --- a/benchmarks/rigid_shear/transient/run_all_models.sh +++ b/benchmarks/rigid_shear/transient/run_all_models.sh @@ -71,7 +71,11 @@ for refinement in 2 3 4 5 6 7; do echo "end" >> particles.prm echo "subsection Particles" >> particles.prm - echo " set Number of particles = $number_of_particles" >> particles.prm + echo " subsection Generator" >> particles.prm + echo " subsection Probability density function" >> particles.prm + echo " set Number of particles = $number_of_particles" >> particles.prm + echo " end" >> particles.prm + echo " end" >> particles.prm echo " set Integration scheme = rk2" >> particles.prm echo " set Interpolation scheme = $interpolation_scheme" >> particles.prm echo " set Particle generator name = random uniform" >> particles.prm diff --git a/benchmarks/time_dependent_annulus/transient/run_all_models.sh b/benchmarks/time_dependent_annulus/transient/run_all_models.sh index ad87569787e..d365842a6dd 100755 --- a/benchmarks/time_dependent_annulus/transient/run_all_models.sh +++ b/benchmarks/time_dependent_annulus/transient/run_all_models.sh @@ -11,12 +11,10 @@ for stokes_degree in 2; do #3 echo " set Stokes velocity polynomial degree = $stokes_degree" >> current.prm echo "end" >> current.prm - echo "subsection Postprocess" >> current.prm - echo " subsection Particles" >> current.prm - echo " subsection Generator" >> current.prm - echo " subsection Reference cell" >> current.prm - echo " set Number of particles per cell per direction = $particles_per_direction" >> current.prm - echo " end" >> current.prm + echo "subsection Particles" >> current.prm + echo " subsection Generator" >> current.prm + echo " subsection Reference cell" >> current.prm + echo " set Number of particles per cell per direction = $particles_per_direction" >> current.prm echo " end" >> current.prm echo " end" >> current.prm echo "end" >> current.prm