dirt_granular 0.1.4

Granular physics for DIRT: Hertz normal contact, Mindlin tangential friction, rotational dynamics
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
use super::*;

#[test]
fn hooke_and_hertz_publish_the_same_typed_contact_seam() {
    for model in ["hertz", "hooke"] {
        let mut app = App::new();
        app.add_resource(soil_core::Config::from_str(&format!(
            "[dem]\ncontact_model = \"{model}\""
        )));
        app.add_resource(grass_scheduler::CurrentState(
            soil_core::CommState::FullRebuild,
        ));
        app.add_resource(soil_core::RunState::new());
        app.add_resource(Neighbor::default());
        app.add_plugins(dirt_atom::DemAtomPlugin);
        app.add_plugins(HertzMindlinContactPlugin);
        app.add_update_system(
            contact_seam_consumer.requires(CONTACT_FORCE),
            ParticleSimScheduleSet::Force,
        );
        app.organize_systems();
    }
}

fn contact_seam_consumer() {}
use dirt_atom::DemAtom;
use dirt_atom::{Adhesion, Elastic, Friction, Material, Rolling, Twisting};
use dirt_test_utils::{make_material_table, push_dem_test_atom, ParticleFixture, ParticleSpec};
use soil_core::Neighbor;
use soil_core::{Atom, AtomDataRegistry};

fn push_test_atom_with_history(
    atom: &mut Atom,
    dem: &mut DemAtom,
    history: &mut ContactHistoryStore,
    tag: u32,
    pos: [f64; 3],
    radius: f64,
) {
    push_dem_test_atom(atom, dem, tag, pos, radius);
    history.contacts.push(Vec::new());
}

/// Step 4 correctness: the interior/boundary two-pass force (Interior pass for
/// local-local pairs while the halo is in flight, Boundary pass for ghost pairs
/// after they land) must equal the single All pass — bit-for-bit.
#[test]
fn interior_boundary_split_matches_single_pass() {
    let r = 0.001;
    let build = || {
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        // atom 0 (local) overlaps atom 1 (local -> interior pair) and atom 2
        // (ghost -> boundary pair).
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], r);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [1.5 * r, 0.0, 0.0], r);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 2, [0.0, 1.5 * r, 0.0], r);
        atom.nlocal = 2;
        atom.natoms = 3;
        // Half neighbour list (newton): atom 0 -> {1 (local), 2 (ghost)}.
        let mut nb = Neighbor::new();
        nb.neighbor_offsets = vec![0, 2, 2, 2];
        nb.neighbor_indices = vec![1, 2];
        let mut reg = AtomDataRegistry::new();
        reg.try_register(dem, atom.len()).unwrap();
        reg.try_register(hist, atom.len()).unwrap();
        (atom, nb, reg)
    };
    let mt = make_material_table();

    let (mut a_all, nb, r_all) = build();
    contact_force_core(&mut a_all, &nb, &r_all, &mt, None, ForcePass::All);

    let (mut a_split, _nb, r_split) = build();
    contact_force_core(&mut a_split, &nb, &r_split, &mt, None, ForcePass::Interior);
    contact_force_core(&mut a_split, &nb, &r_split, &mt, None, ForcePass::Boundary);

    let mut max_diff = 0.0f64;
    for i in 0..3 {
        for d in 0..3 {
            max_diff = max_diff.max((a_all.force[i][d] as f64 - a_split.force[i][d] as f64).abs());
        }
    }
    assert!(
        max_diff < 1e-15,
        "interior+boundary != all: max force diff = {max_diff:.3e}"
    );
    // Sanity: the contact actually produced a non-trivial force.
    assert!(a_all.force[0][0].abs() as f64 + a_all.force[0][1].abs() as f64 > 0.0);
}

#[test]
fn fused_contact_repulsive_for_overlap() {
    let radius = 0.001;
    let mut fixture = ParticleFixture::pair(
        ParticleSpec::new(0, [0.0, 0.0, 0.0], radius),
        ParticleSpec::new(1, [0.0019, 0.0, 0.0], radius),
    )
    .build();
    let mut hist = ContactHistoryStore::new();
    hist.contacts.resize_with(fixture.atom.len(), Vec::new);
    fixture.register_atom_data(hist);
    let mut app = fixture.into_app();
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    assert!(
        atom.force[0][0] < 0.0,
        "particle 0 should have negative x force"
    );
    assert!(
        atom.force[1][0] > 0.0,
        "particle 1 should have positive x force"
    );
    assert!((atom.force[0][0] + atom.force[1][0]).abs() < 1e-10);
}

#[test]
fn fused_contact_tangential_with_sliding() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    atom.vel[1][1] = 0.1;
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    // Normal force present
    assert!(atom.force[0][0] < 0.0, "normal force on atom 0");
    assert!(atom.force[1][0] > 0.0, "normal force on atom 1");
    // Tangential force present
    assert!(atom.force[0][1].abs() > 0.0, "tangential force on atom 0");
    assert!(
        (atom.force[0][1] + atom.force[1][1]).abs() < 1e-10,
        "tangential forces equal and opposite"
    );
    // Torque present (stored in DemAtom via registry)
    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    let t_mag =
        (dem.torque[0][0].powi(2) + dem.torque[0][1].powi(2) + dem.torque[0][2].powi(2)).sqrt();
    assert!(t_mag > 0.0, "torque on atom 0");
}

