Merge pull request #64 from MultiSimOLab/DirichletBC

Adds constructors for TrialFESpace

Author: jmartfrut

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/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::Ref{Float64}, χe::Float64=0.0)
+  new(μ0, α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=1.0, βcoup::Float64=1.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=1.0, βcoup::Float64=1.0)
+    new(μ0, αr, χe, χr, βmok, βcoup)
   end
 
   function (obj::HardMagnetic2D)(Λ::Float64=1.0)

test/TestConstitutiveModels/PhysicalModelTests.jl

@@ -565,7 +565,7 @@ end
 
   modelMR = MooneyRivlin2D(λ=3.0, μ1=1.0, μ2=2.0)
 
-  modelID = IdealMagnetic2D(μ=1.2566e-6, χe=0.0)
+  modelID = IdealMagnetic2D(μ0=1.2566e-6, χe=0.0)
   Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ = modelID()
   K=Kinematics(Mechano,Solid)
   F, _, _ = get_Kinematics(K)
@@ -595,7 +595,7 @@ end
 
   modelMR = MooneyRivlin2D(λ=3.0, μ1=1.0, μ2=2.0)
 
-  modelID = IdealMagnetic(μ=1.2566e-6, χe=0.0)
+  modelID = IdealMagnetic(μ0=1.2566e-6, χe=0.0)
   Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ = modelID()
   K=Kinematics(Mechano,Solid)
   F, _, _ = get_Kinematics(K)
@@ -632,7 +632,7 @@ end
   N = VectorValue(0.0, 0.0, 1.0)
 
   modelMR = MooneyRivlin3D(λ=3.0, μ1=1.0, μ2=2.0)
-  modelID = HardMagnetic(μ=1.2566e-6, αr=40e-3, χe=0.0, χr=8.0)
+  modelID = HardMagnetic(μ0=1.2566e-6, αr=40e-3, χe=0.0, χr=8.0)
   modelmagneto=modelMR+modelID
   Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ = modelmagneto()
   K=Kinematics(Mechano,Solid)
@@ -667,7 +667,7 @@ end
   ∇φ = VectorValue(1.0, 2.0, 3.0)
   a=40e-3 
   ra=Ref(a)
-  modelID = Magnetic(μ=1.2566e-6, αr=ra ,χe=0.0)
+  modelID = Magnetic(μ0=1.2566e-6, αr=ra ,χe=0.0)
   Ψ, ∂Ψφ, ∂Ψφφ = modelID()
 
   Km=Kinematics(Magneto,Solid)
@@ -691,7 +691,7 @@ end
   ∇φ = VectorValue(1.0, 2.0)
   a=40e-3 
   ra=Ref(a)
-  modelID = Magnetic(μ=1.2566e-6, αr=ra ,χe=0.0)
+  modelID = Magnetic(μ0=1.2566e-6, αr=ra ,χe=0.0)
   Ψ, ∂Ψφ, ∂Ψφφ = modelID()
 
   Km=Kinematics(Magneto,Solid)
@@ -719,7 +719,7 @@ end
   N = VectorValue(0.0, 1.0)
 
   modelMR = MooneyRivlin2D(λ=3.0, μ1=1.0, μ2=2.0)
-  modelID = IdealMagnetic2D(μ=1.2566e-6, χe=0.0)
+  modelID = IdealMagnetic2D(μ0=1.2566e-6, χe=0.0)
   modelmagneto=modelMR+modelID
   Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ = modelmagneto()
   K=Kinematics(Mechano,Solid)
@@ -762,7 +762,7 @@ end
   N = VectorValue(0.0, 1.0)
 
   modelMR = MooneyRivlin2D(λ=3.0, μ1=1.0, μ2=2.0)
-  modelID = HardMagnetic2D(μ=1.2566e-6, αr=40e-3, χe=0.0, χr=8.0)
+  modelID = HardMagnetic2D(μ0=1.2566e-6, αr=40e-3, χe=0.0, χr=8.0)
   modelmagneto=modelMR+modelID
   Ψ, ∂Ψu, ∂Ψφ, ∂Ψuu, ∂Ψφu, ∂Ψφφ = modelmagneto()
   K=Kinematics(Mechano,Solid)