mirror of
https://github.com/JuliaFEM/JuliaFEM.jl.git
synced 2026-09-19 01:48:47 +00:00
Jukka Aho
ef9cddff13
- Added 1111 lines of mesh reading code to src/readers/
- ABAQUS .inp format support (6 files: parse_mesh, parse_model, keywords, etc.)
- Code Aster .med format support (3 files: read_aster_mesh, read_aster_results)
- Modernized Julia 0.x → 1.x syntax:
* Nullable{T} → Union{T, Nothing}
* get(nullable) → direct field access
- Added Logging stdlib to Project.toml dependencies
- Functions verified: abaqus_read_mesh, aster_read_mesh
Result: 7 vendor packages consolidated (~6400 lines total)
FEMBasis, FEMBase, FEMQuad, FEMSparse, AbaqusReader, AsterReader
Tests: 5 passing (baseline maintained)
48 lines
1.2 KiB
Julia
48 lines
1.2 KiB
Julia
# This file is a part of JuliaFEM.
|
|
# License is MIT: see https://github.com/JuliaFEM/FEMSparse.jl/blob/master/LICENSE
|
|
|
|
mutable struct SparseVectorDOK{Tv,Ti<:Integer} <: AbstractSparseArray{Tv,Ti,1}
|
|
data::Dict{Ti,Tv}
|
|
end
|
|
|
|
function SparseVectorDOK()
|
|
return SparseVectorDOK(Dict{Int64,Float64}())
|
|
end
|
|
|
|
function SparseVectorDOK{Tv,Ti<:Integer}(b::SparseVector{Tv,Ti})
|
|
I, V = findnz(b)
|
|
c = SparseVectorDOK()
|
|
add!(c, I, V)
|
|
return c
|
|
end
|
|
|
|
function SparseVectorDOK{T}(b::Vector{T})
|
|
return SparseVectorDOK(sparsevec(b))
|
|
end
|
|
|
|
function add!{Tv,Ti<:Integer}(b::SparseVectorDOK{Tv,Ti}, i::Ti, v::Tv)
|
|
b.data[i] = get(b, i) + v
|
|
return nothing
|
|
end
|
|
|
|
function add!{Tv,Ti<:Integer}(b::SparseVectorDOK{Tv,Ti}, dofs::Vector{Ti}, data::Vector{Tv})
|
|
@assert length(dofs) == length(data)
|
|
z = Tv(0)
|
|
for i = 1:length(dofs)
|
|
@inbounds b.data[dofs[i]] = Base.get(b.data, i, z) + data[i]
|
|
end
|
|
return nothing
|
|
end
|
|
|
|
function get{Tv,Ti<:Integer}(b::SparseVectorDOK{Tv,Ti}, i::Ti)
|
|
return Base.get(b.data, i, Tv(0))
|
|
end
|
|
|
|
function get!{Tv,Ti<:Integer}(b::SparseVectorDOK{Tv,Ti}, dofs::Vector{Ti}, data::Vector{Tv})
|
|
for (i, j) in enumerate(dofs)
|
|
data[i] = get(b, i)
|
|
end
|
|
return nothing
|
|
end
|
|
|