|
208 | 208 |
|
209 | 209 | @.. E₂ = chi2 * (2 * g₁ - Fg₂o3 - Tg₃o3) + chi3 * (2 * mg₁ + 5 * g₂o3 - Tg₃o3 + g₄) |
210 | 210 |
|
211 | | - @.. u = uprev + (fH01 + 2 * fH02) / 3 + W.dW * (mg₁ + Fg₂o3 + Tg₃o3) + |
212 | | - chi1 * (mg₁ + Fg₂o3 - g₃o3) + E₂ |
| 211 | + @.. u = uprev + (fH01 + 2 * fH02) / 3 + W.dW * (mg₁ + Fg₂o3 + Tg₃o3) + chi1 * (mg₁ + Fg₂o3 - g₃o3) + E₂ |
213 | 212 |
|
214 | 213 | if integrator.opts.adaptive |
215 | 214 | @.. E₁ = fH01 + fH02 |
|
250 | 249 | mg₁ = -g₁ |
251 | 250 | E₂ = @.. chi2 * (2 * g₁ - Fg₂o3 - Tg₃o3) + chi3 * (2 * mg₁ + 5 * g₂o3 - Tg₃o3 + g₄) |
252 | 251 |
|
253 | | - u = uprev + (fH01 + 2fH02)/3 + W.dW .* (mg₁ + Fg₂o3 + Tg₃o3) + |
254 | | - chi1 .* (mg₁ + Fg₂o3 - g₃o3) + E₂ |
| 252 | + u = uprev + (fH01 + 2fH02)/3 + W.dW .* (mg₁ + Fg₂o3 + Tg₃o3) + chi1 .* (mg₁ + Fg₂o3 - g₃o3) + E₂ |
255 | 253 | if integrator.opts.adaptive |
256 | 254 | E₁ = fH01 .+ fH02 |
257 | 255 |
|
@@ -348,18 +346,14 @@ end |
348 | 346 | g3 = integrator.g(H12, p, t+c13*dt) |
349 | 347 |
|
350 | 348 | H03 = uprev + dt*(a041*k1 + a042*k2 + a043*k3) + chi2 .* (b041*g1 + b042*g2 + b043*g3) |
351 | | - H13 = uprev + dt*(a141*k1 + a142*k2 + a143*k3) + |
352 | | - integrator.sqdt*(b141*g1 + b142*g2 + b143*g3) |
| 349 | + H13 = uprev + dt*(a141*k1 + a142*k2 + a143*k3) + integrator.sqdt*(b141*g1 + b142*g2 + b143*g3) |
353 | 350 |
|
354 | 351 | k4 = integrator.f(H03, p, t+c04*dt) |
355 | 352 | g4 = integrator.g(H13, p, t+c14*dt) |
356 | 353 |
|
357 | | - E₂ = chi2 .* (beta31*g1 + beta32*g2 + beta33*g3 + beta34*g4) + |
358 | | - chi3 .* (beta41*g1 + beta42*g2 + beta43*g3 + beta44*g4) |
| 354 | + E₂ = chi2 .* (beta31*g1 + beta32*g2 + beta33*g3 + beta34*g4) + chi3 .* (beta41*g1 + beta42*g2 + beta43*g3 + beta44*g4) |
359 | 355 |
|
360 | | - u = uprev + dt*(α1*k1 + α2*k2 + α3*k3 + α4*k4) + E₂ + |
361 | | - W.dW .* (beta11*g1 + beta12*g2 + beta13*g3 + beta14*g4) + |
362 | | - chi1 .* (beta21*g1 + beta22*g2 + beta23*g3 + beta24*g4) |
| 356 | + u = uprev + dt*(α1*k1 + α2*k2 + α3*k3 + α4*k4) + E₂ + W.dW .* (beta11*g1 + beta12*g2 + beta13*g3 + beta14*g4) + chi1 .* (beta21*g1 + beta22*g2 + beta23*g3 + beta24*g4) |
363 | 357 |
|
364 | 358 | E₁ = dt*(k1 + k2 + k3 + k4) |
365 | 359 |
|
|
430 | 424 | integrator.eigen_est = ϱu/ϱd |
431 | 425 | end |
432 | 426 |
|
433 | | - @.. E₂ = chi2*(beta31*g1 + beta32*g2 + beta33*g3 + beta34*g4) + |
434 | | - chi3*(beta41*g1 + beta42*g2 + beta43*g3 + beta44*g4) |
435 | | - @.. u = uprev + dt*(α1*k1 + α2*k2 + α3*k3 + α4*k4) + E₂ + |
436 | | - W.dW*(beta11*g1 + beta12*g2 + beta13*g3 + beta14*g4) + |
437 | | - chi1*(beta21*g1 + beta22*g2 + beta23*g3 + beta24*g4) |
| 427 | + @.. E₂ = chi2*(beta31*g1 + beta32*g2 + beta33*g3 + beta34*g4) + chi3*(beta41*g1 + beta42*g2 + beta43*g3 + beta44*g4) |
| 428 | + @.. u = uprev + dt*(α1*k1 + α2*k2 + α3*k3 + α4*k4) + E₂ + W.dW*(beta11*g1 + beta12*g2 + beta13*g3 + beta14*g4) + chi1*(beta21*g1 + beta22*g2 + beta23*g3 + beta24*g4) |
438 | 429 |
|
439 | 430 | if integrator.opts.adaptive |
440 | 431 | @.. E₁ = dt * (k1 + k2 + k3 + k4) |
|
0 commit comments