From b60014d2315f3cbdd0e087114821561796531bda Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Fri, 18 Oct 2024 21:56:36 +0200 Subject: [PATCH 1/6] a commit --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..b9334cc3ea --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "julia.environmentPath": "d:\\Ferrite.jl" +} \ No newline at end of file From 0d2903b83f3e9a4c64760e418abbb80f2401b492 Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Mon, 21 Oct 2024 14:10:21 +0200 Subject: [PATCH 2/6] commit from laptop --- .vscode/settings.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..f5742618cd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "julia.environmentPath": "c:\\IAM\\Ferrite.jl" +} \ No newline at end of file From ba463699f4918256f4a3030366edc9f30fb34d0e Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Tue, 22 Oct 2024 13:59:24 +0200 Subject: [PATCH 3/6] updated docs for evaluate_at_grid_nodes --- src/L2_projection.jl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/L2_projection.jl b/src/L2_projection.jl index 69717fc699..eb747bdd43 100644 --- a/src/L2_projection.jl +++ b/src/L2_projection.jl @@ -326,6 +326,13 @@ function assemble_proj_rhs!(f::Matrix, cellvalues::CellValues, sdh::SubDofHandle end end +""" + evaluate_at_grid_nodes(proj::L2Projector, vals::AbstractVector) +Return a vector of length `getnnodes(grid)` where the order corresponds with the node order +in the `grid` used to create `proj`. + +`vals` must have length `getnnodes(grid)`. +""" evaluate_at_grid_nodes(proj::L2Projector, vals::AbstractVector) = _evaluate_at_grid_nodes(proj, vals, Val(false)) From 8c4525b939ce1c6748a3fbe4accabe812c5bcb53 Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Wed, 30 Oct 2024 14:24:13 +0100 Subject: [PATCH 4/6] another commit --- .vscode/settings.json | 1 - src/L2_projection.jl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index f5742618cd..7a73a41bfd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,2 @@ { - "julia.environmentPath": "c:\\IAM\\Ferrite.jl" } \ No newline at end of file diff --git a/src/L2_projection.jl b/src/L2_projection.jl index eb747bdd43..31ed414a08 100644 --- a/src/L2_projection.jl +++ b/src/L2_projection.jl @@ -329,7 +329,7 @@ end """ evaluate_at_grid_nodes(proj::L2Projector, vals::AbstractVector) Return a vector of length `getnnodes(grid)` where the order corresponds with the node order -in the `grid` used to create `proj`. +in the `grid` used to create `proj`. `vals` must have length `getnnodes(grid)`. """ From 5ea22bc235c395f57b7a5da22d340ef246bd63d0 Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Wed, 30 Oct 2024 16:09:08 +0100 Subject: [PATCH 5/6] docs for evaluate_at_grid_nodes() and quadrature order --- src/Quadrature/quadrature.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Quadrature/quadrature.jl b/src/Quadrature/quadrature.jl index 27379bddfa..af6c708b43 100644 --- a/src/Quadrature/quadrature.jl +++ b/src/Quadrature/quadrature.jl @@ -15,8 +15,8 @@ using Base.Cartesian: @nloops, @ntuple, @nexprs QuadratureRule{shape}(weights::AbstractVector{T}, points::AbstractVector{Vec{rdim, T}}) Create a `QuadratureRule` used for integration on the refshape `shape` (of type [`AbstractRefShape`](@ref)). -`order` is the order of the quadrature rule. -`quad_rule_type` is an optional argument determining the type of quadrature rule, +`order` is related to the number of quadrature points per direction (i.e. a `QuadratureRule{RefQuadrilateral}(2)` +uses 2 quadrature points per direction). `quad_rule_type` is an optional argument determining the type of quadrature rule, currently the `:legendre` and `:lobatto` rules are implemented for hypercubes. For triangles up to order 8 the default rule is the one by `:dunavant` (see [Dun:1985:hde](@cite)) and for tetrahedra the default rule is `keast_minimal` (see [Keast:1986:mtq](@cite)). Wedges and pyramids default From 492e25c9d33d53d13765ace1f0cf005f4048a5ea Mon Sep 17 00:00:00 2001 From: Phil Kreutzheide Date: Wed, 30 Oct 2024 16:22:23 +0100 Subject: [PATCH 6/6] deleted .vsc/ --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index f5742618cd..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "julia.environmentPath": "c:\\IAM\\Ferrite.jl" -} \ No newline at end of file