suite hhyerarchy

Author: miguelmaso

benchmark/ConstitutiveModelsBenchmark/ViscousModelsBenchmarks.jl

@@ -3,7 +3,10 @@ using HyperFEM.PhysicalModels
 using BenchmarkTools
 
 
-function benchmark_viscous_model(model)
+function benchmark_viscous_model()
+  elasto = NeoHookean3D(λ=1e6, μ=1e3)
+  visco = ViscousIncompressible(IncompressibleNeoHookean3D(λ=0., μ=1e3), 10.)
+  model = GeneralizedMaxwell(elasto, visco)
   Ψ, ∂Ψu, ∂Ψuu = model(Δt = 1e-2)
   F = TensorValue(1.:9...) * 1e-3 + I3
   Fn = TensorValue(1.:9...) * 5e-4 + I3
@@ -12,17 +15,9 @@ function benchmark_viscous_model(model)
   Uvn *= J^(-1/3)
   λvn = 1e-3
   Avn = VectorValue(Uvn.data..., λvn)
-  print("Ψ(F, Fn, Avn)    |")
-  @btime $Ψ($F, $Fn, $Avn)
-  print("∂Ψu(F, Fn, Avn)  |")
-  @btime $∂Ψu($F, $Fn, $Avn)
-  print("∂Ψuu(F, Fn, Avn) |")
-  @btime $∂Ψuu($F, $Fn, $Avn)
+  SUITE["Constitutive models"]["Visco-elastic Ψ"] = @benchmarkable $Ψ($F, $Fn, $Avn)
+  SUITE["Constitutive models"]["Visco-elastic ∂Ψu"] = @benchmarkable $∂Ψu($F, $Fn, $Avn)
+  SUITE["Constitutive models"]["Visco-elastic ∂Ψuu"] = @benchmarkable $∂Ψuu($F, $Fn, $Avn)
 end
 
-
-elasto = NeoHookean3D(λ=1e6, μ=1e3)
-visco = ViscousIncompressible(IncompressibleNeoHookean3D(λ=0., μ=1e3), 10.)
-visco_elastic = GeneralizedMaxwell(elasto, visco)
-benchmark_viscous_model(visco);
-benchmark_viscous_model(visco_elastic);
+benchmark_viscous_model()

benchmark/ConstitutiveModelsBenchmark/benchmarks.jl

@@ -1,2 +1,4 @@
 
+SUITE["Constitutive models"] = BenchmarkGroup()
+
 include("ViscousModelsBenchmarks.jl")

benchmark/TensorAlgebraBenchmarks/TensorAlgebraBenchmarks.jl

@@ -42,6 +42,5 @@ function _δδ_λ_2D(λ::Float64)
     λ)
 end
 
-SUITE["δδ_μ_2d"] = @benchmark δᵢₖδⱼₗ2D + δᵢₗδⱼₖ2D
-
-SUITE["δδ_λ_2d"] = @benchmark 1.0 * δᵢⱼδₖₗ2D
+SUITE["Tensor algebra"]["δδ_μ_2d"] = @benchmarkable δᵢₖδⱼₗ2D + δᵢₗδⱼₖ2D
+SUITE["Tensor algebra"]["δδ_λ_2d"] = @benchmarkable 1.0 * δᵢⱼδₖₗ2D