Skip to content

Commit 889ec8f

Browse files
committed
Revert "Implementation of get_cellfield, get_derivative and get_derivatives functions for distributed transient cell fields"
This reverts commit 6ce000b.
1 parent 28b08d6 commit 889ec8f

3 files changed

Lines changed: 0 additions & 95 deletions

File tree

src/ODEs.jl

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -75,40 +75,13 @@ function ODEs.TransientCellField(f::DistributedCellField,derivatives::Tuple)
7575
DistributedCellField(fields,get_triangulation(f),f.metadata)
7676
end
7777

78-
function ODEs.TransientCellField(f::DistributedCellField,derivatives::AbstractArray)
79-
fields = map(local_views(f),local_views(derivatives)) do f, derivatives
80-
ODEs.TransientCellField(f,derivatives)
81-
end
82-
DistributedCellField(fields,get_triangulation(f),f.metadata)
83-
end
84-
8578
function ODEs.time_derivative(f::DistributedTransientSingleFieldCellField)
8679
fields = map(local_views(f)) do field
8780
ODEs.time_derivative(field)
8881
end
8982
DistributedCellField(fields,get_triangulation(f))
9083
end
9184

92-
function ODEs.get_cellfield(f::DistributedTransientSingleFieldCellField)
93-
cellfields = map(local_views(f)) do field
94-
ODEs.get_cellfield(field)
95-
end
96-
DistributedCellField(cellfields,get_triangulation(f))
97-
end
98-
99-
function ODEs.get_derivative(f::DistributedTransientSingleFieldCellField, k::Int)
100-
derivatives = map(local_views(f)) do field
101-
ODEs.get_derivative(field, k)
102-
end
103-
DistributedCellField(derivatives,get_triangulation(f))
104-
end
105-
106-
function ODEs.get_derivatives(f::DistributedTransientSingleFieldCellField)
107-
derivatives = map(local_views(f)) do field
108-
ODEs.get_derivatives(field)
109-
end
110-
end
111-
11285
# MultiField FESpace
11386

11487
function ODEs.has_transient(space::DistributedMultiFieldFESpace)
@@ -188,23 +161,3 @@ function ODEs.time_derivative(f::DistributedTransientMultiFieldCellField)
188161
part_fe_fun = map(ODEs.TransientMultiFieldCellField,fields)
189162
DistributedMultiFieldCellField(field_fe_fun,part_fe_fun)
190163
end
191-
192-
function ODEs.get_cellfield(f::DistributedTransientMultiFieldCellField)
193-
field_cellfield = map(ODEs.get_cellfield,f.field_fe_fun)
194-
cellfields = to_parray_of_arrays(map(local_views,field_cellfield))
195-
part_cellfields = map(MultiFieldCellField,cellfields)
196-
DistributedMultiFieldCellField(field_cellfield,part_cellfields)
197-
end
198-
199-
function ODEs.get_derivative(f::DistributedTransientMultiFieldCellField, k::Int)
200-
field_derivative = map(df -> ODEs.get_derivative(df, k), f.field_fe_fun)
201-
derivatives = to_parray_of_arrays(map(local_views,field_derivative))
202-
part_derivatives = map(MultiFieldCellField,derivatives)
203-
DistributedMultiFieldCellField(field_derivative,part_derivatives)
204-
end
205-
206-
function ODEs.get_derivatives(f::DistributedTransientMultiFieldCellField)
207-
derivatives = map(local_views(f)) do field
208-
ODEs.get_derivatives(field)
209-
end
210-
end

test/AutodiffTests.jl

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ using GridapDistributed
66
using PartitionedArrays
77
using SparseArrays
88
using ForwardDiff
9-
using Gridap.ODEs: TransientCellField, get_jacs
109

1110
function main_sf(distribute,parts)
1211
ranks = distribute(LinearIndices((prod(parts),)))
@@ -207,54 +206,11 @@ function skeleton_mf_different_fespace_trians(distribute,parts)
207206
end
208207
end
209208

210-
function main_transient_sf(distribute,parts)
211-
ranks = distribute(LinearIndices((prod(parts),)))
212-
213-
domain = (0,4,0,4)
214-
cells = (4,4)
215-
model = CartesianDiscreteModel(ranks,parts,domain,cells)
216-
217-
u((x,y),t) = (x+y)^k + 2*t
218-
u(t::Real) = x -> u(x,t)
219-
σ(∇u) = (1.0+∇u∇u)*∇u
220-
(∇du,∇u) = (2*∇u∇du)*∇u + (1.0+∇u∇u)*∇du
221-
f(t) = x -> ∂t(u)(t)(x) - divergence(y->σ((u(t),y)),x)
222-
223-
k = 1
224-
reffe = ReferenceFE(lagrangian,Float64,k)
225-
V = TestFESpace(model,reffe,dirichlet_tags="boundary")
226-
U = TransientTrialFESpace(V,u)
227-
228-
Ω = Triangulation(model)
229-
= Measure(Ω,2*k)
230-
r(t,u,v) = ( ∂t(u)v + (v)(u)) - v*f(t) )dΩ
231-
j_0(t,u,du,v) = ( (v)(dσ((du),(u))) )dΩ
232-
j_t(t,u,dut,v) = ( dutv )dΩ
233-
234-
op = TransientFEOperator(r,(j_0,j_t),U,V)
235-
op_AD = TransientFEOperator(r,U,V)
236-
237-
uh = interpolate(0.0,U(0.0))
238-
∂tuₕ = interpolate(0.0,U(0.0))
239-
uhₜ = TransientCellField(uh,(∂tuₕ,))
240-
241-
b = assemble_vector(v->r(1.0,uhₜ,v),V)
242-
A_0 = assemble_matrix((du,v)->j_0(1.0,uhₜ,du,v),U(1.0),V)
243-
A_t = assemble_matrix((dut,v)->j_t(1.0,uhₜ,dut,v),U(1.0),V)
244-
jac_0_AD = get_jacs(op_AD)[1]
245-
jac_t_AD = get_jacs(op_AD)[2]
246-
A_0_AD = assemble_matrix((du,v)->jac_0_AD(1.0,uhₜ,du,v),U(1.0),V)
247-
A_t_AD = assemble_matrix((dut,v)->jac_t_AD(1.0,uhₜ,dut,v),U(1.0),V)
248-
@test reduce(&,map(,partition(A_0),partition(A_0_AD)))
249-
@test reduce(&,map(,partition(A_t),partition(A_t_AD)))
250-
end
251-
252209
function main(distribute,parts)
253210
main_sf(distribute,parts)
254211
main_mf(distribute,parts)
255212
mf_different_fespace_trians(distribute,parts)
256213
skeleton_mf_different_fespace_trians(distribute,parts)
257-
main_transient_sf(distribute,parts)
258214
end
259215

260216
end

test/sequential/runtests.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,4 @@ end
4646
include("AdaptivityTests.jl")
4747
end
4848

49-
@time @testset "AutodiffTests" begin
50-
include("AutodiffTests.jl")
51-
end
52-
5349
end # module

0 commit comments

Comments
 (0)