Merge pull request #2800 from SciML/fix-formatter-line-splits

Fix formatting line splits following Catalyst.jl PR #1306

Author: ChrisRackauckas

benchmark/benchmarks.jl

@@ -174,8 +174,7 @@ function pollution!(dy, y, p, t)
     r24 = k24*y[19]*y[1]
     r25 = k25*y[20]
 
-    dy[1] = -r1-r10-r14-r23-r24 +
-            r2 + r3 + r9 + r11 + r12 + r22 + r25
+    dy[1] = -r1-r10-r14-r23-r24 + r2 + r3 + r9 + r11 + r12 + r22 + r25
     dy[2] = -r2-r3-r9-r12+r1+r21
     dy[3] = -r15+r1+r17+r19+r22
     dy[4] = -r2-r16-r17-r23+r15
@@ -253,15 +252,10 @@ function brusselator_2d!(du, u, p, t)
         jm1 = limit(i + 1, N), limit(i - 1, N), limit(j + 1, N), limit(j - 1, N)
 
         # u equation: ∂u/∂t = 1 + u²v - 4.4u + α∇²u + f(x,y,t)
-        du[i, j, 1] = α * (u[im1, j, 1] + u[ip1, j, 1] + u[i, jp1, 1] + u[i, jm1, 1] -
-                       4*u[i, j, 1]) +
-                      B + u[i, j, 1]^2 * u[i, j, 2] - (A + 1) * u[i, j, 1] +
-                      brusselator_f(x, y, t)
+        du[i, j, 1] = α * (u[im1, j, 1] + u[ip1, j, 1] + u[i, jp1, 1] + u[i, jm1, 1] - 4*u[i, j, 1]) + B + u[i, j, 1]^2 * u[i, j, 2] - (A + 1) * u[i, j, 1] + brusselator_f(x, y, t)
 
         # v equation: ∂v/∂t = 3.4u - u²v + α∇²v  
-        du[i, j, 2] = α * (u[im1, j, 2] + u[ip1, j, 2] + u[i, jp1, 2] + u[i, jm1, 2] -
-                       4*u[i, j, 2]) +
-                      A * u[i, j, 1] - u[i, j, 1]^2 * u[i, j, 2]
+        du[i, j, 2] = α * (u[im1, j, 2] + u[ip1, j, 2] + u[i, jp1, 2] + u[i, jm1, 2] - 4*u[i, j, 2]) + A * u[i, j, 1] - u[i, j, 1]^2 * u[i, j, 2]
     end
     nothing
 end

lib/OrdinaryDiffEqCore/src/dense/generic_dense.jl

@@ -1305,10 +1305,7 @@ end
                       Θ * (6 * dt * k[1][idxs] + 6 * dt * k[2][idxs] + 12 * y₀[idxs] -
                        12 * y₁[idxs]) + 6 * y₁[idxs]) / (dt * dt)
     else
-        @views out = differential_vars .*
-                     (-4 * dt * k[1][idxs] - 2 * dt * k[2][idxs] - 6 * y₀[idxs] +
-                      Θ * (6 * dt * k[1][idxs] + 6 * dt * k[2][idxs] + 12 * y₀[idxs] -
-                       12 * y₁[idxs]) + 6 * y₁[idxs]) / (dt * dt)
+        @views out = differential_vars .* (-4 * dt * k[1][idxs] - 2 * dt * k[2][idxs] - 6 * y₀[idxs] + Θ * (6 * dt * k[1][idxs] + 6 * dt * k[2][idxs] + 12 * y₀[idxs] - 12 * y₁[idxs]) + 6 * y₁[idxs]) / (dt * dt)
     end
     out
 end
@@ -1410,10 +1407,7 @@ end
                       12 * y₁[idxs]) /
                      (dt * dt * dt)
     else
