Skip to content

Commit

Permalink
Merge pull request #5903 from gassmoeller/fix_some_scripts
Browse files Browse the repository at this point in the history 
Fix particle benchmark scripts
  • Loading branch information
@MFraters
MFraters authored Jun 14, 2024
2 parents 40ed0c8 + 2992e88 commit 69a2a66
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 30 deletions.
19 changes: 12 additions & 7 deletions benchmarks/annulus/transient/run_all_models.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,18 @@ 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 " 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
echo " set Higher order accurate in time = $higher_order_time" >> particles.prm
echo " end" >> particles.prm
echo " end" >> particles.prm
echo "end" >> particles.prm
Expand Down
12 changes: 4 additions & 8 deletions benchmarks/rigid_shear/steady-state/run_all_models.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
23 changes: 14 additions & 9 deletions benchmarks/rigid_shear/transient/run_all_models.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,20 @@ 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 " 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
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
Expand Down
10 changes: 4 additions & 6 deletions benchmarks/time_dependent_annulus/transient/run_all_models.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 69a2a66

Please sign in to comment.