From 2f12bc4fa0e4f2ae2462fecd85a7c6a57d74d49a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlio=20Hoffimann?= Date: Tue, 24 Sep 2024 10:09:46 -0300 Subject: [PATCH] Rename DATA -> data --- src/extra/msh.jl | 2 +- test/io/msh.jl | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/extra/msh.jl b/src/extra/msh.jl index 6fd525d..982a3f7 100644 --- a/src/extra/msh.jl +++ b/src/extra/msh.jl @@ -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 diff --git a/test/io/msh.jl b/test/io/msh.jl index 2886a62..5b50ea2 100644 --- a/test/io/msh.jl +++ b/test/io/msh.jl @@ -1,10 +1,10 @@ @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} @@ -12,11 +12,11 @@ @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} @@ -34,7 +34,7 @@ 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) @@ -42,13 +42,13 @@ 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))