/// The `linear_nohistory` tangential model must keep the tangential spring
/// displacement identically zero (velocity-Coulomb, LAMMPS `pair_granular`
/// `tangential linear_nohistory`), while the default `history` (Mindlin) model
/// accumulates it. Both are driven with the same sub-Coulomb tangential slip.
#[test]
fn linear_nohistory_has_no_spring_accumulation() {
    let radius = 0.001;
    let build = || {
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(
            &mut atom,
            &mut dem,
            &mut hist,
            1,
            [0.00185, 0.0, 0.0],
            radius,
        );
        atom.vel[1][1] = 0.001; // small tangential slip, below the Coulomb cap
        atom.nlocal = 2;
        atom.natoms = 2;
        let mut nb = Neighbor::new();
        nb.neighbor_offsets = vec![0, 1, 1];
        nb.neighbor_indices = vec![1];
        let mut reg = AtomDataRegistry::new();
        reg.try_register(dem, atom.len()).unwrap();
        reg.try_register(hist, atom.len()).unwrap();
        (atom, nb, reg)
    };
    let spring_mag = |reg: &AtomDataRegistry| -> f64 {
        let h = reg.expect::<ContactHistoryStore>("spring");
        let s = h.contacts[0]
            .iter()
            .find(|(t, _, _)| *t == 1)
            .map(|(_, s, _)| *s)
            .unwrap_or([0.0; CONTACT_HISTORY_LEN]);
        (s[0] * s[0] + s[1] * s[1] + s[2] * s[2]).sqrt()
    };

    // History (Mindlin): the tangential spring accumulates over the contact.
    let mut mt_h = make_material_table();
    mt_h.tangential_model = "history".to_string();
    let (mut a, nb, reg) = build();
    for _ in 0..20 {
        a.force[0] = [0.0; 3];
        a.force[1] = [0.0; 3];
        contact_force_core(&mut a, &nb, &reg, &mt_h, None, ForcePass::All);
    }
    let xi_history = spring_mag(&reg);
    assert!(
        xi_history > 0.0,
        "history model must accumulate spring, got {xi_history:e}"
    );

    // linear_nohistory: spring stays exactly zero; force is still present.
    let mut mt_nh = make_material_table();
    mt_nh.tangential_model = "linear_nohistory".to_string();
    let (mut a2, nb2, reg2) = build();
    for _ in 0..20 {
        a2.force[0] = [0.0; 3];
        a2.force[1] = [0.0; 3];
        contact_force_core(&mut a2, &nb2, &reg2, &mt_nh, None, ForcePass::All);
    }
    let xi_nohistory = spring_mag(&reg2);
    assert_eq!(
        xi_nohistory, 0.0,
        "linear_nohistory must not accumulate spring"
    );
    assert!(
        (a2.force[0][1] as f64).abs() > 0.0,
        "linear_nohistory must still produce a tangential (velocity-Coulomb) force"
    );
}

#[test]
fn fused_contact_no_force_for_gap() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [0.003, 0.0, 0.0], radius);
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    assert!(atom.force[0][0].abs() < 1e-20);
    assert!(atom.force[1][0].abs() < 1e-20);
}

fn make_material_table_cohesion() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                ..Friction::default()
            })
            .with_adhesion(Adhesion::Sjkr { energy: 1e9 }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

fn make_material_table_rolling() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95)).with_friction(Friction {
            sliding: 0.4,
            rolling: 0.3,
            twisting: 0.0,
        }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

#[test]
fn cohesion_produces_attractive_force() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    // Very small overlap with high cohesion energy → cohesion dominates
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.00199999, 0.0, 0.0],
        radius, // delta = 1e-8 (tiny overlap)
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_cohesion());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    // With cohesion and small overlap, normal force on atom 0 should be positive (attractive toward atom 1)
    assert!(
        atom.force[0][0] > 0.0,
        "cohesion should make force attractive on atom 0, got {}",
        atom.force[0][0]
    );
    // Newton's 3rd law
    assert!(
        (atom.force[0][0] + atom.force[1][0]).abs() < 1e-10,
        "forces should be equal and opposite"
    );
}

#[test]
fn zero_cohesion_matches_original() {
    // Two identical setups — one with default table, one with explicit 0.0 cohesion
    let radius = 0.001;
    let sep = 0.0019;

    let run = |mt: MaterialTable| -> [f64; 3] {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
        atom.nlocal = 2;
        atom.natoms = 2;
        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];
        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();
        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(mt);
        app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();
        let atom = app.get_resource_ref::<Atom>().unwrap();
        [
            atom.force[0][0] as f64,
            atom.force[0][1] as f64,
            atom.force[0][2] as f64,
        ]
    };

    let f_default = run(make_material_table());
    let mut mt_zero = MaterialTable::new();
    mt_zero
        .add(
            Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95)).with_friction(Friction {
                sliding: 0.4,
                ..Friction::default()
            }),
        )
        .unwrap();
    mt_zero.build_pair_tables();
    let f_zero = run(mt_zero);

    for d in 0..3 {
        assert!(
            (f_default[d] - f_zero[d]).abs() < 1e-15,
            "zero params should reproduce original, dim {} default={} zero={}",
            d,
            f_default[d],
            f_zero[d]
        );
    }
}

