Merge branch 'main' into evol

Author: miguelmaso

README.md

@@ -92,9 +92,13 @@ Uφ = TrialFESpace(Vφ, D_bc.BoundaryCondition[2], 1.0)
 V = MultiFieldFESpace([Vu, Vφ])
 U = MultiFieldFESpace([Uu, Uφ])
 
+# Kinematic Description
+km=Kinematics(Mechano,Solid)
+ke=Kinematics(Electro,Solid)
+
 # residual and jacobian function of load factor
-res(Λ) = ((u, φ), (v, vφ)) -> residual(physmodel, (u, φ), (v, vφ), dΩ)
-jac(Λ) = ((u, φ), (du, dφ), (v, vφ)) -> jacobian(physmodel, (u, φ), (du, dφ), (v, vφ), dΩ)
+res(Λ) = ((u, φ), (v, vφ)) -> residual(physmodel, (km,ke),(u, φ), (v, vφ), dΩ)
+jac(Λ) = ((u, φ), (du, dφ), (v, vφ)) -> jacobian(physmodel, (km,ke), (u, φ), (du, dφ), (v,vφ),dΩ)
 
 # nonlinear solver
 ls = LUSolver()

benchmark/Project.toml

@@ -3,3 +3,4 @@ BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
 Gridap = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
 GridapGmsh = "3025c34a-b394-11e9-2a55-3fee550c04c8"
 GridapSolvers = "6d3209ee-5e3c-4db7-a716-942eb12ed534"
+TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"

benchmark/SimulationsBenchmarks/StaticMechanicalDirichletBenchmark.jl

@@ -0,0 +1,5 @@
+
+filename = projdir("test/data/StaticMechanicalDirichletSimulation.jl")
+include(filename)
+
+SUITE["Simulations"]["StaticMechanicalDirichlet"] = @benchmarkable static_mechanical_dirichlet_simulation(writevtk=false, verbose=false)

benchmark/SimulationsBenchmarks/StaticMechanicalNeumannBenchmark.jl

@@ -0,0 +1,5 @@
+
+filename = projdir("test/data/StaticMechanicalNeumannSimulation.jl")
+include(filename)
+
+SUITE["Simulations"]["StaticMechanicalNeumann"] = @benchmarkable static_mechanical_neumann_simulation(writevtk=false, verbose=false)

benchmark/SimulationsBenchmarks/ViscoElasticSimulationBenchmark.jl

@@ -1,6 +1,5 @@
 
-BASE_FOLDER = dirname(dirname(pathof(HyperFEM)))
-filename = joinpath(BASE_FOLDER, "test/data/ViscoElasticSimulation.jl")
+filename = projdir("test/data/ViscoElasticSimulation.jl")
 include(filename)
 
-SUITE["Simulations"]["ViscoElastic"] = @benchmarkable visco_elastic_simulation(write_vtk=false)
+SUITE["Simulations"]["ViscoElastic"] = @benchmarkable visco_elastic_simulation(writevtk=false, verbose=false)

benchmark/SimulationsBenchmarks/benchmarks.jl

@@ -2,3 +2,7 @@
 SUITE["Simulations"] = BenchmarkGroup()
 
 include("ViscoElasticSimulationBenchmark.jl")
+
+include("StaticMechanicalDirichletBenchmark.jl")
+
+include("StaticMechanicalNeumannBenchmark.jl")

src/ComputationalModels/PostProcessors.jl

@@ -71,17 +71,16 @@ function (obj::PostProcessor{<:DynamicNonlinearModel,<:Any,<:Any})(Λ)
     obj.cache[1](obj, obj.cache[2]...)
 end
 
-function Jacobian(uh)
-  F, _, J = Kinematics(Mechano).metrics
+function Jacobian(uh,km)
+  F, _, J = get_Kinematics(km)
   J ∘ F ∘ ∇(uh)
 end
 
-function Cauchy(physmodel::ThermoElectroMechano, uh, φh, θh, Ω, dΩ, Λ=1.0)
+function Cauchy(physmodel::ThermoElectroMechano,kine::NTuple{3,KinematicModel}, uh, φh, θh, Ω, dΩ, Λ=1.0)
     DΨ = physmodel(Λ)
-    Kinematic_mec = Kinematics(Mechano)
-    Kinematic_elec = Kinematics(Electro)
-    F, _, _ = get_Kinematics(Kinematic_mec)
-    E = get_Kinematics(Kinematic_elec)
+
+    F, _, _ = get_Kinematics(kine[1])
+    E = get_Kinematics(kine[2])
     ∂Ψu = DΨ[2]
     refL2 = ReferenceFE(lagrangian, Float64, 0)
     ref = ReferenceFE(lagrangian, Float64, 1)
@@ -101,38 +100,36 @@ function Cauchy(physmodel::ThermoElectroMechano, uh, φh, θh, Ω, dΩ, Λ=1.0)
 end
 
 
-function Cauchy(model::Elasto, uh, unh, state_vars, Ω, dΩ, t, Δt)
-    σh = Cauchy(model, uh)
+function Cauchy(model::Elasto,km::KinematicModel,uh, unh, state_vars, Ω, dΩ, t, Δt)
+    σh = Cauchy(model,km,uh)
     interpolate_L2_tensor(σh, Ω, dΩ)
 end
 
 
