Merge pull request #72 from MultiSimOLab/cleanallocs

Improves memory allocation and performance

Author: jmartfrut

src/PhysicalModels/MagnetoMechanicalModels.jl

@@ -62,7 +62,7 @@ function _getCoupling(mag::Union{IdealMagnetic,IdealMagnetic2D}, ::Mechano, Λ::
 end
 
 
-function _getCoupling(mag::HardMagnetic, mec::Mechano, Λ::Float64)
+function _getCoupling(mag::HardMagnetic, ::Mechano, Λ::Float64=1.0)
 
   # Miguel Angel Moreno-Mateos, Mokarram Hossain, Paul Steinmann, Daniel Garcia-Gonzalez,
   # Hard magnetics in ultra-soft magnetorheological elastomers enhance fracture toughness and 
@@ -72,7 +72,8 @@ function _getCoupling(mag::HardMagnetic, mec::Mechano, Λ::Float64)
   μ, αr, χe, χr, βcoup, βmok = mag.μ, mag.αr, mag.χe, mag.χr, mag.βcoup, mag.βmok
   J(F) = det(F)
   H(F) = det(F) * inv(F)'
-  αr *= Λ
+ 
+
   #-------------------------------------------------------------------------------------
   # FIRST TERM
   #-------------------------------------------------------------------------------------
@@ -84,7 +85,7 @@ function _getCoupling(mag::HardMagnetic, mec::Mechano, Λ::Float64)
   Hℋ₀(F, ℋ₀) = H(F) * ℋ₀
   Hℋ₀Hℋ₀(F, ℋ₀) = Hℋ₀(F, ℋ₀) ⋅ Hℋ₀(F, ℋ₀)
 
-  ℋᵣ(N) = αr * N
+  ℋᵣ(N) = αr * Λ* N
   Fℋᵣ(F, N) = F * ℋᵣ(N)
   Ψcoup(F, N) = (μ * J(F)) * (Fℋᵣ(F, N) ⋅ Fℋᵣ(F, N) - ℋᵣ(N) ⋅ ℋᵣ(N))
   ∂Ψcoup_∂F(F, N) = 2 * (μ * J(F)) * (Fℋᵣ(F, N) ⊗ ℋᵣ(N))
@@ -143,7 +144,7 @@ function _getCoupling(mag::HardMagnetic, mec::Mechano, Λ::Float64)
 end
 
 
-function _getCoupling(mag::HardMagnetic2D, mec::Mechano, Λ::Float64)
+function _getCoupling(mag::HardMagnetic2D, ::Mechano, Λ::Float64=1.0)
 
   # Miguel Angel Moreno-Mateos, Mokarram Hossain, Paul Steinmann, Daniel Garcia-Gonzalez,
   # Hard magnetics in ultra-soft magnetorheological elastomers enhance fracture toughness and 
@@ -152,8 +153,7 @@ function _getCoupling(mag::HardMagnetic2D, mec::Mechano, Λ::Float64)
   μ, αr, χe, χr, βcoup, βmok = mag.μ, mag.αr, mag.χe, mag.χr, mag.βcoup, mag.βmok
   J(F) = det(F)
   H(F) = det(F) * inv(F)'
-  αr *= Λ
-
+ 
   # #-------------------------------------------------------------------------------------
   # # FIRST TERM
   # #-------------------------------------------------------------------------------------
@@ -164,7 +164,7 @@ function _getCoupling(mag::HardMagnetic2D, mec::Mechano, Λ::Float64)
   #-------------------------------------------------------------------------------------
   Hℋ₀(F, ℋ₀) = H(F) * ℋ₀
   Hℋ₀Hℋ₀(F, ℋ₀) = Hℋ₀(F, ℋ₀) ⋅ Hℋ₀(F, ℋ₀)
-  ℋᵣ(N) = αr * N
+  ℋᵣ(N) = αr * Λ* N
   Fℋᵣ(F, N) = F * ℋᵣ(N)
   Ψcoup(F, N) = (μ * J(F)) * (Fℋᵣ(F, N) ⋅ Fℋᵣ(F, N) - ℋᵣ(N) ⋅ ℋᵣ(N))
   ∂Ψcoup_∂F(F, N) = 2 * (μ * J(F)) * (Fℋᵣ(F, N) ⊗ ℋᵣ(N))

src/PhysicalModels/MechanicalModels.jl

@@ -19,7 +19,7 @@ struct HessianRegularization <: Mechano
     δ = obj.δ
 
     ∂2Ψ(F) = begin
-      vecval = eigen(get_array(∂2Ψs(F)))
+      vecval = eigen(Symmetric(get_array(∂2Ψs(F))))
       vec = real(vecval.vectors)
       val = real(vecval.values)
       TensorValue(vec * diagm(max.(δ, val)) * vec')
@@ -53,7 +53,7 @@ struct Hessian∇JRegularization <: Mechano
     ∂2Ψ_(F, Jh) = ∂2Ψs(F) + κ * (H(F) ⊗ H(F)) + κ * (J(F) - Jh) * _∂H∂F_2D()
 
     ∂2Ψ(F, Jh) = begin
-      vecval = eigen(get_array(∂2Ψ_(F, Jh)))
+      vecval = eigen(Symmetric(get_array(∂2Ψ_(F, Jh))))
       vec = real(vecval.vectors)
       val = real(vecval.values)
       TensorValue(vec * diagm(max.(δ, val)) * vec')

src/PhysicalModels/ThermoElectroMechanicalModels.jl

@@ -119,17 +119,17 @@ struct ThermoElectroMech_Bonet{T<:Thermo,E<:Electro,M<:Mechano} <: ThermoElectro
   function (obj::ThermoElectroMech_Bonet)(Λ::Float64=1.0)
     @unpack Cv,θr, α, κ, γv, γd = obj.thermo
     Ψem, ∂Ψem∂F, ∂Ψem∂E, ∂Ψem∂FF, ∂Ψem∂EF, ∂Ψem∂EE = _getCoupling(obj.electro, obj.mechano, Λ)
-    gd(δθ) = 1/(γd+1) * (((δθ+θr)/θr)^(γd+1) -1)
-    ∂gd(δθ) = (δθ+θr)^γd / θr^(γd+1)
-    ∂∂gd(δθ) = γd*(δθ+θr)^(γd-1) / θr^(γd+1)
-    gv(δθ) = 1/(γv+1) * (((δθ+θr)/θr)^(γv+1) -1)
-    ∂gv(δθ) = (δθ+θr)^γv / θr^(γv+1)
-    ∂∂gv(δθ) = γv*(δθ+θr)^(γv-1) / θr^(γv+1)
+    gd(δθ)=1/(γd+1) * (((δθ+θr)/θr)^(γd+1) -1)
+    ∂gd(δθ)=(δθ+θr)^γd / θr^(γd+1)
+    ∂∂gd(δθ)= γd*(δθ+θr)^(γd-1) / θr^(γd+1)
+    gv(δθ)=1/(γv+1) * (((δθ+θr)/θr)^(γv+1) -1)
+    ∂gv(δθ)=(δθ+θr)^γv / θr^(γv+1)
+    ∂∂gv(δθ)=γv*(δθ+θr)^(γv-1) / θr^(γv+1)
 
     J(F) = det(F)
     H(F) = det(F) * inv(F)'
 
-    η(F)=α*(J(F) - 1.0)+Cv/γv
+    η(F) =α*(J(F) - 1.0)+Cv/γv
     ∂η∂J(F)=α
     ∂η∂F(F)=∂η∂J(F)*H(F)
     ∂2η∂FF(F)=×ᵢ⁴(∂η∂J(F) * F)
@@ -148,9 +148,9 @@ struct ThermoElectroMech_Bonet{T<:Thermo,E<:Electro,M<:Mechano} <: ThermoElectro
     ∂ΨFδθ(F, E, δθ) =  ∂gd(δθ) *∂Ψem∂F(F, E) + ∂gv(δθ)*∂η∂F(F)
     ∂ΨEδθ(F, E, δθ) =  ∂gd(δθ) *∂Ψem∂E(F, E)
 
-    η(F, E, δθ) = -∂Ψ_∂δθ(F, E, δθ)
+    entropy(F, E, δθ) = -∂Ψ_∂δθ(F, E, δθ)
 
-    return (Ψ, ∂Ψ_∂F, ∂Ψ_∂E, ∂Ψ_∂δθ, ∂2Ψ_∂2F, ∂2Ψ_∂2E, ∂2Ψ_∂2δθ, ∂ΨEF, ∂ΨFδθ, ∂ΨEδθ, η)
+    return (Ψ, ∂Ψ_∂F, ∂Ψ_∂E, ∂Ψ_∂δθ, ∂2Ψ_∂2F, ∂2Ψ_∂2E, ∂2Ψ_∂2δθ, ∂ΨEF, ∂ΨFδθ, ∂ΨEδθ, entropy)
   end
 end
 

test/TestConstitutiveModels/ElectroMechanicalTests.jl

@@ -45,6 +45,7 @@ end
 
 
 @testset "ElectroMechano" begin
+  #  Memory estimate: 0 bytes, allocs estimate: 0.
   modelMR = MooneyRivlin3D(λ=3.0, μ1=1.0, μ2=2.0)
   modelID = IdealDielectric(ε=4.0)
   modelelectro =modelMR+modelID
@@ -64,7 +65,7 @@ end
 
 
 @testset "FlexoElectroMechanics" begin
-
+#  Memory estimate: 0 bytes, allocs estimate: 0.
   # Constitutive models
   ∇umacro = TensorValue(1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0) * 1e-2
   ∇u1 = 1e-1 * TensorValue(1, 2, 3, 4, 5, 6, 7, 8, 9)
@@ -100,6 +101,8 @@ end
 
 
 @testset "ViscoElectricModel" begin
+#     157 μs        Histogram: log(frequency) by time        391 μs <
+#  Memory estimate: 240.03 KiB, allocs estimate: 3069.
   hyper_elastic = NeoHookean3D(λ=1000., μ=10.)
   short_term = IncompressibleNeoHookean3D(μ=5., λ=0.)
   viscous_branch1 = ViscousIncompressible(short_term, τ=6.)