diff --git a/Manifest.toml b/Manifest.toml index 4fc2054..868e0d2 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.4" manifest_format = "2.0" -project_hash = "547bf31d5dc2e6452ad979d2c526bfa03b483ccd" +project_hash = "c5baf95d56bcbd0b5f45fff4568f32f131ca8958" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] @@ -25,9 +25,9 @@ version = "0.4.5" [[deps.Adapt]] deps = ["LinearAlgebra", "Requires"] -git-tree-sha1 = "e2a9873379849ce2ac9f9fa34b0e37bde5d5fe0a" +git-tree-sha1 = "cea4ac3f5b4bc4b3000aa55afb6e5626518948fa" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "4.0.2" +version = "4.0.3" weakdeps = ["StaticArrays"] [deps.Adapt.extensions] @@ -1142,9 +1142,9 @@ version = "1.2.13+0" [[deps.gmsh_jll]] deps = ["Artifacts", "Cairo_jll", "CompilerSupportLibraries_jll", "FLTK_jll", "FreeType2_jll", "GLU_jll", "GMP_jll", "HDF5_jll", "JLLWrappers", "JpegTurbo_jll", "LLVMOpenMP_jll", "Libdl", "Libglvnd_jll", "METIS_jll", "MMG_jll", "OCCT_jll", "Xorg_libX11_jll", "Xorg_libXext_jll", "Xorg_libXfixes_jll", "Xorg_libXft_jll", "Xorg_libXinerama_jll", "Xorg_libXrender_jll", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "f046de388d2a96c0b6ca108e8d0d9c4d44728423" +git-tree-sha1 = "d15409a4b9f1d14f1e1f9e910cd00f7d6695c261" uuid = "630162c2-fc9b-58b3-9910-8442a8a132e6" -version = "4.12.2+0" +version = "4.11.1+0" [[deps.libblastrampoline_jll]] deps = ["Artifacts", "Libdl"] diff --git a/Project.toml b/Project.toml index 1db192c..2f92e06 100644 --- a/Project.toml +++ b/Project.toml @@ -24,6 +24,7 @@ Profile = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" SparseMatricesCSR = "a0a7dd2c-ebf4-11e9-1f05-cf50bc540ca1" +gmsh_jll = "630162c2-fc9b-58b3-9910-8442a8a132e6" [compat] BSON = "0.3" diff --git a/src/Applications/expansion.jl b/src/Applications/expansion.jl index 08e2ab0..d5b2f20 100644 --- a/src/Applications/expansion.jl +++ b/src/Applications/expansion.jl @@ -11,7 +11,7 @@ function expansion(; info, t = _expansion(;title=title,path=path,mesh=mesh,kwargs...) else @assert backend ∈ [:sequential,:mpi] - @assert !isa(np,Nothing) + @assert !isnothing(np) np = isa(np,Int) ? (np,) : np if backend === :sequential info,t = with_debug() do distribute diff --git a/src/Solvers/li2019.jl b/src/Solvers/li2019.jl index 8c45720..eb1aee7 100644 --- a/src/Solvers/li2019.jl +++ b/src/Solvers/li2019.jl @@ -60,7 +60,7 @@ function li2019_Dj(dΩ,params) r = a_mhd_j_j(j,v_j,dΩ) + ∫((∇⋅j)⋅(∇⋅v_j))*dΩ for p in params_thin_wall τ,cw,jw,n_Γ,dΓ = p - r += a_thin_wall(x,dy,τ,cw,jw,n_Γ,dΓ) + r += a_thin_wall_j_j(j,v_j,τ,cw,jw,n_Γ,dΓ) end return r end diff --git a/test/seq/expansion_li2019_tests.jl b/test/seq/expansion_li2019_tests.jl deleted file mode 100644 index b8416ae..0000000 --- a/test/seq/expansion_li2019_tests.jl +++ /dev/null @@ -1,18 +0,0 @@ - -module ExpansionLi2019TestsSequential - -using GridapMHD: expansion -using SparseArrays - -solver = Dict( - :solver => :li2019, - :matrix_type => SparseMatrixCSC{Float64,Int64}, - :vector_type => Vector{Float64}, - :block_solvers => [:julia,:julia,:cg_jacobi,:cg_jacobi], - :petsc_options => "" -) - -expansion(np=1,backend=:sequential,solver=solver) -expansion(np=2,backend=:sequential,solver=solver) - -end # module diff --git a/test/seq/hunt_li2019_tests.jl b/test/seq/hunt_li2019_tests.jl deleted file mode 100644 index d22b729..0000000 --- a/test/seq/hunt_li2019_tests.jl +++ /dev/null @@ -1,38 +0,0 @@ -module HuntLi2019SequentialTests - -using GridapMHD: hunt -using SparseArrays - -solver = Dict( - :solver => :li2019, - :matrix_type => SparseMatrixCSC{Float64,Int64}, - :vector_type => Vector{Float64}, - :block_solvers => [:julia,:julia,:cg_jacobi,:cg_jacobi], - :petsc_options => "" -) - -hunt( - nc=(4,4), - np=(1,1), - backend=:sequential, - L=1.0, - B=(0.,50.,0.), - debug=false, - vtk=true, - title="hunt", - solver=solver, -) - -hunt( - nc=(4,4), - np=(2,2), - backend=:sequential, - L=1.0, - B=(0.,50.,0.), - debug=false, - vtk=true, - title="hunt", - solver=solver, -) - -end # module \ No newline at end of file diff --git a/test/seq/runtests.jl b/test/seq/runtests.jl index 3cb7456..3f14abf 100644 --- a/test/seq/runtests.jl +++ b/test/seq/runtests.jl @@ -8,10 +8,4 @@ using Test @time @testset "Cavity" begin include("cavity_tests.jl") end -@time @testset "Li2019" begin - include("cavity_li2019_tests.jl") - include("hunt_li2019_tests.jl") - include("expansion_li2019_tests.jl") -end - end # module