-        @views out = differential_vars .*
-                     (6 * dt * k[1][idxs] + 6 * dt * k[2][idxs] + 12 * y₀[idxs] -
-                      12 * y₁[idxs]) /
-                     (dt * dt * dt)
+        @views out = differential_vars .* (6 * dt * k[1][idxs] + 6 * dt * k[2][idxs] + 12 * y₀[idxs] - 12 * y₁[idxs]) / (dt * dt * dt)
     end
     out
 end

lib/OrdinaryDiffEqIMEXMultistep/src/imex_multistep_perform_step.jl

@@ -3,8 +3,7 @@
 function initialize!(integrator, cache::CNAB2ConstantCache)
     integrator.kshortsize = 2
     integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)
-    integrator.fsalfirst = integrator.f.f1(integrator.uprev, integrator.p, integrator.t) +
-                           integrator.f.f2(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal
+    integrator.fsalfirst = integrator.f.f1(integrator.uprev, integrator.p, integrator.t) + integrator.f.f2(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal
     OrdinaryDiffEqCore.increment_nf!(integrator.stats, 1)
     integrator.stats.nf2 += 1
 
@@ -103,8 +102,7 @@ end
 function initialize!(integrator, cache::CNLF2ConstantCache)
     integrator.kshortsize = 2
     integrator.k = typeof(integrator.k)(undef, integrator.kshortsize)
-    integrator.fsalfirst = integrator.f.f1(integrator.uprev, integrator.p, integrator.t) +
-                           integrator.f.f2(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal
+    integrator.fsalfirst = integrator.f.f1(integrator.uprev, integrator.p, integrator.t) + integrator.f.f2(integrator.uprev, integrator.p, integrator.t) # Pre-start fsal
     OrdinaryDiffEqCore.increment_nf!(integrator.stats, 1)
     integrator.stats.nf2 += 1
 

lib/OrdinaryDiffEqRosenbrock/src/rosenbrock_perform_step.jl

@@ -383,8 +383,7 @@ end
 
         if mass_matrix !== I
             invatol = inv(integrator.opts.abstol)
-            atmp = ifelse(integrator.differential_vars, false, integrator.fsallast) .*
-                   invatol
+            atmp = ifelse(integrator.differential_vars, false, integrator.fsallast) .* invatol
             integrator.EEst += integrator.opts.internalnorm(atmp, t)
         end
     end

lib/OrdinaryDiffEqStabilizedIRK/src/irkc_perform_step.jl

@@ -84,9 +84,7 @@ function perform_step!(integrator, cache::IRKCConstantCache, repeat_step = false
         f2ⱼ₋₁ = f2(gprev, p, t + Cⱼ₋₁ * dt)
         OrdinaryDiffEqCore.increment_nf!(integrator.stats, 1)
         integrator.stats.nf2 += 1
-        nlsolver.tmp = (1 - μ - ν) * uprev + μ * gprev + ν * gprev2 + dt * μs * f2ⱼ₋₁ +
-                       dt * νs * du₂ + (νs - (1 - μ - ν) * μs₁) * dt * du₁ -
-                       ν * μs₁ * dt * f1ⱼ₋₂
+        nlsolver.tmp = (1 - μ - ν) * uprev + μ * gprev + ν * gprev2 + dt * μs * f2ⱼ₋₁ + dt * νs * du₂ + (νs - (1 - μ - ν) * μs₁) * dt * du₁ - ν * μs₁ * dt * f1ⱼ₋₂
         nlsolver.z = dt * f1ⱼ₋₁
         nlsolver.c = Cⱼ
         z = nlsolve!(nlsolver, integrator, cache, false)
@@ -216,10 +214,7 @@ function perform_step!(integrator, cache::IRKCCache, repeat_step = false)
         f2(f2ⱼ₋₁, gprev, p, t + Cⱼ₋₁ * dt)
         OrdinaryDiffEqCore.increment_nf!(integrator.stats, 1)
         integrator.stats.nf2 += 1
-        @.. broadcast=false nlsolver.tmp=(1 - μ - ν) * uprev + μ * gprev + ν * gprev2 +
-                                         dt * μs * f2ⱼ₋₁ + dt * νs * du₂ +
-                                         (νs - (1 - μ - ν) * μs₁) * dt * du₁ -
-                                         ν * μs₁ * dt * f1ⱼ₋₂
+        @.. broadcast=false nlsolver.tmp=(1 - μ - ν) * uprev + μ * gprev + ν * gprev2 + dt * μs * f2ⱼ₋₁ + dt * νs * du₂ + (νs - (1 - μ - ν) * μs₁) * dt * du₁ - ν * μs₁ * dt * f1ⱼ₋₂
         @.. broadcast=false nlsolver.z=dt * f1ⱼ₋₁
         nlsolver.c = Cⱼ
 
@@ -252,8 +247,7 @@ function perform_step!(integrator, cache::IRKCCache, repeat_step = false)
     # error estimate
     if isnewton(nlsolver) && integrator.opts.adaptive
         update_W!(integrator, cache, dt, false)
-        @.. broadcast=false gprev=dt * 0.5 * (du₂ - f2ⱼ₋₁) +
-                                  dt * (0.5 - μs₁) * (du₁ - f1ⱼ₋₁)
+        @.. broadcast=false gprev=dt * 0.5 * (du₂ - f2ⱼ₋₁) + dt * (0.5 - μs₁) * (du₁ - f1ⱼ₋₁)
 
         linsolve = nlsolver.cache.linsolve
         linres = dolinsolve(integrator, linsolve; b = _vec(gprev), linu = _vec(tmp))

test/interface/utility_tests.jl

@@ -58,8 +58,7 @@ end
     fun1_ip = ODEFunction(_f_ip; mass_matrix = mm)
     fun2_ip = ODEFunction(_f_ip; mass_matrix = mm,
         jac_prototype = MatrixOperator(similar(A);
-            update_func! = (J, u, p, t) -> J .= t .*
-                                                A))
+            update_func! = (J, u, p, t) -> J .= t .* A))
 
     for Alg in [ImplicitEuler, Rosenbrock23, Rodas5]
         println(Alg)

test/modelingtoolkit/preconditioners.jl

@@ -20,13 +20,8 @@ function brusselator_2d_loop(du, u, p, t)
         x, y = xyd_brusselator[I[1]], xyd_brusselator[I[2]]
         ip1, im1, jp1, jm1 = limit(i + 1, N), limit(i - 1, N), limit(j + 1, N),
         limit(j - 1, N)
-        du[i, j, 1] = alpha * (u[im1, j, 1] + u[ip1, j, 1] + u[i, jp1, 1] + u[i, jm1, 1] -
-                       4u[i, j, 1]) +
-                      B + u[i, j, 1]^2 * u[i, j, 2] - (A + 1) * u[i, j, 1] +
-                      brusselator_f(x, y, t)
-        du[i, j, 2] = alpha * (u[im1, j, 2] + u[ip1, j, 2] + u[i, jp1, 2] + u[i, jm1, 2] -
-                       4u[i, j, 2]) +
-                      A * u[i, j, 1] - u[i, j, 1]^2 * u[i, j, 2]
+        du[i, j, 1] = alpha * (u[im1, j, 1] + u[ip1, j, 1] + u[i, jp1, 1] + u[i, jm1, 1] - 4u[i, j, 1]) + B + u[i, j, 1]^2 * u[i, j, 2] - (A + 1) * u[i, j, 1] + brusselator_f(x, y, t)
+        du[i, j, 2] = alpha * (u[im1, j, 2] + u[ip1, j, 2] + u[i, jp1, 2] + u[i, jm1, 2] - 4u[i, j, 2]) + A * u[i, j, 1] - u[i, j, 1]^2 * u[i, j, 2]
     end
     nothing
 end