fn make_material_table_jkr() -> MaterialTable {
    let mut mt = MaterialTable::new();
    // Use high surface energy (1.0 J/m²) so adhesion clearly dominates at small overlaps
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                ..Friction::default()
            })
            .with_adhesion(Adhesion::SurfaceEnergy { energy: 1.0 }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

#[test]
fn jkr_pulloff_force_matches_theory() {
    // Test in adhesion-only regime (gap, not overlap) where force = -F_adhesion exactly
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    let gamma = 1.0;
    let r_eff = radius / 2.0;

    // Place particles with a tiny gap (adhesion-only regime)
    let gap = 1e-9;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [2.0 * radius + gap, 0.0, 0.0],
        radius,
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    let mt = make_material_table_jkr();
    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    let expected_pulloff = 1.5 * std::f64::consts::PI * gamma * r_eff;
    // In adhesion-only regime, force should be exactly -F_adhesion
    // Force on atom 0 should be positive (attracted toward atom 1)
    assert!(
        atom.force[0][0] > 0.0,
        "JKR should produce attractive force, got {}",
        atom.force[0][0]
    );
    // f_n_mag = -F_adhesion, force[0] -= f_n_mag * nx → force[0] += F_adhesion
    let f_mag = atom.force[0][0] as f64;
    assert!(
        (f_mag - expected_pulloff).abs() / expected_pulloff < 1e-6,
        "pull-off force should match theory {}, got {}",
        expected_pulloff,
        f_mag
    );
}

#[test]
fn jkr_adhesion_only_regime() {
    // Two particles with a small gap (no geometric overlap) but within JKR range
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    // Gap of 1e-9 (very small, within JKR pull-off distance for gamma=1.0)
    let gap = 1e-9;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [2.0 * radius + gap, 0.0, 0.0],
        radius,
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_jkr());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    // Should be attractive (atom 0 pulled toward atom 1 = positive x)
    assert!(
        atom.force[0][0] > 0.0,
        "JKR adhesion-only should attract, got {}",
        atom.force[0][0]
    );
    // Newton's 3rd law
    assert!(
        (atom.force[0][0] + atom.force[1][0]).abs() < 1e-10,
        "forces should be equal and opposite"
    );
}

#[test]
fn jkr_no_interaction_beyond_pulloff() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    // Large gap — well beyond JKR pull-off distance
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.003, 0.0, 0.0],
        radius, // gap = 0.001 >> delta_pulloff
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_jkr());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    assert!(
        atom.force[0][0].abs() < 1e-20,
        "no force beyond pull-off distance"
    );
}

fn make_material_table_hooke() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.add(
        Material::new(
            "glass",
            Elastic::new(8.7e9, 0.3, 0.95).with_hooke_stiffness(1e6, 5e5),
        )
        .with_friction(Friction {
            sliding: 0.4,
            ..Friction::default()
        }),
    )
    .unwrap();
    mt.contact_model = "hooke".to_string();
    mt.build_pair_tables();
    mt
}

fn make_material_table_twisting() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95)).with_friction(Friction {
            sliding: 0.4,
            rolling: 0.0,
            twisting: 0.05,
        }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

#[test]
fn hooke_force_linear_in_delta() {
    let radius = 0.001;
    let run = |sep: f64| -> f64 {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
        atom.nlocal = 2;
        atom.natoms = 2;
        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];
        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();
        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(make_material_table_hooke());
        app.add_update_system(hooke_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();
        let atom = app.get_resource_ref::<Atom>().unwrap();
        atom.force[0][0] as f64
    };

    // delta1 = 2*r - sep1, delta2 = 2*r - sep2
    let sep1 = 0.00195; // delta = 0.00005
    let sep2 = 0.0019; // delta = 0.0001
    let f1 = run(sep1);
    let f2 = run(sep2);

    // Hooke: force proportional to delta → f2/f1 ≈ 2.0 (linear)
    let ratio = f2 / f1;
    assert!(
        (ratio - 2.0).abs() < 0.15,
        "Hooke force should be linear in delta, got ratio {} (expected ~2.0)",
        ratio
    );
}

#[test]
fn hooke_no_force_beyond_contact() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [0.003, 0.0, 0.0], radius);
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_hooke());
    app.add_update_system(hooke_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    assert!(
        atom.force[0][0].abs() < 1e-20,
        "no force beyond contact distance"
    );
}

#[test]
fn twisting_friction_opposes_spin() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    // Spin about contact normal (x-axis)
    dem.omega[0] = [100.0, 0.0, 0.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_twisting());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // Twisting torque on atom 0 should oppose its spin about x (negative x torque)
    assert!(
        dem.torque[0][0] < 0.0,
        "twisting torque should oppose omega_x, got {}",
        dem.torque[0][0]
    );
}

#[test]
fn twisting_friction_zero_when_no_spin() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    // No angular velocity at all
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_twisting());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // No twisting torque when there's no angular velocity
    let torque_mag =
        (dem.torque[0][0].powi(2) + dem.torque[0][1].powi(2) + dem.torque[0][2].powi(2)).sqrt();
    assert!(
        torque_mag < 1e-20,
        "no twisting torque when no spin, got {}",
        torque_mag
    );
}

#[test]
fn rolling_resistance_opposes_angular_velocity() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    // Give atom 0 a rolling angular velocity (around y-axis — perpendicular to contact normal x)
    dem.omega[0] = [0.0, 100.0, 0.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_rolling());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // Rolling torque on atom 0 should oppose its angular velocity (negative y)
    assert!(
        dem.torque[0][1] < 0.0,
        "rolling torque should oppose omega_y, got {}",
        dem.torque[0][1]
    );
}

// ── SDS model helper ────────────────────────────────────────────────

