Merge branch 'main' into third-law

Author: miguelmaso

Project.toml

@@ -21,4 +21,5 @@ Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
 ProfileView = "c46f51b8-102a-5cf2-8d2c-8597cb0e0da7"
 Roots = "f2b01f46-fcfa-551c-844a-d8ac1e96c665"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 WriteVTK = "64499a7a-5c06-52f2-abe2-ccb03c286192"

benchmark/TensorAlgebraBenchmarks/TensorAlgebraBenchmarks.jl

@@ -42,5 +42,10 @@ function _δδ_λ_2D(λ::Float64)
     λ)
 end
 
+A = TensorValue(1.:9...)
+A = A + A' + I3
+
 SUITE["Tensor algebra"]["δδ_μ_2d"] = @benchmarkable δᵢₖδⱼₗ2D + δᵢₗδⱼₖ2D
 SUITE["Tensor algebra"]["δδ_λ_2d"] = @benchmarkable 1.0 * δᵢⱼδₖₗ2D
+SUITE["Tensor algebra"]["Cofactor"] = cof(A)
+SUITE["Tensor algebra"]["Det(A)Inv(A')"] = det(A)*inv(A')

src/ComputationalModels/FESpaces.jl

@@ -54,6 +54,14 @@ function Gridap.FESpaces.TrialFESpace!(space::MultiFieldFESpace, bc::MultiFieldB
   end
 end
 
+function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, bc::DirichletBC)
+    TrialFESpace(space, bc, 0.0)
+end
+
+function Gridap.FESpaces.TrialFESpace(space::MultiFieldFESpace, bc::MultiFieldBC)
+    TrialFESpace(space, bc, 0.0)
+end
+
 
 function Gridap.FESpaces.TrialFESpace(space::SingleFieldFESpace, ::NothingBC, Λ::Float64)
   space

src/ComputationalModels/PostProcessors.jl

@@ -78,30 +78,16 @@ end
 
 function Piola(physmodel::ThermoElectroMechano,kine::NTuple{3,KinematicModel}, uh, φh, θh, Ω, dΩ, Λ=1.0)
     DΨ = physmodel(Λ)
-
     F, _, _ = get_Kinematics(kine[1])
     E = get_Kinematics(kine[2])
     ∂Ψu = DΨ[2]
-    refL2 = ReferenceFE(lagrangian, Float64, 0)
-    ref = ReferenceFE(lagrangian, Float64, 1)
-    VL2 = FESpace(Ω, refL2, conformity=:L2)
-    V = FESpace(Ω, ref, conformity=:H1)
-    n1 = VectorValue(1.0, 0.0, 0.0)
-    n2 = VectorValue(0.0, 1.0, 0.0)
-    n3 = VectorValue(0.0, 0.0, 1.0)
-    σ11h = interpolate_everywhere(L2_Projection(n1 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n1), dΩ, VL2), V)
-    σ12h = interpolate_everywhere(L2_Projection(n1 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n2), dΩ, VL2), V)
-    σ13h = interpolate_everywhere(L2_Projection(n1 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n3), dΩ, VL2), V)
-    σ22h = interpolate_everywhere(L2_Projection(n2 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n2), dΩ, VL2), V)
-    σ23h = interpolate_everywhere(L2_Projection(n2 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n3), dΩ, VL2), V)
-    σ33h = interpolate_everywhere(L2_Projection(n3 ⋅ ((∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)) * n3), dΩ, VL2), V)
-    ph = interpolate_everywhere(L2_Projection(tr ∘ (∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)), dΩ, VL2), V)
-    return (σ11h, σ12h, σ13h, σ22h, σ23h, σ33h, ph)
+    σh = ∂Ψu ∘ (F∘(∇(uh)'), E∘(∇(φh)), θh)
+    interpolate_L2_tensor(σh, Ω, dΩ)
 end
 
 
 function Cauchy(args...)
-  @warn "The function Cauchy is deprecated and will be removed at the end of November 25. Please, replace it by Piola."
+  @warn "The function Cauchy is deprecated. Shortly it'll be J^-1*P*F^-T."
   Piola(args...)
 end
 

src/PhysicalModels/ElectroMechanicalModels.jl

@@ -36,12 +36,12 @@ struct ElectroMechModel{E<:Electro,M<:Mechano} <: ElectroMechano
   function (obj::ElectroMechModel{<:Electro,<:ViscoElastic})(Λ::Float64=1.0; Δt)
     Ψm, ∂Ψm_u, ∂Ψm_uu = obj.mechano(Λ, Δt=Δt)
     Ψem, ∂Ψem_u, ∂Ψem_φ, ∂Ψem_uu, ∂Ψem_φu, ∂Ψem_φφ = _getCoupling(obj.electro, obj.mechano, Λ)
-    Ψ(F, Fn, E, A...) = Ψm(F, Fn, A...) + Ψem(F, E)
-    ∂Ψu(F, Fn, E, A...) = ∂Ψm_u(F, Fn, A...) + ∂Ψem_u(F, E)
-    ∂Ψφ(F, Fn, E, A...) = ∂Ψem_φ(F, E)
-    ∂Ψuu(F, Fn, E, A...) = ∂Ψm_uu(F, Fn, A...) + ∂Ψem_uu(F, E)
-    ∂Ψφu(F, Fn, E, A...) = ∂Ψem_φu(F, E)
-    ∂Ψφφ(F, Fn, E, A...) = ∂Ψem_φφ(F, E)
+    Ψ(F, E, Fn, A...) = Ψm(F, Fn, A...) + Ψem(F, E)
+    ∂Ψu(F, E, Fn, A...) = ∂Ψm_u(F, Fn, A...) + ∂Ψem_u(F, E)
+    ∂Ψφ(F, E, Fn, A...) = ∂Ψem_φ(F, E)
+    ∂Ψuu(F, E, Fn, A...) = ∂Ψm_uu(F, Fn, A...) + ∂Ψem_uu(F, E)
+    ∂Ψφu(F, E, Fn, A...) = ∂Ψem_φu(F, E)
+    ∂Ψφφ(F, E, Fn, A...) = ∂Ψem_φφ(F, E)
     return (Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ)
   end
 

src/PhysicalModels/MagneticModels.jl

@@ -9,8 +9,8 @@ struct Magnetic <: Magneto
   αr::Ref{Float64}
   χe::Float64
 
-function Magnetic(; μ::Float64, αr::Ref{Float64}, χe::Float64=0.0)
-  new(μ, αr, χe)
+function Magnetic(; μ0::Float64, αr::Float64, χe::Float64=0.0)
+  new(μ0, Ref(αr), χe)
 end
 function (obj::Magnetic)(Λ::Float64=1.0)
   μ, αr, χe = obj.μ, obj.αr, obj.χe
@@ -29,8 +29,8 @@ end
 struct IdealMagnetic <: Magneto
   μ::Float64
   χe::Float64
-  function IdealMagnetic(; μ::Float64, χe::Float64=0.0)
-    new(μ, χe)
+  function IdealMagnetic(; μ0::Float64, χe::Float64=0.0)
+    new(μ0, χe)
   end
   function (obj::IdealMagnetic)(Λ::Float64=1.0)
 
@@ -74,8 +74,8 @@ end
 struct IdealMagnetic2D <: Magneto
   μ::Float64
   χe::Float64
-  function IdealMagnetic2D(; μ::Float64, χe::Float64=0.0)
-    new(μ, χe)
+  function IdealMagnetic2D(; μ0::Float64, χe::Float64=0.0)
+    new(μ0, χe)
   end
 
   function (obj::IdealMagnetic2D)(Λ::Float64=1.0)
@@ -119,8 +119,8 @@ struct HardMagnetic <: Magneto
   χr::Float64
   βmok::Float64
   βcoup::Float64
-  function HardMagnetic(; μ::Float64, αr::Float64, χe::Float64=0.0, χr::Float64=8.0, βmok::Float64=1.0, βcoup::Float64=1.0)
-    new(μ, αr, χe, χr, βmok, βcoup)
+  function HardMagnetic(; μ0::Float64, αr::Float64, χe::Float64=0.0, χr::Float64=8.0, βmok::Float64=0.0, βcoup::Float64=0.0)
+    new(μ0, αr, χe, χr, βmok, βcoup)
   end
 
   function (obj::HardMagnetic)(Λ::Float64=1.0)
@@ -167,8 +167,8 @@ struct HardMagnetic2D <: Magneto
   χr::Float64
   βmok::Float64
   βcoup::Float64
-  function HardMagnetic2D(; μ::Float64, αr::Float64, χe::Float64=0.0, χr::Float64=8.0, βmok::Float64=1.0, βcoup::Float64=1.0)
-    new(μ, αr, χe, χr, βmok, βcoup)
+  function HardMagnetic2D(; μ0::Float64, αr::Float64, χe::Float64=0.0, χr::Float64=8.0, βmok::Float64=0.0, βcoup::Float64=0.0)
+    new(μ0, αr, χe, χr, βmok, βcoup)
   end
 
   function (obj::HardMagnetic2D)(Λ::Float64=1.0)