-function Cauchy(model::ViscoElastic, uh, unh, state_vars, Ω, dΩ, t, Δt)
-    σh = Cauchy(model, uh, unh, state_vars, Δt)
+function Cauchy(model::ViscoElastic, km::KinematicModel, uh, unh, state_vars, Ω, dΩ, t, Δt)
+    σh = Cauchy(model, km, uh, unh, state_vars, Δt)
     interpolate_L2_tensor(σh, Ω, dΩ)
 end
 
 
-function Cauchy(model::Elasto, uh, vars...)
+function Cauchy(model::Elasto, km::KinematicModel,uh, vars...)
     _, ∂Ψu, _ = model()
-    F, _, _ = get_Kinematics(model.Kinematic)
+    F, _, _ = get_Kinematics(km)
     ∂Ψu ∘ (F∘∇(uh))
 end
 
 
-function Cauchy(model::ViscoElastic, uh, unh, states, Δt)
+function Cauchy(model::ViscoElastic,  km::KinematicModel, uh, unh, states, Δt)
     _, ∂Ψu, _ = model(Δt=Δt)
-    F, _, _ = get_Kinematics(model.Kinematic)
+    F, _, _ = get_Kinematics(km)
     ∂Ψu ∘ (F∘∇(uh), F∘∇(unh), states...)
 end
 
 
-function Entropy(physmodel::ThermoElectroMechano, uh, φh, θh, Ω, dΩ, Λ=1.0)
+function Entropy(physmodel::ThermoElectroMechano,  kine::NTuple{3,KinematicModel}, uh, φh, θh, Ω, dΩ, Λ=1.0)
     DΨ = physmodel(Λ)
-    Kinematic_mec = Kinematics(Mechano)
-    Kinematic_elec = Kinematics(Electro)
-    F, _, _ = get_Kinematics(Kinematic_mec)
-    E = get_Kinematics(Kinematic_elec)
+    F,_,_ = get_Kinematics(kine[1]; Λ=Λ)
+    E     = get_Kinematics(kine[2]; Λ=Λ)
     η = DΨ[11]
     refL2 = ReferenceFE(lagrangian, Float64, 0)
     ref = ReferenceFE(lagrangian, Float64, 1)
@@ -142,12 +139,10 @@ function Entropy(physmodel::ThermoElectroMechano, uh, φh, θh, Ω, dΩ, Λ=1.0)
     return ηh
 end
 
-function D0(physmodel::ThermoElectroMechano, uh, φh, θh, Ω, dΩ, Λ=1.0)
+function D0(physmodel::ThermoElectroMechano,  kine::NTuple{3,KinematicModel}, uh, φh, θh, Ω, dΩ, Λ=1.0)
     DΨ = physmodel(Λ)
-    Kinematic_mec = Kinematics(Mechano)
-    Kinematic_elec = Kinematics(Electro)
-    F, _, _ = get_Kinematics(Kinematic_mec)
-    E = get_Kinematics(Kinematic_elec)
+    F,_,_ = get_Kinematics(kine[1]; Λ=Λ)
+    E     = get_Kinematics(kine[2]; Λ=Λ)
     ∂ΨE = DΨ[3]
     refL2 = ReferenceFE(lagrangian, Float64, 0)
     ref = ReferenceFE(lagrangian, Float64, 1)

src/Exports.jl

@@ -79,6 +79,7 @@ end
 @publish PhysicalModels EnergyInterpolationScheme
 @publish PhysicalModels update_state!
 @publish PhysicalModels Kinematics
+@publish PhysicalModels Solid
 @publish PhysicalModels KinematicModel
 @publish PhysicalModels EvolutiveKinematics
 @publish PhysicalModels get_Kinematics
@@ -135,8 +136,6 @@ end
 @publish Solvers Roman_LS
 @publish Solvers update_cellstate!
 
- 
-
-
-# @publish LinearSolvers solve
-# @publish LinearSolvers solve!
+export setupfolder
+export projdir
+export filedir

src/HyperFEM.jl

@@ -1,16 +1,12 @@
 module HyperFEM
 
-using TimerOutputs
-
-
 include("TensorAlgebra/TensorAlgebra.jl")
 include("PhysicalModels/PhysicalModels.jl")
 include("WeakForms/WeakForms.jl")
 include("Solvers/Solvers.jl")
 include("ComputationalModels/ComputationalModels.jl")
 
 include("Io.jl")
-export setupfolder
-
 include("Exports.jl")
+
 end

src/Io.jl

@@ -31,3 +31,15 @@ end
 
 function cleandir(::String, ::Nothing)
 end
+
+"""
+Return the path to the specified folders relative to the HyperFEM path.
+
+# Examples
+    folder = projdir("data", "sims")
+    folder = projdir("test/data/mesh.msh")
+"""
+function projdir(folders::String...)
+  base_folder = dirname(dirname(pathof(HyperFEM)))
+  joinpath(base_folder, folders...)
+end