Skip to content

Commit

Permalink
* First brush strokes for a hierarchy of DistributedFESpaces
Browse files Browse the repository at this point in the history
* Developed ZeroMeanDistributedFESpace within this hierarchy.
* The old, unique DistributedFESpace is now called DistributedFESpaceFromLocalFESpaces
  (in the lack of a better name)
  • Loading branch information
amartinhuertas committed Sep 4, 2020
1 parent 11158c7 commit e92b9c3
Show file tree
Hide file tree
Showing 9 changed files with 434 additions and 195 deletions.
24 changes: 12 additions & 12 deletions Manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ version = "2.12.0"

[[ArrayLayouts]]
deps = ["FillArrays", "LinearAlgebra", "SparseArrays"]
git-tree-sha1 = "3aa7f96b1f5e5520d764b83e8ecda26800b7302f"
git-tree-sha1 = "e3e0a1e7dcbfdb1fc1061bfd889581a1d942cfcb"
uuid = "4c555306-a7a7-4459-81d9-ec55ddd5c99a"
version = "0.4.4"
version = "0.4.5"

[[BSON]]
git-tree-sha1 = "dd36d7cf3d185eeaaf64db902c15174b22f5dafb"
Expand Down Expand Up @@ -51,9 +51,9 @@ version = "0.3.0"

[[Compat]]
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
git-tree-sha1 = "083e7e5ec3ef443e9dcb6dd3fbcb815879823bfa"
git-tree-sha1 = "215f1c81cfd1c5416cd78740bff8ef59b24cd7c0"
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
version = "3.14.0"
version = "3.15.0"

[[CompilerSupportLibraries_jll]]
deps = ["Libdl", "Pkg"]
Expand Down Expand Up @@ -99,9 +99,9 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"

[[DocStringExtensions]]
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
git-tree-sha1 = "c5714d9bcdba66389612dc4c47ed827c64112997"
git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1"
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
version = "0.8.2"
version = "0.8.3"

[[FastGaussQuadrature]]
deps = ["LinearAlgebra", "SpecialFunctions"]
Expand All @@ -111,9 +111,9 @@ version = "0.4.2"

[[FileIO]]
deps = ["Pkg"]
git-tree-sha1 = "1e7e88a949b52e6f7f589041bd60928322414997"
git-tree-sha1 = "992b4aeb62f99b69fcf0cb2085094494cc05dfb3"
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
version = "1.4.1"
version = "1.4.3"

[[FillArrays]]
deps = ["LinearAlgebra", "Random", "SparseArrays"]
Expand All @@ -135,8 +135,8 @@ version = "0.10.12"

[[Gridap]]
deps = ["AbstractTrees", "BSON", "BlockArrays", "Combinatorics", "DocStringExtensions", "FastGaussQuadrature", "FileIO", "FillArrays", "ForwardDiff", "JLD2", "JSON", "LineSearches", "LinearAlgebra", "NLsolve", "QuadGK", "SparseArrays", "StaticArrays", "Test", "WriteVTK"]
git-tree-sha1 = "40c4f5bc6b034224872198b63f7e306e2320007b"
repo-rev = "master"
git-tree-sha1 = "7838554a8092b4e69042be94639f0276a55f3ecb"
repo-rev = "fe_space_with_dof_potentially_removed"
repo-url = "https://github.com/gridap/Gridap.jl"
uuid = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
version = "0.14.0"
Expand Down Expand Up @@ -304,9 +304,9 @@ version = "0.2.0"

[[Requires]]
deps = ["UUIDs"]
git-tree-sha1 = "d37400976e98018ee840e0ca4f9d20baa231dc6b"
git-tree-sha1 = "8c08d0c7812169e438a8478dae2a529377ad13f7"
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
version = "1.0.1"
version = "1.0.2"

[[SHA]]
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
Expand Down
1 change: 1 addition & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ version = "0.1.0"

[deps]
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
FillArrays = "1a297f60-69ca-5386-bcde-b61e274b549b"
Gridap = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
MPI = "da04e1cc-30fd-572f-bb4f-1f8673147195"
Expand Down
12 changes: 12 additions & 0 deletions src/DistributedFESpaceFactories.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
function Gridap.FESpace(::Type{V}; model::DistributedDiscreteModel,kwargs...) where V
constraint=Gridap.FESpaces._get_kwarg(:constraint,kwargs,nothing)
if constraint == nothing
DistributedFESpaceFromLocalFESpaces(V;model=model,kwargs...)
elseif constraint == :zeromean
dkwargs=Dict(kwargs)
delete!(dkwargs,:constraint)
ZeroMeanDistributedFESpace(V;model=model,dkwargs...)
else
@unreachable "Unknown constraint value $constraint"
end
end
Loading

0 comments on commit e92b9c3

Please sign in to comment.