Fix deprecations

JuliaFEM · Jul 2, 2018 · 043fb71 · 043fb71
1 parent ef78368
commit 043fb71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/contact2dad.jl b/src/contact2dad.jl
@@ -3,7 +3,7 @@
 
 using ForwardDiff: value
 
-type Contact2DAD <: BoundaryProblem
+mutable struct Contact2DAD <: BoundaryProblem
     master_elements :: Vector{Element}
     rotate_normals :: Bool
     dual_basis :: Bool
@@ -80,9 +80,9 @@ xi
     projected master
 
 """
-function project_from_master_to_slave_ad{E<:MortarElements2D}(
+function project_from_master_to_slave_ad(
     slave_element::Element{E}, x1_::DVTI, n1_::DVTI, x2::Vector;
-    tol=1.0e-10, max_iterations=20, debug=false)
+    tol=1.0e-10, max_iterations=20, debug=false) where E<:MortarElements2D
 
     """ Multiply basis / dbasis at `xi` with field. """
     function mul(func, xi, field)
@@ -135,9 +135,9 @@ function project_from_master_to_slave_ad{E<:MortarElements2D}(
 
 end
 
-function project_from_slave_to_master_ad{E<:MortarElements2D}(
+function project_from_slave_to_master_ad(
     master_element::Element{E}, x1, n1, x2_;
-    tol=1.0e-10, max_iterations=20)
+    tol=1.0e-10, max_iterations=20) where E<:MortarElements2D
 
     x2(xi2) = interpolate(vec(get_basis(master_element, [xi2], time)), x2_)
     dx2(xi2) = interpolate(vec(get_dbasis(master_element, [xi2], time)), x2_)

diff --git a/src/mortar2dad.jl b/src/mortar2dad.jl
@@ -1,7 +1,7 @@
 # This file is a part of JuliaFEM.
 # License is MIT: see https://github.com/JuliaFEM/MortarContact2DAD.jl/blob/master/LICENSE
 
-type Mortar2DAD <: BoundaryProblem
+mutable struct Mortar2DAD <: BoundaryProblem
     master_elements :: Vector{Element}
 end
 
@@ -81,9 +81,9 @@ function project_from_master_to_slave_ad(slave_element::Element{E}, x1_, n1_, x2
 
 end
 
-function project_from_slave_to_master_ad{E<:MortarElements2D}(
+function project_from_slave_to_master_ad(
     master_element::Element{E}, x1, n1, x2_, time;
-    tol=1.0e-10, max_iterations=20)
+    tol=1.0e-10, max_iterations=20) where E<:MortarElements2D
 
     x2(xi2) = interpolate(vec(get_basis(master_element, [xi2], time)), x2_)
     dx2(xi2) = interpolate(vec(get_dbasis(master_element, [xi2], time)), x2_)