fn make_material_table_sds_rolling() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.rolling_model = "sds".to_string();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                rolling: 0.3,
                twisting: 0.0,
            })
            .with_rolling(Rolling::Sds {
                stiffness: 1e3,
                damping: 0.5,
            }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

fn make_material_table_sds_twisting() -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.twisting_model = "sds".to_string();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                rolling: 0.0,
                twisting: 0.3,
            })
            .with_twisting(Twisting::Sds {
                stiffness: 1e3,
                damping: 0.5,
            }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

#[test]
fn sds_rolling_opposes_angular_velocity() {
    // Two overlapping particles, one spinning → SDS rolling torque opposes it
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    // Give atom 0 angular velocity in y (rolling about contact normal x)
    dem.omega[0] = [0.0, 10.0, 0.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_sds_rolling());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // SDS rolling torque should oppose omega_y on atom 0
    assert!(
        dem.torque[0][1] < 0.0,
        "SDS rolling torque should oppose omega_y, got {}",
        dem.torque[0][1]
    );
}

#[test]
fn sds_rolling_spring_accumulates() {
    // Pre-load rolling displacement → larger torque than zero displacement
    // Use very small omega so that damping doesn't dominate and Coulomb cap isn't reached
    let radius = 0.001;

    let run_with_preload = |preload_y: f64| -> f64 {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;

        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(
            &mut atom,
            &mut dem,
            &mut hist,
            1,
            [0.0019, 0.0, 0.0],
            radius,
        );
        dem.omega[0] = [0.0, 0.001, 0.0]; // very small angular velocity
        atom.nlocal = 2;
        atom.natoms = 2;

        // Pre-load rolling displacement in contact history (canonical: tag 0 < tag 1, sign=+1)
        if preload_y != 0.0 {
            let mut preload = [0.0; CONTACT_HISTORY_LEN];
            preload[4] = preload_y;
            hist.contacts[0].push((1, preload, false));
        }

        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];

        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();

        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(make_material_table_sds_rolling());
        app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();

        let reg = app.get_resource_ref::<AtomDataRegistry>().unwrap();
        let d = reg.expect::<DemAtom>("test");
        d.torque[0][1]
    };

    let torque_no_preload = run_with_preload(0.0);
    let torque_with_preload = run_with_preload(1e-5); // small preload below cap

    assert!(torque_no_preload < 0.0, "should oppose omega_y");
    assert!(torque_with_preload < 0.0, "should oppose omega_y");
    // Pre-loaded spring adds to torque magnitude
    assert!(
        torque_with_preload.abs() > torque_no_preload.abs(),
        "preloaded spring should increase torque: no_preload={}, preloaded={}",
        torque_no_preload,
        torque_with_preload
    );
}

#[test]
fn sds_rolling_coulomb_cap() {
    // Very high angular velocity → torque should be capped at mu_r * |F_n| * R_eff
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-5; // larger dt to accumulate big spring

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    dem.omega[0] = [0.0, 1e6, 0.0]; // very high
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    let mt = make_material_table_sds_rolling();
    let mu_r = mt.rolling_friction_ij[0][0];

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    let torque_mag =
        (dem.torque[0][0].powi(2) + dem.torque[0][1].powi(2) + dem.torque[0][2].powi(2)).sqrt();

    // Compute expected cap: mu_r * F_n * R_eff
    // F_n from Hertz: 4/3 * E_eff * sqrt(delta * r_eff) * delta
    let r_eff = radius / 2.0;
    let delta = 2.0 * radius - 0.0019;
    let e_eff = 8.7e9 / (2.0 * (1.0 - 0.09)); // single material
    let sqrt_dr = (delta * r_eff).sqrt();
    let f_n_approx = 4.0 / 3.0 * e_eff * sqrt_dr * delta;
    let tau_cap = mu_r * f_n_approx * r_eff;

    // Rolling torque should not exceed cap (with reasonable tolerance for damping and normal force)
    // The torque includes tangential torque contributions, so we just check the rolling component
    // is bounded. Since torque_mag includes all contributions, just check it's finite and reasonable.
    assert!(torque_mag.is_finite(), "torque should be finite");
    assert!(
        torque_mag < tau_cap * 100.0, // generous bound since total torque includes tangential
        "torque {} should be bounded near cap {}",
        torque_mag,
        tau_cap
    );
}

#[test]
fn sds_twisting_opposes_spin() {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    // Spin about contact normal (x-axis)
    dem.omega[0] = [10.0, 0.0, 0.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_sds_twisting());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // SDS twisting torque should oppose spin about x
    assert!(
        dem.torque[0][0] < 0.0,
        "SDS twisting torque should oppose spin about x, got {}",
        dem.torque[0][0]
    );
}

#[test]
fn sds_twisting_spring_accumulates() {
    let radius = 0.001;

    let run_with_preload = |preload: f64| -> f64 {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;

        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(
            &mut atom,
            &mut dem,
            &mut hist,
            1,
            [0.0019, 0.0, 0.0],
            radius,
        );
        dem.omega[0] = [0.001, 0.0, 0.0]; // very small spin
        atom.nlocal = 2;
        atom.natoms = 2;

        if preload != 0.0 {
            let mut preload_state = [0.0; CONTACT_HISTORY_LEN];
            preload_state[6] = preload;
            hist.contacts[0].push((1, preload_state, false));
        }

        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];

        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();

        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(make_material_table_sds_twisting());
        app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();

        let reg = app.get_resource_ref::<AtomDataRegistry>().unwrap();
        let d = reg.expect::<DemAtom>("test");
        d.torque[0][0]
    };

    let torque_no_preload = run_with_preload(0.0);
    let torque_with_preload = run_with_preload(1e-5);
    assert!(torque_no_preload < 0.0);
    assert!(torque_with_preload < 0.0);
    assert!(
        torque_with_preload.abs() > torque_no_preload.abs(),
        "preloaded twisting spring should increase torque: no_preload={}, preloaded={}",
        torque_no_preload,
        torque_with_preload
    );
}

