Skip to content

Commit 21ee674

Browse files
authored
Merge pull request #92 from WIAS-PDELib/chmerdon/type_fixes
fixed type of result_kernels in some operators (needed for automatic differentiation)
2 parents e0da1c0 + cdd3d27 commit 21ee674

5 files changed

Lines changed: 17 additions & 4 deletions

File tree

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
**.png
2+
**.html
3+
**.js
4+
**.css
5+
**.json
6+
**.inv
7+
docs/build/
8+
Manifest.toml

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGES
22

3+
## v1.7.1
4+
5+
### Fixed
6+
- fixed type issues in LinearOperator and ItemIntegrator
7+
38
## v1.7.0
49

510
### Added

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "ExtendableFEM"
22
uuid = "a722555e-65e0-4074-a036-ca7ce79a4aed"
3-
version = "1.7.0"
3+
version = "1.7.1"
44
authors = ["Christian Merdon <merdon@wias-berlin.de>", "Patrick Jaap <patrick.jaap@wias-berlin.de>"]
55

66
[deps]

src/common_operators/item_integrator.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function build_assembler!(O::ItemIntegrator{Tv}, FE_args::Array{<:FEVectorBlock,
191191
function assembly_loop(b, sol::Array{<:FEVectorBlock, 1}, items, EG::ElementGeometries, QF::QuadratureRule, BE_args::Array{<:FEEvaluator, 1}, L2G::L2GTransformer, QPinfos::QPInfos)
192192

193193
## prepare parameters
194-
result_kernel = zeros(Tv, resultdim)
194+
result_kernel = zeros(eltype(b), resultdim)
195195
input_args = zeros(Tv, op_offsets_args[end])
196196
ndofs_args::Array{Int, 1} = [size(BE.cvals, 2) for BE in BE_args]
197197
weights, xref = QF.w, QF.xref

src/common_operators/linear_operator.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ function build_assembler!(b, O::LinearOperator{Tv}, FE_test, FE_args; time = 0.0
372372

373373
## prepare parameters
374374
input_args = zeros(Tv, op_offsets_args[end])
375-
result_kernel = zeros(Tv, op_offsets_test[end])
375+
result_kernel = zeros(T, op_offsets_test[end])
376376
offsets_test = [FE_test[j].offset for j in 1:length(FES_test)]
377377

378378
ndofs_test::Array{Int, 1} = [get_ndofs(AT, FE, EG) for FE in FETypes_test]
@@ -584,7 +584,7 @@ function build_assembler!(b, O::LinearOperator{Tv}, FE_test::Array{<:FEVectorBlo
584584
function assembly_loop(b::AbstractVector{T}, items, EG::ElementGeometries, QF::QuadratureRule, BE_test::Array{<:FEEvaluator, 1}, BE_test_vals::Array{Array{Tv, 3}, 1}, L2G::L2GTransformer, QPinfos::QPInfos) where {T}
585585

586586
## prepare parameters
587-
result_kernel = zeros(Tv, op_offsets_test[end])
587+
result_kernel = zeros(T, op_offsets_test[end])
588588
offsets_test = [FE_test[j].offset for j in 1:length(FES_test)]
589589

590590
ndofs_test::Array{Int, 1} = [get_ndofs(AT, FE, EG) for FE in FETypes_test]

0 commit comments

Comments
 (0)