Skip to content

Commit 9378160

Browse files
Merge pull request #5 from Shreyas-Ekanathan/upstream
update
2 parents 798fef8 + 2020765 commit 9378160

File tree

1 file changed

+11
-15
lines changed

1 file changed

+11
-15
lines changed

lib/OrdinaryDiffEqBDF/src/bdf_perform_step.jl

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,11 @@ end
4747
mass_matrix = f.mass_matrix
4848

4949
if mass_matrix === I
50-
nlsolver.tmp = @.. broadcast=false ((dtₙ * β₁) * fₙ₋₁ +
51-
(α₁ * uₙ₋₁ + α₂ * uₙ₋₂))/(dtₙ *
52-
β₀)
50+
nlsolver.tmp = @.. ((dtₙ * β₁) * fₙ₋₁ +
51+
(α₁ * uₙ₋₁ + α₂ * uₙ₋₂))/(dtₙ * β₀)
5352
else
54-
_tmp = mass_matrix * @.. broadcast=false (α₁ * uₙ₋₁+α₂ * uₙ₋₂)
55-
nlsolver.tmp = @.. broadcast=false ((dtₙ * β₁) * fₙ₋₁ + _tmp)/(dtₙ * β₀)
53+
_tmp = mass_matrix * @.. (α₁ * uₙ₋₁+α₂ * uₙ₋₂)
54+
nlsolver.tmp = @.. ((dtₙ * β₁) * fₙ₋₁ + _tmp)/(dtₙ * β₀)
5655
end
5756
nlsolver.γ = β₀
5857
nlsolver.α = α₀
@@ -772,17 +771,17 @@ function perform_step!(integrator, cache::QNDFConstantCache{max_order},
772771
u₀ = reshape(sum(D[:, 1:k], dims = 2) .+ uprev, size(u))
773772
ϕ = zero(u)
774773
for i in 1:k
775-
@.. broadcast=false ϕ+=γₖ[i] * D[:, i]
774+
ϕ = @.. ϕ + γₖ[i] * D[:, i]
776775
end
777776
end
778777
markfirststage!(nlsolver)
779778
nlsolver.z = u₀
780779
mass_matrix = f.mass_matrix
781780

782781
if mass_matrix === I
783-
nlsolver.tmp = @.. broadcast=false (u₀ / β₀ - ϕ)/dt
782+
nlsolver.tmp = @.. (u₀ / β₀ - ϕ)/dt
784783
else
785-
nlsolver.tmp = mass_matrix * @.. broadcast=false (u₀ / β₀ - ϕ)/dt
784+
nlsolver.tmp = mass_matrix * @.. (u₀ / β₀ - ϕ)/dt
786785
end
787786

788787
nlsolver.γ = β₀
@@ -1110,18 +1109,16 @@ function perform_step!(integrator, cache::FBDFConstantCache{max_order},
11101109
end
11111110
else
11121111
for i in 1:(k - 1)
1113-
@.. broadcast=false @views u_corrector[:, i] = $calc_Lagrange_interp(
1112+
@.. @views u_corrector[:, i] = $calc_Lagrange_interp(
11141113
k, weights,
11151114
equi_ts[i],
11161115
ts,
11171116
u_history,
1118-
u_corrector[:,
1119-
i])
1117+
u_corrector[:, i])
11201118
end
11211119
tmp = -uprev * bdf_coeffs[k, 2]
1122-
vc = _vec(tmp)
11231120
for i in 1:(k - 1)
1124-
@.. broadcast=false @views vc -= u_corrector[:, i] * bdf_coeffs[k, i + 2]
1121+
@views tmp = @.. tmp - u_corrector[:, i] * bdf_coeffs[k, i + 2]
11251122
end
11261123
end
11271124

@@ -1177,9 +1174,8 @@ function perform_step!(integrator, cache::FBDFConstantCache{max_order},
11771174
end
11781175
terk *= abs(dt^(k))
11791176
else
1180-
vc = _vec(terk)
11811177
for i in 2:(k + 1)
1182-
@.. broadcast=false @views vc += fd_weights[i, k + 1] * u_history[:, i - 1]
1178+
@views terk = @.. terk + fd_weights[i, k + 1] * u_history[:, i - 1]
11831179
end
11841180
terk *= abs(dt^(k))
11851181
end

0 commit comments

Comments
 (0)