/// Marshall twisting material: tangential friction `friction` drives the
/// derived twisting cap; the SDS twist stiffness/damping inputs are provided
/// deliberately so tests can confirm the Marshall model *ignores* them.
fn make_material_table_marshall_twisting(
    friction: f64,
    twist_stiff: f64,
    twist_damp: f64,
) -> MaterialTable {
    let mut mt = MaterialTable::new();
    mt.twisting_model = "marshall".to_string();
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: friction,
                rolling: 0.0,
                twisting: 0.0,
            })
            .with_twisting(Twisting::Sds {
                stiffness: twist_stiff,
                damping: twist_damp,
            }),
    )
    .unwrap();
    mt.build_pair_tables();
    mt
}

/// Run one Marshall-twisting contact step and return the twisting torque on
/// atom 0 (about the contact normal x̂). `preload` seeds the stored twisting
/// spring displacement; a large value forces the saturated (capped) regime.
fn run_marshall_twist(mt: MaterialTable, omega_x: f64, preload: f64) -> f64 {
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    dem.omega[0] = [omega_x, 0.0, 0.0]; // spin about contact normal x̂
    atom.nlocal = 2;
    atom.natoms = 2;

    if preload != 0.0 {
        let mut preload_state = [0.0; CONTACT_HISTORY_LEN];
        preload_state[6] = preload;
        hist.contacts[0].push((1, preload_state, false));
    }

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let reg = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let tq = reg.expect::<DemAtom>("test").torque[0][0];
    tq
}

#[test]
fn marshall_twisting_opposes_spin() {
    // Spin about the contact normal (x̂) → Marshall twisting couple opposes it.
    let tq = run_marshall_twist(
        make_material_table_marshall_twisting(0.4, 0.0, 0.0),
        10.0,
        0.0,
    );
    assert!(
        tq < 0.0,
        "Marshall twisting torque should oppose spin about x, got {}",
        tq
    );
}

#[test]
fn marshall_twisting_ignores_sds_inputs() {
    // The Marshall coefficients are DERIVED from the tangential model, so the
    // SDS twisting_stiffness / twisting_damping material inputs must have no
    // effect. Drive into the saturated (capped) regime with a large preload so
    // the torque equals the derived cap τ_max = μ_twist·F_n, then confirm two
    // wildly different SDS-input tables give the identical torque.
    let tq_zero = run_marshall_twist(
        make_material_table_marshall_twisting(0.4, 0.0, 0.0),
        10.0,
        1.0,
    );
    let tq_huge = run_marshall_twist(
        make_material_table_marshall_twisting(0.4, 1.0e9, 1.0e6),
        10.0,
        1.0,
    );
    assert!(tq_zero < 0.0, "should oppose spin, got {}", tq_zero);
    assert!(
        (tq_zero - tq_huge).abs() <= 1e-12 * tq_zero.abs().max(1e-30),
        "Marshall torque must ignore SDS twist inputs: zero-input={}, huge-input={}",
        tq_zero,
        tq_huge
    );
}

#[test]
fn marshall_twisting_cap_scales_with_tangential_friction() {
    // μ_twist = (2/3) a μ_t, so in the saturated regime the cap scales linearly
    // with the tangential friction coefficient: doubling μ_t doubles |τ|, and
    // μ_t = 0 gives zero twisting couple (Marshall ties the cap to sliding).
    let tq_mu04 = run_marshall_twist(
        make_material_table_marshall_twisting(0.4, 0.0, 0.0),
        10.0,
        1.0,
    );
    let tq_mu08 = run_marshall_twist(
        make_material_table_marshall_twisting(0.8, 0.0, 0.0),
        10.0,
        1.0,
    );
    let tq_mu00 = run_marshall_twist(
        make_material_table_marshall_twisting(0.0, 0.0, 0.0),
        10.0,
        1.0,
    );
    let ratio = tq_mu08 / tq_mu04;
    assert!(
        (ratio - 2.0).abs() < 1e-6,
        "doubling μ_t should double the Marshall cap: ratio={}",
        ratio
    );
    assert!(
        tq_mu00.abs() < 1e-12,
        "μ_t = 0 should give zero Marshall twisting torque, got {}",
        tq_mu00
    );
}

#[test]
fn constant_model_unchanged_with_sds_config() {
    // When rolling_model = "constant" (default), SDS parameters should be ignored
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    dem.omega[0] = [0.0, 10.0, 0.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    // Use constant model but with SDS parameters set (they should be ignored)
    let mut mt = MaterialTable::new();
    // rolling_model defaults to "constant"
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                rolling: 0.3,
                twisting: 0.0,
            })
            .with_rolling(Rolling::Sds {
                stiffness: 1e3,
                damping: 0.5,
            }),
    )
    .unwrap();
    mt.build_pair_tables();

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let registry = app.get_resource_ref::<AtomDataRegistry>().unwrap();
    let dem = registry.expect::<DemAtom>("test");
    // Constant model: torque = -mu_r * |F_n| * r_eff * (roll/|roll|)
    // Should still produce opposing torque
    assert!(
        dem.torque[0][1] < 0.0,
        "constant rolling model should still work, got {}",
        dem.torque[0][1]
    );

    // Check that spring history has zero rolling/twisting displacement
    let hist = registry.expect::<ContactHistoryStore>("test");
    let contact = &hist.contacts[0][0];
    assert_eq!(
        contact.1[3], 0.0,
        "rolling disp x should be zero in constant model"
    );
    assert_eq!(
        contact.1[4], 0.0,
        "rolling disp y should be zero in constant model"
    );
    assert_eq!(
        contact.1[5], 0.0,
        "rolling disp z should be zero in constant model"
    );
    assert_eq!(
        contact.1[6], 0.0,
        "twisting disp should be zero in constant model"
    );
}

