Merge branch 'master' of github.com:gridap/Gridap.jl into optimizing_…

…conforming_rt_fes
gridap · Sep 6, 2021 · cbd25b6 · cbd25b6
2 parents a9e1cdf + 87ff667
commit cbd25b6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/src/Geometry/SkeletonTriangulations.jl b/src/Geometry/SkeletonTriangulations.jl
@@ -252,8 +252,7 @@ end
 
 function get_facet_normal(trian::SkeletonTriangulation)
   plus = get_facet_normal(trian.plus)
-  #minus = get_facet_normal(trian.minus)
-  minus = lazy_map(Broadcasting(Operation(-)),plus)
+  minus = get_facet_normal(trian.minus)
   SkeletonPair(plus,minus)
 end
 

diff --git a/src/TensorValues/SymFourthOrderTensorValueTypes.jl b/src/TensorValues/SymFourthOrderTensorValueTypes.jl
@@ -48,9 +48,9 @@ SymFourthOrderTensorValue{D,T1}(data::Tuple) where {D,T1} = SymFourthOrderTensor
 
 # SymTensorValue Vararg constructor
 
-SymFourthOrderTensorValue(data...) = SymFourthOrderTensorValue(data)
-SymFourthOrderTensorValue{D}(data...) where {D} = SymFourthOrderTensorValue{D}(data)
-SymFourthOrderTensorValue{D,T1}(data...) where {D,T1} = SymFourthOrderTensorValue{D,T1}(data)
+SymFourthOrderTensorValue(data::Number...) = SymFourthOrderTensorValue(data)
+SymFourthOrderTensorValue{D}(data::Number...) where {D} = SymFourthOrderTensorValue{D}(data)
+SymFourthOrderTensorValue{D,T1}(data::Number...) where {D,T1} = SymFourthOrderTensorValue{D,T1}(data)
 
 ###############################################################
 # Conversions (SymTensorValue)

