Refactor Li2019 using new block tools from GridapSolvers

Manifest.toml

@@ -380,8 +380,8 @@ version = "1.3.1"
 
 [[deps.Gridap]]
 deps = ["AbstractTrees", "BSON", "BlockArrays", "Combinatorics", "DataStructures", "DocStringExtensions", "FastGaussQuadrature", "FileIO", "FillArrays", "ForwardDiff", "JLD2", "JSON", "LineSearches", "LinearAlgebra", "NLsolve", "NearestNeighbors", "PolynomialBases", "QuadGK", "Random", "SparseArrays", "SparseMatricesCSR", "StaticArrays", "Test", "WriteVTK"]
-git-tree-sha1 = "0ff991a6beee6cbe9e0804ef3cb368cbe4ed83ab"
-repo-rev = "master"
+git-tree-sha1 = "a4addd88d18248675d4f593d83c2d4d4a024b782"
+repo-rev = "bugfix-block-assembly"
 repo-url = "https://github.com/gridap/Gridap.jl.git"
 uuid = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
 version = "0.17.21"
@@ -418,7 +418,7 @@ version = "0.5.0"
 
 [[deps.GridapSolvers]]
 deps = ["AbstractTrees", "ArgParse", "BlockArrays", "FillArrays", "Gridap", "GridapDistributed", "GridapP4est", "GridapPETSc", "IterativeSolvers", "LinearAlgebra", "MPI", "P4est_wrapper", "PartitionedArrays", "Printf", "SparseArrays", "SparseMatricesCSR"]
-git-tree-sha1 = "e4808b9bfa48625c23c9f7a2494a108fb464e99c"
+git-tree-sha1 = "7855d11a9587008972aeb27e705c2cea54260cb0"
 repo-rev = "block-solvers"
 repo-url = "https://github.com/gridap/GridapSolvers.jl.git"
 uuid = "6d3209ee-5e3c-4db7-a716-942eb12ed534"

src/GridapMHD.jl

@@ -1,9 +1,5 @@
 module GridapMHD
 
-# using Profile
-# using FileIO
-# using MPI
-
 using Random
 using LinearAlgebra
 using SparseArrays
@@ -15,23 +11,15 @@ using BSON
 using DrWatson
 
 using Gridap
-using Gridap.Helpers
-using Gridap.Algebra
-using Gridap.CellData
-using Gridap.ReferenceFEs
-using Gridap.Geometry
-using Gridap.FESpaces
-using Gridap.MultiField
+using Gridap.Helpers, Gridap.Algebra, Gridap.CellData, Gridap.ReferenceFEs
+using Gridap.Geometry, Gridap.FESpaces, Gridap.MultiField
 
 using GridapDistributed
 using GridapGmsh
-
 using GridapPETSc
-using GridapPETSc.PETSC
 
 using GridapSolvers
-using GridapSolvers.LinearSolvers
-using GridapSolvers.LinearSolvers: allocate_in_domain, allocate_in_range
+using GridapSolvers.LinearSolvers, GridapSolvers.NonlinearSolvers, GridapSolvers.BlockSolvers
 
 using PartitionedArrays
 using PartitionedArrays: getany
@@ -40,12 +28,14 @@ using PartitionedArrays: getany
 include("Meshers/meshers.jl")
 
 # Solvers
-include("Li2019/Li2019.jl")
+include("Solvers/petsc.jl")
+include("Solvers/li2019.jl")
 
 # Main driver
 include("Fixes.jl")
 include("ExtraFunctions.jl")
 include("parameters.jl")
+include("weakforms.jl")
 include("Main.jl")
 
 # Applications