Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add issm archives #19

Merged
merged 3 commits into from
Jul 3, 2024
Merged

Add issm archives #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3ca5d3
make test101 works with ISSM Archive data
enigne Jun 22, 2024
2dbc2ad
ignore thoes without Archive data
enigne Jun 22, 2024
c4aa1c3
add arch data
enigne Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added test/Archives/Archive101.arch
View file
Open in desktop
Binary file not shown.
34 changes: 33 additions & 1 deletion test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,46 @@ function searchdir(path,key)
filter(x->occursin(key,x), readdir(path))
end

function compareArchive(id, procedure::Symbol)
archive_name = "Archive"*string(id)
archive_path = issmdir()*"/test/Archives/"*archive_name*".arch"
if procedure===:update
# update Archive
else
# check Archive
if isfile(archive_path)
for k=1:length(field_names)
# Get field and tolerance
field=field_values[k];
fieldname=field_names[k];
tolerance=field_tolerances[k];

# Compare to archive
# Our output is in the correct order (n,1) or (1,1), so we do not need to transpose again
archive = archread(archive_path, archive_name*"_field"*string(k))
error_diff = (maximum(abs.(archive-field))/(maximum(abs.(archive))+eps(Float64)))

@test isnan(error_diff) == false
@test error_diff < tolerance
end
else
@warn "$archive_name does not exist! Skip the comparison of the results"
end
end
end

@time begin
@time @testset "Model Struct Tests" begin include("modelstructtests.jl") end

# test each individual cases, name with test[0-9]*.jl
testsolutions = searchdir("./", r"test[0-9]*.jl")
testsolutions = searchdir("./", r"test\d+.jl")
@time @testset "Model Solution Tests" begin
for tf in testsolutions
# run the test
include(tf)
# check the results vs. saved archive
testid = match(r"test(\d+).jl", tf).captures[1]
compareArchive(testid, :test)
end
end

Expand Down
15 changes: 11 additions & 4 deletions test/test101.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ y = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","y")
vx = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vx")
vy = archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","vy")
index = Int.(archread(issmdir()*"/test/Data/SquareShelfConstrained.arch","index"))
md.initialization.vx=0 .*InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y,0.0)
md.initialization.vy=0 .*InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y,0.0)
md.initialization.vx=InterpFromMeshToMesh2d(index,x,y,vx,md.mesh.x,md.mesh.y,0.0)
md.initialization.vy=InterpFromMeshToMesh2d(index,x,y,vy,md.mesh.x,md.mesh.y,0.0)

md.materials.rheology_B=1.815730284801701e+08*ones(md.mesh.numberofvertices)
md.materials.rheology_B=1.815730284801701e08*ones(md.mesh.numberofvertices)
md.materials.rheology_n=3*ones(md.mesh.numberofelements)
md.friction.coefficient=20*ones(md.mesh.numberofvertices)
md.friction.coefficient=0.0*ones(md.mesh.numberofvertices)
md.friction.p=ones(md.mesh.numberofvertices)
md.friction.q=ones(md.mesh.numberofvertices)

Expand All @@ -43,3 +43,10 @@ md.stressbalance.spcvx[pos] .= 0.0
md.stressbalance.spcvy[pos] .= 0.0

md=solve(md,:Stressbalance)

# Fields and tolerances to track changes
field_names =["Vx","Vy","Vel"]
field_tolerances=[4e-13,4e-13,4e-13]
field_values= [(md.results["StressbalanceSolution"]["Vx"]),
(md.results["StressbalanceSolution"]["Vy"]),
(md.results["StressbalanceSolution"]["Vel"]) ]
Loading