// ── DMT adhesion tests ──────────────────────────────────────────────

fn make_material_table_dmt() -> MaterialTable {
    let mut mt = MaterialTable::new();
    // Use high surface energy (1.0 J/m²) so adhesion clearly dominates at small overlaps
    mt.add(
        Material::new("glass", Elastic::new(8.7e9, 0.3, 0.95))
            .with_friction(Friction {
                sliding: 0.4,
                ..Friction::default()
            })
            .with_adhesion(Adhesion::SurfaceEnergy { energy: 1.0 }),
    )
    .unwrap();
    mt.adhesion_model = "dmt".to_string();
    mt.build_pair_tables();
    mt
}

#[test]
fn dmt_pulloff_force_matches_theory() {
    // DMT pull-off force = 2 * pi * gamma * r_eff (at contact, delta = 0+)
    let radius = 0.001;
    let gamma = 1.0;
    let r_eff = radius / 2.0; // two equal spheres

    // Use a very small overlap so Hertz contribution is negligible
    // At tiny delta, F_hertz ~ 0 but F_dmt = 2*pi*gamma*r_eff
    let tiny_overlap = 1e-12; // extremely small overlap
    let sep = 2.0 * radius - tiny_overlap;

    let mut app = App::new();
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_dmt());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    let expected_dmt = 2.0 * std::f64::consts::PI * gamma * r_eff;
    // Force on atom 0 should be positive (attracted toward atom 1)
    // f_n_mag = k_n*delta - f_diss - f_dmt ~ -f_dmt (since delta ~ 0, v=0)
    // force[0] -= f_n_mag * nx -> force[0] ~ +f_dmt
    assert!(
        atom.force[0][0] > 0.0,
        "DMT should produce attractive force, got {}",
        atom.force[0][0]
    );
    assert!(
        (atom.force[0][0] as f64 - expected_dmt).abs() / expected_dmt < 1e-3,
        "DMT pull-off force should match 2*pi*gamma*r_eff = {}, got {}",
        expected_dmt,
        atom.force[0][0]
    );
}

#[test]
fn dmt_no_force_beyond_contact() {
    // DMT has no adhesion-only regime -- no force when delta < 0 (gap)
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    // Place particles with a gap
    let gap = 1e-9;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [2.0 * radius + gap, 0.0, 0.0],
        radius,
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_dmt());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    // DMT: no force when particles are not in geometric contact
    assert!(
        atom.force[0][0].abs() < 1e-20,
        "DMT should have no force beyond contact, got {}",
        atom.force[0][0]
    );
}

#[test]
fn dmt_pulloff_less_than_jkr() {
    // DMT pull-off = 2*pi*gamma*r_eff, JKR pull-off = 1.5*pi*gamma*r_eff
    // At same surface energy, DMT has HIGHER pull-off force than JKR (2 > 1.5)
    // But JKR has extended range (adhesion across gap), so effective sticking is stronger
    let gamma = 1.0;
    let radius = 0.001;
    let r_eff = radius / 2.0;

    let f_dmt = 2.0 * std::f64::consts::PI * gamma * r_eff;
    let f_jkr = 1.5 * std::f64::consts::PI * gamma * r_eff;
    assert!(
        f_dmt > f_jkr,
        "DMT pull-off ({}) should be larger than JKR pull-off ({})",
        f_dmt,
        f_jkr
    );
}

#[test]
fn dmt_newtons_third_law() {
    // Verify equal and opposite forces for DMT contact
    let mut app = App::new();
    let radius = 0.001;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.0019, 0.0, 0.0],
        radius,
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_dmt());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    for d in 0..3 {
        assert!(
            (atom.force[0][d] + atom.force[1][d]).abs() < 1e-10,
            "Newton's 3rd law violated in dim {}: {} + {} != 0",
            d,
            atom.force[0][d],
            atom.force[1][d]
        );
    }
}

#[test]
fn dmt_does_not_break_jkr() {
    // Run the JKR test with default adhesion_model (should still work as JKR)
    let mut app = App::new();
    let radius = 0.001;
    let gamma = 1.0;
    let r_eff = radius / 2.0;
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    // Place particles with a tiny gap (adhesion-only regime for JKR)
    let gap = 1e-9;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [2.0 * radius + gap, 0.0, 0.0],
        radius,
    );
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];

    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    // Use JKR material table (default adhesion_model = "jkr")
    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table_jkr());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    let expected_jkr = 1.5 * std::f64::consts::PI * gamma * r_eff;
    // JKR should still attract across gap
    assert!(
        atom.force[0][0] > 0.0,
        "JKR should still work with DMT feature added, got {}",
        atom.force[0][0]
    );
    assert!(
        (atom.force[0][0] as f64 - expected_jkr).abs() / expected_jkr < 1e-6,
        "JKR pull-off force should still match 1.5*pi*gamma*r_eff = {}, got {}",
        expected_jkr,
        atom.force[0][0]
    );
}

