From cf1e086b31d51b67b142f50a78b083b780133555 Mon Sep 17 00:00:00 2001 From: "Alberto F. Martin" Date: Fri, 3 May 2024 21:24:14 +1000 Subject: [PATCH] Adjustments into LinearizedFESpaces.jl to the latest changes in GridapP4est.jl#main --- Manifest.toml | 44 +++++++++++++++++++-------------- src/LinearizedFESpaces.jl | 6 +++-- test/LinearizedFESpacesTests.jl | 2 +- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 7b6cc06..a81432d 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -2,7 +2,7 @@ julia_version = "1.9.1" manifest_format = "2.0" -project_hash = "3211ef80fdc2a2f6884783f8a902eccdd0433758" +project_hash = "dc7f8ef0ad963971c01d90a6c9f93300c4e2e589" [[deps.AbstractFFTs]] deps = ["LinearAlgebra"] @@ -240,9 +240,9 @@ uuid = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee" [[deps.FillArrays]] deps = ["LinearAlgebra"] -git-tree-sha1 = "bfe82a708416cf00b73a3198db0859c82f741558" +git-tree-sha1 = "57f08d5665e76397e96b168f9acc12ab17c84a68" uuid = "1a297f60-69ca-5386-bcde-b61e274b549b" -version = "1.10.0" +version = "1.10.2" [deps.FillArrays.extensions] FillArraysPDMatsExt = "PDMats" @@ -286,11 +286,11 @@ uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" [[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", "Statistics", "Test", "WriteVTK"] -git-tree-sha1 = "8061628fd79c97ec1977b9a6b09204cb55edd8ae" -repo-rev = "facet_integration_non_conforming_meshes" -repo-url = "https://github.com/gridap/Gridap.jl" +git-tree-sha1 = "b44376c080535eb26487faf5d105cc60b2f3f551" +repo-rev = "refined-discrete-models-linearized-fe-space" +repo-url = "https://github.com/gridap/Gridap.jl/" uuid = "56d4f2e9-7ea1-5844-9cf6-b9c51ca7ce8e" -version = "0.18.1" +version = "0.18.2" [[deps.GridapDistributed]] deps = ["BlockArrays", "FillArrays", "Gridap", "LinearAlgebra", "MPI", "PartitionedArrays", "SparseArrays", "SparseMatricesCSR", "WriteVTK"] @@ -306,9 +306,9 @@ version = "2.10.0+0" [[deps.IntelOpenMP_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl"] -git-tree-sha1 = "5fdf2fe6724d8caabf43b557b84ce53f3b7e2f6b" +git-tree-sha1 = "be50fe8df3acbffa0274a744f1a99d29c45a57f4" uuid = "1d5cc7b8-4909-519e-a0f8-d0f5ad9712d0" -version = "2024.0.2+0" +version = "2024.1.0+0" [[deps.InteractiveUtils]] deps = ["Markdown"] @@ -411,10 +411,10 @@ version = "0.3.27" uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" [[deps.MKL_jll]] -deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl"] -git-tree-sha1 = "72dc3cf284559eb8f53aa593fe62cb33f83ed0c0" +deps = ["Artifacts", "IntelOpenMP_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "oneTBB_jll"] +git-tree-sha1 = "80b2833b56d466b3858d565adcd16a4a05f2089b" uuid = "856f044c-d86e-5d09-b602-aeab76dc8ba7" -version = "2024.0.0+0" +version = "2024.1.0+0" [[deps.MPI]] deps = ["Distributed", "DocStringExtensions", "Libdl", "MPICH_jll", "MPIPreferences", "MPItrampoline_jll", "MicrosoftMPI_jll", "OpenMPI_jll", "PkgVersion", "PrecompileTools", "Requires", "Serialization", "Sockets"] @@ -432,21 +432,21 @@ version = "0.20.19" [[deps.MPICH_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "656036b9ed6f942d35e536e249600bc31d0f9df8" +git-tree-sha1 = "d8a7bf80c88326ebc98b7d38437208c3a0f20725" uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4" -version = "4.2.0+0" +version = "4.2.1+0" [[deps.MPIPreferences]] deps = ["Libdl", "Preferences"] -git-tree-sha1 = "8f6af051b9e8ec597fa09d8885ed79fd582f33c9" +git-tree-sha1 = "c105fe467859e7f6e9a852cb15cb4301126fac07" uuid = "3da0fdf6-3ccc-4f1b-acd9-58baa6c99267" -version = "0.1.10" +version = "0.1.11" [[deps.MPItrampoline_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "Hwloc_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] -git-tree-sha1 = "77c3bd69fdb024d75af38713e883d0f249ce19c2" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "MPIPreferences", "TOML"] +git-tree-sha1 = "3f884417b47a96d87e7c6219f8f7b30ce67f4f2c" uuid = "f1f71cc9-e9ae-5b93-9b94-4fe0e1ad3748" -version = "5.3.2+0" +version = "5.3.3+0" [[deps.MacroTools]] deps = ["Markdown", "Random"] @@ -788,6 +788,12 @@ deps = ["Artifacts", "Libdl"] uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" version = "1.48.0+0" +[[deps.oneTBB_jll]] +deps = ["Artifacts", "JLLWrappers", "Libdl"] +git-tree-sha1 = "7d0ea0f4895ef2f5cb83645fa689e52cb55cf493" +uuid = "1317d2d5-d96f-522e-a858-c73665f53c3e" +version = "2021.12.0+0" + [[deps.p7zip_jll]] deps = ["Artifacts", "Libdl"] uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" diff --git a/src/LinearizedFESpaces.jl b/src/LinearizedFESpaces.jl index 4a52742..a840a60 100644 --- a/src/LinearizedFESpaces.jl +++ b/src/LinearizedFESpaces.jl @@ -71,7 +71,9 @@ function _setup_one_level_refined_octree_model(model::OctreeDistributedDiscreteM fmodel.non_conforming_glue, model.coarse_model, model.ptr_pXest_connectivity, - pXest_copy(Val{Dc},fmodel.ptr_pXest), + pXest_copy(fmodel.pXest_type,fmodel.ptr_pXest), + fmodel.pXest_type, + fmodel.pXest_refinement_rule_type, false, fmodel) end @@ -90,7 +92,7 @@ function Gridap.LinearizedFESpace(model::OctreeDistributedDiscreteModel{Dc}, flags=Vector{Cint}(undef,local_length(indices)) flags.=refine_flag end - ref_model,glue=Gridap.adapt(ref_model,ref_coarse_flags) + ref_model,glue=Gridap.Adaptivity.adapt(ref_model,ref_coarse_flags) end adaptivity_glue=_create_adaptivity_glue(model,ref_model,num_refinements) one_level_ref_model=_setup_one_level_refined_octree_model(model,ref_model,adaptivity_glue) diff --git a/test/LinearizedFESpacesTests.jl b/test/LinearizedFESpacesTests.jl index 9907bd4..6a3a838 100644 --- a/test/LinearizedFESpacesTests.jl +++ b/test/LinearizedFESpacesTests.jl @@ -39,7 +39,7 @@ module LinearizedFESpacesTests end flags end - modelH,_=adapt(model,ref_coarse_flags) + modelH,_=Gridap.Adaptivity.adapt(model,ref_coarse_flags) for order in (2,4,8) degree = 2*order+1