diff --git a/src/TensorValues/SymTensorValueTypes.jl b/src/TensorValues/SymTensorValueTypes.jl
@@ -49,10 +49,10 @@ SymTensorValue{D,T1,L}(data::Tuple) where {D,T1,L}   = SymTensorValue{D,T1}(NTup
 
 # SymTensorValue Vararg constructor
 
-SymTensorValue(data...)                    = SymTensorValue(data)
-SymTensorValue{D}(data...)    where {D}    = SymTensorValue{D}(data)
-SymTensorValue{D,T1}(data...) where {D,T1} = SymTensorValue{D,T1}(data)
-SymTensorValue{D,T1,L}(data...) where {D,T1,L} = SymTensorValue{D,T1}(data)
+SymTensorValue(data::Number...)                    = SymTensorValue(data)
+SymTensorValue{D}(data::Number...)    where {D}    = SymTensorValue{D}(data)
+SymTensorValue{D,T1}(data::Number...) where {D,T1} = SymTensorValue{D,T1}(data)
+SymTensorValue{D,T1,L}(data::Number...) where {D,T1,L} = SymTensorValue{D,T1}(data)
 
 # SymTensorValue single AbstractMatrix argument constructor
 

diff --git a/src/TensorValues/TensorValueTypes.jl b/src/TensorValues/TensorValueTypes.jl
@@ -51,11 +51,11 @@ TensorValue{D1,D2,T1,L}(data::Tuple) where {D1,D2,T1,L}  = TensorValue{D1,D2,T1}
 
 # TensorValue Vararg constructor
 
-TensorValue(data...)                            = TensorValue(data)
-TensorValue{D}(data...)        where {D}        = TensorValue{D}(data)
-TensorValue{D1,D2}(data...)    where {D1,D2}    = TensorValue{D1,D2}(data)
-TensorValue{D1,D2,T1}(data...) where {D1,D2,T1} = TensorValue{D1,D2,T1}(data)
-TensorValue{D1,D2,T1,L}(data...) where {D1,D2,T1,L} = TensorValue{D1,D2,T1}(data)
+TensorValue(data::Number...)                            = TensorValue(data)
+TensorValue{D}(data::Number...)        where {D}        = TensorValue{D}(data)
+TensorValue{D1,D2}(data::Number...)    where {D1,D2}    = TensorValue{D1,D2}(data)
+TensorValue{D1,D2,T1}(data::Number...) where {D1,D2,T1} = TensorValue{D1,D2,T1}(data)
+TensorValue{D1,D2,T1,L}(data::Number...) where {D1,D2,T1,L} = TensorValue{D1,D2,T1}(data)
 
 # TensorValue single AbstractMatrix argument constructor
 

diff --git a/src/TensorValues/ThirdOrderTensorValueTypes.jl b/src/TensorValues/ThirdOrderTensorValueTypes.jl
@@ -41,11 +41,11 @@ ThirdOrderTensorValue{D1,D2,D3,T1,L}(data::Tuple) where {D1,D2,D3,T1,L}  = Third
 
 # ThirdOrderTensorValue Vararg constructor
 
-ThirdOrderTensorValue(data...) = ThirdOrderTensorValue(data)
-ThirdOrderTensorValue{D}(data...) where {D} = ThirdOrderTensorValue{D}(data)
-ThirdOrderTensorValue{D1,D2,D3}(data...) where {D1,D2,D3} = ThirdOrderTensorValue{D1,D2,D3}(data)
-ThirdOrderTensorValue{D1,D2,D3,T1}(data...) where {D1,D2,D3,T1} =  ThirdOrderTensorValue{D1,D2,D3,T1}(data)
-ThirdOrderTensorValue{D1,D2,D3,T1,L}(data...) where {D1,D2,D3,T1,L} =  ThirdOrderTensorValue{D1,D2,D3,T1}(data)
+ThirdOrderTensorValue(data::Number...) = ThirdOrderTensorValue(data)
+ThirdOrderTensorValue{D}(data::Number...) where {D} = ThirdOrderTensorValue{D}(data)
+ThirdOrderTensorValue{D1,D2,D3}(data::Number...) where {D1,D2,D3} = ThirdOrderTensorValue{D1,D2,D3}(data)
+ThirdOrderTensorValue{D1,D2,D3,T1}(data::Number...) where {D1,D2,D3,T1} =  ThirdOrderTensorValue{D1,D2,D3,T1}(data)
+ThirdOrderTensorValue{D1,D2,D3,T1,L}(data::Number...) where {D1,D2,D3,T1,L} =  ThirdOrderTensorValue{D1,D2,D3,T1}(data)
 
 # ThirdOrderTensorValue single AbstractArray{3,T} argument constructor
 

diff --git a/src/TensorValues/VectorValueTypes.jl b/src/TensorValues/VectorValueTypes.jl
@@ -41,12 +41,12 @@ VectorValue{D,T1}(data::Tuple) where {D,T1} = VectorValue{D,T1}(NTuple{D,T1}(dat
 
 # VectorValue Vararg constructor
 
-VectorValue(data...)                    = VectorValue(data)
-VectorValue{D}(data...)    where {D}    = VectorValue{D}(data)
-VectorValue{D,T1}(data...) where {D,T1} = VectorValue{D,T1}(data)
+VectorValue(data::Number...)                    = VectorValue(data)
+VectorValue{D}(data::Number...)    where {D}    = VectorValue{D}(data)
+VectorValue{D,T1}(data::Number...) where {D,T1} = VectorValue{D,T1}(data)
 
 # Fix for julia 1.0.4
-VectorValue{D}(data::T...)    where {D,T}    = VectorValue{D,T}(data)
+VectorValue{D}(data::T...)    where {D,T<:Number}    = VectorValue{D,T}(data)
 
 # VectorValue single AbstractVector argument constructor