fix tests + add nns tests to ci

Author: Abdelrahman912

Project.toml

@@ -24,6 +24,9 @@ JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
 LinearSolve = "7ed4a6bd-45f5-4d41-b270-4a48e9bafcae"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+Ferrite = "c061ca5d-56c9-439f-9c0e-210fe06d3992"
+FerriteGmsh = "4f95f4f8-b27c-4ae5-9a39-ea55e634e36b"
 
 [targets]
-test = ["DelimitedFiles", "FileIO", "IterativeSolvers", "JLD2", "LinearSolve", "Random", "Test"]
+test = ["DelimitedFiles", "FileIO", "IterativeSolvers", "JLD2", "LinearSolve", "Random", "Test","Ferrite","FerriteGmsh","Downloads"]

src/aggregation.jl

@@ -90,7 +90,7 @@ construct_R(::HermitianSymmetry, P) = P'
 
 function fit_candidates(AggOp, B; tol=1e-10)
     A = adjoint(AggOp)
-    n_fine, m = size(B)
+    n_fine, m = ndims(B) == 1 ? (length(B), 1) : size(B)
     n_fine2, n_agg = size(A)
     @assert n_fine2 == n_fine
     n_coarse = m * n_agg

test/nns_test.jl

@@ -3,7 +3,6 @@ import AlgebraicMultigrid as AMG
 using Test
 using SparseArrays, LinearAlgebra
 using Ferrite, FerriteGmsh, SparseArrays
-using Printf
 using Downloads: download
 
 ## Test QR factorization
@@ -259,7 +258,7 @@ function create_nns_frame(x_coords::Vector{Float64}, dofmap::Vector{Int})
     return B
 end
 
-function cantilever_beam(P, E,A, I, L, n_elem)
+function cantilever_beam(P, E, A, I, L, n_elem)
     le = L / n_elem
     n_nodes = n_elem + 1
     dofs_per_node = 3  # u, w, theta
@@ -316,8 +315,9 @@ end
         ml = smoothed_aggregation(A, B)
         @show ml
 
-        @printf("No NNS: final residual at iteration %2d: %6.2e\n", length(residuals_wonns), residuals_nns[end])
-        @printf("With NNS: final residual at iteration %2d: %6.2e\n", length(residuals_nns), residuals_wonns[end])
+        println("No NNS: final residual at iteration ", length(residuals_wonns), ": ", residuals_nns[end])
+        println("With NNS: final residual at iteration ", length(residuals_nns), ": ", residuals_wonns[end])
+
 
         #test QR factorization on linear elasticity
         aggregate = StandardAggregation()
@@ -341,7 +341,7 @@ end
         A = 1e-4       # Cross-section area (for axial)
         I = 1e-6       # Moment of inertia (for bending)
         L = 1.0        # Total length
-        A, b, B = cantilever_beam(P, E,A, I, L, n_elem)
+        A, b, B = cantilever_beam(P, E, A, I, L, n_elem)
         # test solution
         # Analaytical solution for cantilever beam
         u = A \ b
@@ -351,8 +351,9 @@ end
         x_nns, residuals_nns = solve(A, b, SmoothedAggregationAMG(B); log=true, reltol=1e-10)
         x_wonns, residuals_wonns = solve(A, b, SmoothedAggregationAMG(); log=true, reltol=1e-10)
 
-        @printf("No NNS: final residual at iteration %2d: %6.2e\n", length(residuals_wonns), residuals_nns[end])
-        @printf("With NNS: final residual at iteration %2d: %6.2e\n", length(residuals_nns), residuals_wonns[end])
+        println("No NNS: final residual at iteration ", length(residuals_wonns), ": ", residuals_nns[end])
+        println("With NNS: final residual at iteration ", length(residuals_nns), ": ", residuals_wonns[end])
+
 
         # test QR factorization on bending beam
         # Aggregation

test/runtests.jl

@@ -9,6 +9,7 @@ using Random: seed!
 
 include("sa_tests.jl")
 include("cycle_tests.jl")
+include("nns_test.jl")
 
 @testset "AlgebraicMultigrid Tests" begin