// ── Force scaling validation tests ──────────────────────────────────

#[test]
fn hertz_force_scales_as_delta_three_halves() {
    let radius = 0.001;

    // Compute elastic-only normal force for a given separation (zero velocity -> no damping).
    let hertz_force_at = |sep: f64| -> f64 {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
        atom.nlocal = 2;
        atom.natoms = 2;
        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];
        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();
        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(make_material_table());
        app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();
        let atom = app.get_resource_ref::<Atom>().unwrap();
        // Force on atom 0 is negative (pushed away from atom 1), take absolute value
        atom.force[0][0].abs() as f64
    };

    // Test at 5 different overlaps
    let deltas = [1e-5, 2e-5, 4e-5, 6e-5, 8e-5];
    let forces: Vec<f64> = deltas
        .iter()
        .map(|d| {
            let sep = 2.0 * radius - d;
            hertz_force_at(sep)
        })
        .collect();

    // For each pair (i, 0), check F_i/F_0 ~ (delta_i/delta_0)^(3/2)
    for i in 1..deltas.len() {
        let expected_ratio = (deltas[i] / deltas[0]).powf(1.5);
        let actual_ratio = forces[i] / forces[0];
        let rel_err = ((actual_ratio - expected_ratio) / expected_ratio).abs();
        assert!(
                rel_err < 0.01,
                "Hertz force scaling: delta ratio {:.1}, expected F ratio {:.4}, got {:.4} (rel err {:.4})",
                deltas[i] / deltas[0], expected_ratio, actual_ratio, rel_err
            );
    }
}

#[test]
fn hooke_force_scales_linearly_across_overlaps() {
    let radius = 0.001;
    let hooke_force_at = |sep: f64| -> f64 {
        let mut app = App::new();
        let mut atom = Atom::new();
        let mut dem = DemAtom::new();
        let mut hist = ContactHistoryStore::new();
        atom.dt = 1e-7;
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
        push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
        atom.nlocal = 2;
        atom.natoms = 2;
        let mut neighbor = Neighbor::new();
        neighbor.neighbor_offsets = vec![0, 1, 1];
        neighbor.neighbor_indices = vec![1];
        let mut registry = AtomDataRegistry::new();
        registry.try_register(dem, atom.len()).unwrap();
        registry.try_register(hist, atom.len()).unwrap();
        app.add_resource(atom);
        app.add_resource(neighbor);
        app.add_resource(registry);
        app.add_resource(make_material_table_hooke());
        app.add_update_system(hooke_contact_force, ParticleSimScheduleSet::Force);
        app.organize_systems();
        app.run();
        let atom = app.get_resource_ref::<Atom>().unwrap();
        atom.force[0][0].abs() as f64
    };

    let deltas = [2e-5, 4e-5, 6e-5, 8e-5, 1e-4];
    let forces: Vec<f64> = deltas
        .iter()
        .map(|d| {
            let sep = 2.0 * radius - d;
            hooke_force_at(sep)
        })
        .collect();

    for i in 1..deltas.len() {
        let expected_ratio = deltas[i] / deltas[0]; // linear
        let actual_ratio = forces[i] / forces[0];
        let rel_err = ((actual_ratio - expected_ratio) / expected_ratio).abs();
        assert!(
                rel_err < 0.01,
                "Hooke force scaling: delta ratio {:.1}, expected F ratio {:.4}, got {:.4} (rel err {:.4})",
                deltas[i] / deltas[0], expected_ratio, actual_ratio, rel_err
            );
    }
}

#[test]
fn hertz_force_matches_analytical_value() {
    let radius = 0.001;
    let delta = 5e-5;
    let sep = 2.0 * radius - delta;

    let mut app = App::new();
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];
    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    let mt = make_material_table();
    let e_eff = mt.e_eff_ij[0][0];
    let r_eff = radius / 2.0; // two equal spheres: r_eff = r1*r2/(r1+r2) = r/2

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    let f_computed = atom.force[0][0].abs() as f64;
    // Analytical: F = (4/3) * E_eff * sqrt(R_eff) * delta^(3/2)
    let f_analytical = (4.0 / 3.0) * e_eff * r_eff.sqrt() * delta.powf(1.5);
    let rel_err = (f_computed - f_analytical).abs() / f_analytical;
    assert!(
        rel_err < 1e-10,
        "Hertz force analytical check: computed={:.6e}, expected={:.6e}, rel_err={:.2e}",
        f_computed,
        f_analytical,
        rel_err
    );
}

