Merge branch 'master' of git://github.com/JuliaFEM/JuliaFEM.jl

src/mortar.jl

@@ -749,6 +749,12 @@ function assemble!{E<:MortarElements3D}(assembly::Assembly, problem::BoundaryPro
     for p in slave_element("geometry", time)
         push!(Sl, project_point_to_auxiliary_plane(p, x0, Q))
     end
+
+    #=
+    Sl = reverse(Sl)
+    slave_dofs = reverse(slave_dofs)
+    =#
+
     @debug begin
         info("auxiliary plane coords and basis: origo = $x0")
         info("basis:")
@@ -871,6 +877,7 @@ function assemble!{E<:MortarElements3D}(assembly::Assembly, problem::BoundaryPro
                 end
                 # evaluate shape functions values in gauss point and add contribution to matrices
                 N1 = slave_element(xi_slave, time)
+                #N1 = reshape(reverse(vec(N1)), size(N1))
                 N2 = master_element(xi_master, time)
 
                 # calculate determiant of jacobian

src/preprocess_aster_reader.jl

@@ -244,8 +244,7 @@ end
 
 global const med_elmap = Dict{Symbol, Vector{Int}}(
     :HE8 => [4, 8, 7, 3, 1, 5, 6, 2],
-    :QU4 => [4, 3, 2, 1],
-    :SE2 => [2, 1]
+    :TE4 => [2, 3, 4, 1]
 )
 
 function get_connectivity(med::MEDFile, elsets, mesh_name)
@@ -270,8 +269,8 @@ function get_connectivity(med::MEDFile, elsets, mesh_name)
             if haskey(med_elmap, eltype)
                 elco = elco[med_elmap[eltype]]
             else
-                warn("no element mapping info found for element type $eltype")
-                warn("consider this as a warning: element may have french nodal ordering")
+                #warn("no element mapping info found for element type $eltype")
+                #warn("consider this as a warning: element may have french nodal ordering")
             end
             d[element_ids[i]] = (eltype, elset, elco)
         end