Skip to content

Commit 4f3a9b2

Browse files
Fix AlJahdali 3S* methods for post-approval API drift
Rebasing SciML#3241 (approved months ago) over master exposed two breakages from unrelated drift, not merge conflicts: - thread::Thread = False() no longer resolves; the rest of the low-storage family moved to Serial() as the default. - SVector(...) was passed to LowStorageRK3SConstantCache, whose fields are NTuple; StaticArrays was never a runtime dependency, only a test one, so this never actually worked. Switched to plain tuples matching the sibling ParsaniKetcheson* constructors. Also Runic-reformats the added AlJahdali constructors (numeric literal style drifted from current convention); no other lines touched. Verified: all 16 methods solve, order-of-convergence matches each method's claimed order, and the full LowStorageRK Core suite passes (515 pass, 28 pre-existing broken, 0 fail).
1 parent 830b451 commit 4f3a9b2

2 files changed

Lines changed: 1020 additions & 1020 deletions

File tree

lib/OrdinaryDiffEqLowStorageRK/src/algorithms.jl

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,14 @@ Base.@kwdef struct AlJahdaliAdv3S42{StageLimiter, StepLimiter, Thread} <:
348348
OrdinaryDiffEqAlgorithm
349349
stage_limiter!::StageLimiter = trivial_limiter!
350350
step_limiter!::StepLimiter = trivial_limiter!
351-
thread::Thread = False()
351+
thread::Thread = Serial()
352352
end
353353
# for backwards compatibility
354354
function AlJahdaliAdv3S42(stage_limiter!, step_limiter! = trivial_limiter!)
355-
return AlJahdaliAdv3S42{typeof(stage_limiter!), typeof(step_limiter!), False}(
355+
return AlJahdaliAdv3S42{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
356356
stage_limiter!,
357357
step_limiter!,
358-
False()
358+
Serial()
359359
)
360360
end
361361

@@ -373,14 +373,14 @@ Base.@kwdef struct AlJahdaliAdv3S82{StageLimiter, StepLimiter, Thread} <:
373373
OrdinaryDiffEqAlgorithm
374374
stage_limiter!::StageLimiter = trivial_limiter!
375375
step_limiter!::StepLimiter = trivial_limiter!
376-
thread::Thread = False()
376+
thread::Thread = Serial()
377377
end
378378
# for backwards compatibility
379379
function AlJahdaliAdv3S82(stage_limiter!, step_limiter! = trivial_limiter!)
380-
return AlJahdaliAdv3S82{typeof(stage_limiter!), typeof(step_limiter!), False}(
380+
return AlJahdaliAdv3S82{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
381381
stage_limiter!,
382382
step_limiter!,
383-
False()
383+
Serial()
384384
)
385385
end
386386

@@ -398,14 +398,14 @@ Base.@kwdef struct AlJahdaliAdv3S53{StageLimiter, StepLimiter, Thread} <:
398398
OrdinaryDiffEqAlgorithm
399399
stage_limiter!::StageLimiter = trivial_limiter!
400400
step_limiter!::StepLimiter = trivial_limiter!
401-
thread::Thread = False()
401+
thread::Thread = Serial()
402402
end
403403
# for backwards compatibility
404404
function AlJahdaliAdv3S53(stage_limiter!, step_limiter! = trivial_limiter!)
405-
return AlJahdaliAdv3S53{typeof(stage_limiter!), typeof(step_limiter!), False}(
405+
return AlJahdaliAdv3S53{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
406406
stage_limiter!,
407407
step_limiter!,
408-
False()
408+
Serial()
409409
)
410410
end
411411

@@ -423,14 +423,14 @@ Base.@kwdef struct AlJahdaliAdv3S113{StageLimiter, StepLimiter, Thread} <:
423423
OrdinaryDiffEqAlgorithm
424424
stage_limiter!::StageLimiter = trivial_limiter!
425425
step_limiter!::StepLimiter = trivial_limiter!
426-
thread::Thread = False()
426+
thread::Thread = Serial()
427427
end
428428
# for backwards compatibility
429429
function AlJahdaliAdv3S113(stage_limiter!, step_limiter! = trivial_limiter!)
430-
return AlJahdaliAdv3S113{typeof(stage_limiter!), typeof(step_limiter!), False}(
430+
return AlJahdaliAdv3S113{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
431431
stage_limiter!,
432432
step_limiter!,
433-
False()
433+
Serial()
434434
)
435435
end
436436

@@ -448,14 +448,14 @@ Base.@kwdef struct AlJahdaliAdv3S64{StageLimiter, StepLimiter, Thread} <:
448448
OrdinaryDiffEqAlgorithm
449449
stage_limiter!::StageLimiter = trivial_limiter!
450450
step_limiter!::StepLimiter = trivial_limiter!
451-
thread::Thread = False()
451+
thread::Thread = Serial()
452452
end
453453
# for backwards compatibility
454454
function AlJahdaliAdv3S64(stage_limiter!, step_limiter! = trivial_limiter!)
455-
return AlJahdaliAdv3S64{typeof(stage_limiter!), typeof(step_limiter!), False}(
455+
return AlJahdaliAdv3S64{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
456456
stage_limiter!,
457457
step_limiter!,
458-
False()
458+
Serial()
459459
)
460460
end
461461

@@ -473,14 +473,14 @@ Base.@kwdef struct AlJahdaliAdv3S154{StageLimiter, StepLimiter, Thread} <:
473473
OrdinaryDiffEqAlgorithm
474474
stage_limiter!::StageLimiter = trivial_limiter!
475475
step_limiter!::StepLimiter = trivial_limiter!
476-
thread::Thread = False()
476+
thread::Thread = Serial()
477477
end
478478
# for backwards compatibility
479479
function AlJahdaliAdv3S154(stage_limiter!, step_limiter! = trivial_limiter!)
480-
return AlJahdaliAdv3S154{typeof(stage_limiter!), typeof(step_limiter!), False}(
480+
return AlJahdaliAdv3S154{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
481481
stage_limiter!,
482482
step_limiter!,
483-
False()
483+
Serial()
484484
)
485485
end
486486

@@ -498,14 +498,14 @@ Base.@kwdef struct AlJahdaliAdv3S85{StageLimiter, StepLimiter, Thread} <:
498498
OrdinaryDiffEqAlgorithm
499499
stage_limiter!::StageLimiter = trivial_limiter!
500500
step_limiter!::StepLimiter = trivial_limiter!
501-
thread::Thread = False()
501+
thread::Thread = Serial()
502502
end
503503
# for backwards compatibility
504504
function AlJahdaliAdv3S85(stage_limiter!, step_limiter! = trivial_limiter!)
505-
return AlJahdaliAdv3S85{typeof(stage_limiter!), typeof(step_limiter!), False}(
505+
return AlJahdaliAdv3S85{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
506506
stage_limiter!,
507507
step_limiter!,
508-
False()
508+
Serial()
509509
)
510510
end
511511

@@ -523,14 +523,14 @@ Base.@kwdef struct AlJahdaliAdv3S165{StageLimiter, StepLimiter, Thread} <:
523523
OrdinaryDiffEqAlgorithm
524524
stage_limiter!::StageLimiter = trivial_limiter!
525525
step_limiter!::StepLimiter = trivial_limiter!
526-
thread::Thread = False()
526+
thread::Thread = Serial()
527527
end
528528
# for backwards compatibility
529529
function AlJahdaliAdv3S165(stage_limiter!, step_limiter! = trivial_limiter!)
530-
return AlJahdaliAdv3S165{typeof(stage_limiter!), typeof(step_limiter!), False}(
530+
return AlJahdaliAdv3S165{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
531531
stage_limiter!,
532532
step_limiter!,
533-
False()
533+
Serial()
534534
)
535535
end
536536

@@ -550,14 +550,14 @@ Base.@kwdef struct AlJahdaliVor3S42{StageLimiter, StepLimiter, Thread} <:
550550
OrdinaryDiffEqAlgorithm
551551
stage_limiter!::StageLimiter = trivial_limiter!
552552
step_limiter!::StepLimiter = trivial_limiter!
553-
thread::Thread = False()
553+
thread::Thread = Serial()
554554
end
555555
# for backwards compatibility
556556
function AlJahdaliVor3S42(stage_limiter!, step_limiter! = trivial_limiter!)
557-
return AlJahdaliVor3S42{typeof(stage_limiter!), typeof(step_limiter!), False}(
557+
return AlJahdaliVor3S42{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
558558
stage_limiter!,
559559
step_limiter!,
560-
False()
560+
Serial()
561561
)
562562
end
563563

@@ -575,14 +575,14 @@ Base.@kwdef struct AlJahdaliVor3S82{StageLimiter, StepLimiter, Thread} <:
575575
OrdinaryDiffEqAlgorithm
576576
stage_limiter!::StageLimiter = trivial_limiter!
577577
step_limiter!::StepLimiter = trivial_limiter!
578-
thread::Thread = False()
578+
thread::Thread = Serial()
579579
end
580580
# for backwards compatibility
581581
function AlJahdaliVor3S82(stage_limiter!, step_limiter! = trivial_limiter!)
582-
return AlJahdaliVor3S82{typeof(stage_limiter!), typeof(step_limiter!), False}(
582+
return AlJahdaliVor3S82{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
583583
stage_limiter!,
584584
step_limiter!,
585-
False()
585+
Serial()
586586
)
587587
end
588588

@@ -600,14 +600,14 @@ Base.@kwdef struct AlJahdaliVor3S53{StageLimiter, StepLimiter, Thread} <:
600600
OrdinaryDiffEqAlgorithm
601601
stage_limiter!::StageLimiter = trivial_limiter!
602602
step_limiter!::StepLimiter = trivial_limiter!
603-
thread::Thread = False()
603+
thread::Thread = Serial()
604604
end
605605
# for backwards compatibility
606606
function AlJahdaliVor3S53(stage_limiter!, step_limiter! = trivial_limiter!)
607-
return AlJahdaliVor3S53{typeof(stage_limiter!), typeof(step_limiter!), False}(
607+
return AlJahdaliVor3S53{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
608608
stage_limiter!,
609609
step_limiter!,
610-
False()
610+
Serial()
611611
)
612612
end
613613

@@ -625,14 +625,14 @@ Base.@kwdef struct AlJahdaliVor3S113{StageLimiter, StepLimiter, Thread} <:
625625
OrdinaryDiffEqAlgorithm
626626
stage_limiter!::StageLimiter = trivial_limiter!
627627
step_limiter!::StepLimiter = trivial_limiter!
628-
thread::Thread = False()
628+
thread::Thread = Serial()
629629
end
630630
# for backwards compatibility
631631
function AlJahdaliVor3S113(stage_limiter!, step_limiter! = trivial_limiter!)
632-
return AlJahdaliVor3S113{typeof(stage_limiter!), typeof(step_limiter!), False}(
632+
return AlJahdaliVor3S113{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
633633
stage_limiter!,
634634
step_limiter!,
635-
False()
635+
Serial()
636636
)
637637
end
638638

@@ -650,14 +650,14 @@ Base.@kwdef struct AlJahdaliVor3S64{StageLimiter, StepLimiter, Thread} <:
650650
OrdinaryDiffEqAlgorithm
651651
stage_limiter!::StageLimiter = trivial_limiter!
652652
step_limiter!::StepLimiter = trivial_limiter!
653-
thread::Thread = False()
653+
thread::Thread = Serial()
654654
end
655655
# for backwards compatibility
656656
function AlJahdaliVor3S64(stage_limiter!, step_limiter! = trivial_limiter!)
657-
return AlJahdaliVor3S64{typeof(stage_limiter!), typeof(step_limiter!), False}(
657+
return AlJahdaliVor3S64{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
658658
stage_limiter!,
659659
step_limiter!,
660-
False()
660+
Serial()
661661
)
662662
end
663663

@@ -675,14 +675,14 @@ Base.@kwdef struct AlJahdaliVor3S154{StageLimiter, StepLimiter, Thread} <:
675675
OrdinaryDiffEqAlgorithm
676676
stage_limiter!::StageLimiter = trivial_limiter!
677677
step_limiter!::StepLimiter = trivial_limiter!
678-
thread::Thread = False()
678+
thread::Thread = Serial()
679679
end
680680
# for backwards compatibility
681681
function AlJahdaliVor3S154(stage_limiter!, step_limiter! = trivial_limiter!)
682-
return AlJahdaliVor3S154{typeof(stage_limiter!), typeof(step_limiter!), False}(
682+
return AlJahdaliVor3S154{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
683683
stage_limiter!,
684684
step_limiter!,
685-
False()
685+
Serial()
686686
)
687687
end
688688

@@ -700,14 +700,14 @@ Base.@kwdef struct AlJahdaliVor3S85{StageLimiter, StepLimiter, Thread} <:
700700
OrdinaryDiffEqAlgorithm
701701
stage_limiter!::StageLimiter = trivial_limiter!
702702
step_limiter!::StepLimiter = trivial_limiter!
703-
thread::Thread = False()
703+
thread::Thread = Serial()
704704
end
705705
# for backwards compatibility
706706
function AlJahdaliVor3S85(stage_limiter!, step_limiter! = trivial_limiter!)
707-
return AlJahdaliVor3S85{typeof(stage_limiter!), typeof(step_limiter!), False}(
707+
return AlJahdaliVor3S85{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
708708
stage_limiter!,
709709
step_limiter!,
710-
False()
710+
Serial()
711711
)
712712
end
713713

@@ -725,14 +725,14 @@ Base.@kwdef struct AlJahdaliVor3S165{StageLimiter, StepLimiter, Thread} <:
725725
OrdinaryDiffEqAlgorithm
726726
stage_limiter!::StageLimiter = trivial_limiter!
727727
step_limiter!::StepLimiter = trivial_limiter!
728-
thread::Thread = False()
728+
thread::Thread = Serial()
729729
end
730730
# for backwards compatibility
731731
function AlJahdaliVor3S165(stage_limiter!, step_limiter! = trivial_limiter!)
732-
return AlJahdaliVor3S165{typeof(stage_limiter!), typeof(step_limiter!), False}(
732+
return AlJahdaliVor3S165{typeof(stage_limiter!), typeof(step_limiter!), Serial}(
733733
stage_limiter!,
734734
step_limiter!,
735-
False()
735+
Serial()
736736
)
737737
end
738738

0 commit comments

Comments
 (0)