#[test]
fn linear_momentum_conserved_during_elastic_contact() {
    // Perfectly elastic (restitution = 1.0) → ~no damping. The Hertz/Tsuji
    // coefficient at e=1 is the polynomial's residual (~1.3e-4), not exactly 0
    // (LAMMPS `damping tsuji` has the same residual), so momentum is conserved to
    // that order rather than machine epsilon.
    let mut mt = MaterialTable::new();
    mt.add(
        Material::new("elastic", Elastic::new(8.7e9, 0.3, 1.0)).with_friction(Friction {
            sliding: 0.0,
            rolling: 0.0,
            twisting: 0.0,
        }),
    )
    .unwrap();
    mt.build_pair_tables();
    assert!(
        mt.beta_ij[0][0].abs() < 1e-3,
        "beta should be ~0 for e=1.0, got {}",
        mt.beta_ij[0][0]
    );

    let radius = 0.001;
    let dt = 1e-8;

    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = dt;

    // Two particles approaching each other, slight overlap
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(
        &mut atom,
        &mut dem,
        &mut hist,
        1,
        [0.00195, 0.0, 0.0],
        radius,
    );
    atom.vel[0] = [0.1, 0.05, -0.02];
    atom.vel[1] = [-0.05, 0.03, 0.01];
    atom.nlocal = 2;
    atom.natoms = 2;

    let initial_momentum = [
        atom.mass[0] * atom.vel[0][0] + atom.mass[1] * atom.vel[1][0],
        atom.mass[0] * atom.vel[0][1] + atom.mass[1] * atom.vel[1][1],
        atom.mass[0] * atom.vel[0][2] + atom.mass[1] * atom.vel[1][2],
    ];

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];
    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    let mut app = App::new();
    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(mt);
    app.add_update_system(
        crate::contact::hertz_mindlin_contact_force,
        ParticleSimScheduleSet::Force,
    );
    app.add_update_system(
        soil_verlet::initial_integration,
        ParticleSimScheduleSet::InitialIntegration,
    );
    app.add_update_system(
        soil_verlet::final_integration,
        ParticleSimScheduleSet::FinalIntegration,
    );
    // Zero forces between steps
    app.add_update_system(
        |mut atoms: ResMut<Atom>, registry: Res<AtomDataRegistry>| {
            let n = atoms.len();
            for force in atoms.force.iter_mut().take(n) {
                *force = [0.0; 3];
            }
            registry.zero_all(n);
        },
        ParticleSimScheduleSet::PostInitialIntegration,
    );
    app.organize_systems();

    // Run for 100 steps
    for _ in 0..100 {
        app.run();
    }

    let atom = app.get_resource_ref::<Atom>().unwrap();
    let final_momentum = [
        atom.mass[0] * atom.vel[0][0] + atom.mass[1] * atom.vel[1][0],
        atom.mass[0] * atom.vel[0][1] + atom.mass[1] * atom.vel[1][1],
        atom.mass[0] * atom.vel[0][2] + atom.mass[1] * atom.vel[1][2],
    ];

    for d in 0..3 {
        let err = (final_momentum[d] - initial_momentum[d]).abs();
        assert!(
            err < 1e-12,
            "Momentum not conserved in dim {}: initial={:.6e}, final={:.6e}, err={:.2e}",
            d,
            initial_momentum[d],
            final_momentum[d],
            err
        );
    }
}

#[test]
fn contact_force_symmetry_with_tangential_velocity() {
    let radius = 0.001;
    let sep = 0.0019;

    let mut app = App::new();
    let mut atom = Atom::new();
    let mut dem = DemAtom::new();
    let mut hist = ContactHistoryStore::new();
    atom.dt = 1e-7;

    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 0, [0.0, 0.0, 0.0], radius);
    push_test_atom_with_history(&mut atom, &mut dem, &mut hist, 1, [sep, 0.0, 0.0], radius);
    // Give both atoms velocities in all directions
    atom.vel[0] = [0.1, 0.2, -0.1];
    atom.vel[1] = [-0.3, 0.1, 0.05];
    dem.omega[0] = [10.0, 20.0, -5.0];
    dem.omega[1] = [-15.0, 5.0, 10.0];
    atom.nlocal = 2;
    atom.natoms = 2;

    let mut neighbor = Neighbor::new();
    neighbor.neighbor_offsets = vec![0, 1, 1];
    neighbor.neighbor_indices = vec![1];
    let mut registry = AtomDataRegistry::new();
    registry.try_register(dem, atom.len()).unwrap();
    registry.try_register(hist, atom.len()).unwrap();

    app.add_resource(atom);
    app.add_resource(neighbor);
    app.add_resource(registry);
    app.add_resource(make_material_table());
    app.add_update_system(hertz_mindlin_contact_force, ParticleSimScheduleSet::Force);
    app.organize_systems();
    app.run();

    let atom = app.get_resource_ref::<Atom>().unwrap();
    // Newton's 3rd law: forces equal and opposite
    for d in 0..3 {
        assert!(
            (atom.force[0][d] + atom.force[1][d]).abs() < 1e-10,
            "Newton's 3rd law violated in dim {}: f0={:.6e}, f1={:.6e}",
            d,
            atom.force[0][d],
            atom.force[1][d]
        );
    }
}

#[test]
fn willett_liquid_bridge_force_matches_closed_form_and_ruptures() {
    let r_eff: f64 = 2.5e-3;
    let volume: f64 = 1.0e-11;
    let gamma: f64 = 0.072;
    let theta: f64 = 0.0;
    let rupture: f64 = 5.0e-5;
    for separation in [0.0, 1.0e-6, 1.0e-5, 4.0e-5] {
        let s_hat = separation * (r_eff / volume).sqrt();
        let expected = 2.0 * std::f64::consts::PI * r_eff * gamma * theta.cos()
            / (1.0 + 1.05 * s_hat + 2.5 * s_hat * s_hat);
        let got = willett2000_liquid_bridge_force(separation, r_eff, volume, gamma, theta, rupture);
        assert!((got - expected).abs() < 1.0e-15);
    }
    assert_eq!(
        willett2000_liquid_bridge_force(rupture * 1.01, r_eff, volume, gamma, theta, rupture),
        0.0
    );
}