Skip to content

Commit 9443fe5

Browse files
committed
jld -> jld2
1 parent ad2be73 commit 9443fe5

File tree

12 files changed

+11
-11
lines changed

12 files changed

+11
-11
lines changed

test/REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
JLD
1+
FileIO

test/onetoall.jld

-10.4 KB
Binary file not shown.

test/onetoall.jld2

8.3 KB
Binary file not shown.
Binary file not shown.

test/ref_R.jld

-16.1 KB
Binary file not shown.

test/ref_R.jld2

14 KB
Binary file not shown.
Binary file not shown.

test/runtests.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
using Compat, Compat.Test, Compat.LinearAlgebra
22
using Compat.SparseArrays, Compat.DelimitedFiles, Compat.Random
3-
using IterativeSolvers, JLD, AlgebraicMultigrid
3+
using IterativeSolvers, FileIO, AlgebraicMultigrid
44
import AlgebraicMultigrid: V, coarse_solver, Pinv, Classical
55

66
include("sa_tests.jl")
77

88
@testset "AlgebraicMultigrid Tests" begin
99

10-
graph = load("test.jld")["G"]
11-
ref_S = load("ref_S_test.jld")["G"]
10+
graph = load("test.jld2")["G"]
11+
ref_S = load("ref_S_test.jld2")["G"]
1212
ref_split = readdlm("ref_split_test.txt")
1313

1414
@testset "Strength of connection" begin
@@ -37,7 +37,7 @@ srand(0)
3737
S = sprand(10,10,0.1); S = S + S'
3838
@test split_nodes(RS(), S) == [0, 1, 1, 0, 0, 0, 0, 0, 1, 1]
3939

40-
a = load("thing.jld")["G"]
40+
a = load("thing.jld2")["G"]
4141
S, T = AlgebraicMultigrid.strength_of_connection(Classical(0.25), a)
4242
@test split_nodes(RS(), S) == [0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 0,
4343
0, 0, 1, 0, 1, 0, 1, 0, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 1, 0,
@@ -60,7 +60,7 @@ P, R = AlgebraicMultigrid.direct_interpolation(A, copy(A), splitting)
6060
0.0 1.0 0.0
6161
0.0 0.5 0.5
6262
0.0 0.0 1.0 ]
63-
A = load("thing.jld")["G"]
63+
A = load("thing.jld2")["G"]
6464
ml = ruge_stuben(A)
6565
@test size(ml.levels[2].A, 1) == 19
6666
end
@@ -85,7 +85,7 @@ end
8585
@test size(ml.final_A, 1) == 7
8686
@test nnz(ml.final_A) == 19
8787

88-
A = load("randlap.jld")["G"]
88+
A = load("randlap.jld2")["G"]
8989
ml = ruge_stuben(A)
9090
@test length(ml) == 3
9191
s = [100, 17]
@@ -127,7 +127,7 @@ x = solve(ml, A * ones(1000))
127127
@test sum(abs2, x - ones(1000)) < 1e-8
128128

129129

130-
A = load("randlap.jld")["G"]
130+
A = load("randlap.jld2")["G"]
131131

132132
ml = ruge_stuben(A, presmoother = fsmoother,
133133
postsmoother = fsmoother)
@@ -141,7 +141,7 @@ x = solve(ml, A * ones(100))
141141
end
142142

143143
@testset "Preconditioning" begin
144-
A = load("thing.jld")["G"]
144+
A = load("thing.jld2")["G"]
145145
n = size(A, 1)
146146
smoother = GaussSeidel(ForwardSweep())
147147
ml = ruge_stuben(A, presmoother = smoother,

test/sa_tests.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,13 @@ function test_jacobi_prolongator()
309309
A = poisson(100)
310310
T = poisson(100)
311311
x = smooth_prolongator(JacobiProlongation(4/3), A, T, 1, 1)
312-
ref = load("ref_R.jld")["G"]
312+
ref = load("ref_R.jld2")["G"]
313313
@test sum(abs2, x - ref) < 1e-6
314314
end
315315

316316
# Issue #24
317317
function nodes_not_agg()
318-
A = load("onetoall.jld")["G"]
318+
A = load("onetoall.jld2")["G"]
319319
ml = smoothed_aggregation(A)
320320
@test size(ml.levels[2].A) == (11,11)
321321
@test size(ml.final_A) == (2,2)
40.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)