More cleanup

Author: moyner

src/solver/linsolve.jl

@@ -229,7 +229,7 @@ function Jutul.update_preconditioner!(prec::BatteryCPhiPreconditioner, lsys, con
     #@exfiltrate mass_map, c, charge_map, phi
 end
 
-function Jutul.apply!(x, prec::BatteryCPhiPreconditioner, r, arg...)
+function Jutul.apply!(x, prec::BatteryCPhiPreconditioner, r)
     (; c, phi, allvars, A) = prec.data
     #@. x .= r
     dx = allvars.x

src/solver/precondgenneral.jl

@@ -1,5 +1,5 @@
 
-function Jutul.update_preconditioner!(prec::BattMo.BatteryGeneralPreconditioner, lsys, context, model, storage, recorder, executor)
+function Jutul.update_preconditioner!(prec::BattMo.BatteryGeneralPreconditioner, lsys::Jutul.JutulLinearSystem, context, model, storage, recorder, executor)
     # Solve all Phi with AMG
     # Solve the elyte C with another AMG
     # Let the rest be (?)
@@ -71,7 +71,7 @@ function Jutul.update_preconditioner!(prec::BattMo.BatteryGeneralPreconditioner,
 end
 Jutul.operator_nrows(p::BattMo.BatteryGeneralPreconditioner) = p.data.n
 
-function Jutul.apply!(x, prec::BattMo.BatteryGeneralPreconditioner, r, arg...)
+function Jutul.apply!(x, prec::BattMo.BatteryGeneralPreconditioner, r)
     A = prec.data.A
     x .= 0 
     dx = prec.data.allvars.x#copy(x) # maybe move to storage
@@ -96,7 +96,7 @@ function Jutul.apply!(x, prec::BattMo.BatteryGeneralPreconditioner, r, arg...)
         println("Models ", varprecond.models)
         #println(precond)
         end
-        apply_local_preconditioner!(dx, precond, r_local, var, arg...)
+        apply_local_preconditioner!(dx, precond, r_local, var)
         #println(dx)
         x .+= dx
         if prec.params["method"] == "seq"
@@ -122,7 +122,7 @@ function Jutul.apply!(x, prec::BattMo.BatteryGeneralPreconditioner, r, arg...)
     #error()
     if !isnothing(prec.g_varprecond)
         varprec = prec.g_varprecond
-        Jutul.apply!(dx, varprec.precond, r_local, arg...)
+        Jutul.apply!(dx, varprec.precond, r_local)
         x .+= dx
         Jutul.mul!(r_local, A, dx, -1, true)
         dx .= 0.0
@@ -199,12 +199,12 @@ function update_local_preconditioner!(varprec, A, r, ind_eq, ind_var, executor)
     #NB ok??
     #Jutul.update_preconditioner!(prec, A_s, view(r, ix), DefaultContext(), executor)
 end
-function apply_local_preconditioner!(x, prec, r, S, arg...)
+function apply_local_preconditioner!(x, prec, r, S)
     r_i = S.r
     x_i = S.x
     x_i .= 0.0
     ix = S.ix
     @. r_i = r[ix]
-    apply!(x_i, prec, r_i,arg...)
+    apply!(x_i, prec, r_i)
     @. x[ix] = x_i
 end

test/3d_example_amg.jl

@@ -3,9 +3,7 @@ using Test
 using AlgebraicMultigrid
 
 @testset "3d amg" begin
-    
     @test begin
-        
         name = "p2d_40_jl_chen2020"
 
         fn = string(dirname(pathof(BattMo)), "/../test/data/jsonfiles/", name, ".json")
@@ -25,7 +23,8 @@ using AlgebraicMultigrid
         timesteps = output[:timesteps]
         cfg       = output[:cfg]
 
-        cfg[:info_level]                             = 0
+        cfg[:info_level] = 0
+        cfg[:failure_cuts_timestep] = false
 
         solver  = :fgmres
         fac     = 1e-4  #NEEDED  
@@ -56,15 +55,15 @@ using AlgebraicMultigrid
 
         states, reports = simulate(state0, simulator, timesteps; forces=forces, config=cfg)
         Cc = map(x -> x[:Control][:Current][1], states)
-        Phi = map(x -> x[:Control][:Phi][1], states)
+        phi = map(x -> x[:Control][:Phi][1], states)
         @test length(states) == 77
         @test Cc[1] ≈ 0.00058 atol = 1e-2
         for i in 3:length(Cc)
             @test Cc[i] ≈ 0.008165 atol = 1e-2
         end
-        @test Phi[1] ≈ 4.175 atol = 1e-1
-        @test Phi[end] ≈ 2.76 atol = 1e-2
-        @test Phi[30] ≈ 3.67 atol = 1e-2
+        @test phi[1] ≈ 4.175 atol = 1e-1
+        @test phi[end] ≈ 2.76 atol = 1e-2
+        @test phi[30] ≈ 3.67 atol = 1e-2
         true
     end
 end