Skip to content

Commit

Permalink
Rename DATA -> data
Browse files Browse the repository at this point in the history
  • Loading branch information
juliohm committed Sep 24, 2024
1 parent 50d26e1 commit 2f12bc4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/extra/msh.jl
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ end
function _datatable(tags, data)
if !isempty(data)
column = [get(data, tag, missing) for tag in tags]
(; DATA=column)
(; data=column)
else
nothing
end
Expand Down
22 changes: 11 additions & 11 deletions test/io/msh.jl
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
@testset "MSH" begin
@testset "load" begin
gtb = GeoIO.load(joinpath(datadir, "tetrahedron1.msh"))
@test eltype(gtb.DATA) <: AbstractVector
@test length(first(gtb.DATA)) == 3
@test eltype(gtb.data) <: AbstractVector
@test length(first(gtb.data)) == 3
vtable = values(gtb, 0)
@test eltype(vtable.DATA) <: Float64
@test eltype(vtable.data) <: Float64
@test gtb.geometry isa SimpleMesh
@test embeddim(gtb.geometry) == 3
@test Meshes.lentype(gtb.geometry) <: Meshes.Met{Float64}
@test eltype(gtb.geometry) <: Triangle
@test length(gtb.geometry) == 4

gtb = GeoIO.load(joinpath(datadir, "tetrahedron2.msh"))
@test nonmissingtype(eltype(gtb.DATA)) <: AbstractMatrix
@test size(first(skipmissing(gtb.DATA))) == (3, 3)
@test nonmissingtype(eltype(gtb.data)) <: AbstractMatrix
@test size(first(skipmissing(gtb.data))) == (3, 3)
vtable = values(gtb, 0)
@test nonmissingtype(eltype(vtable.DATA)) <: AbstractVector
@test length(first(skipmissing(vtable.DATA))) == 3
@test nonmissingtype(eltype(vtable.data)) <: AbstractVector
@test length(first(skipmissing(vtable.data))) == 3
@test gtb.geometry isa SimpleMesh
@test embeddim(gtb.geometry) == 3
@test Meshes.lentype(gtb.geometry) <: Meshes.Met{Float64}
Expand All @@ -34,21 +34,21 @@
file1 = joinpath(datadir, "tetrahedron1.msh")
file2 = joinpath(savedir, "tetrahedron1.msh")
gtb1 = GeoIO.load(file1)
GeoIO.save(file2, gtb1, vcolumn=:DATA, ecolumn=:DATA)
GeoIO.save(file2, gtb1, vcolumn=:data, ecolumn=:data)
gtb2 = GeoIO.load(file2)
@test gtb1 == gtb2
@test values(gtb1, 0) == values(gtb2, 0)

file1 = joinpath(datadir, "tetrahedron2.msh")
file2 = joinpath(savedir, "tetrahedron2.msh")
gtb1 = GeoIO.load(file1)
GeoIO.save(file2, gtb1, vcolumn="DATA", ecolumn="DATA")
GeoIO.save(file2, gtb1, vcolumn="data", ecolumn="data")
gtb2 = GeoIO.load(file2)
@test isequal(gtb1.DATA, gtb2.DATA)
@test isequal(gtb1.data, gtb2.data)
@test gtb1.geometry == gtb2.geometry
vtable1 = values(gtb1, 0)
vtable2 = values(gtb2, 0)
@test isequal(vtable1.DATA, vtable2.DATA)
@test isequal(vtable1.data, vtable2.data)

# error: MSH format only supports 3D meshes
gtb = GeoTable(CartesianGrid(2, 2))
Expand Down

0 comments on commit 2f12bc4

Please sign in to comment.