Skip to content

Commit 7c5b26c

Browse files
committed
update tests and expand coverage
1 parent 9e7a2ad commit 7c5b26c

File tree

49 files changed

+2024
-2050
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2024
-2050
lines changed

tests/gwb-dat/app_continental_plate_2d.wb

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
"temperature models":[{"model":"uniform", "max depth":75e3, "temperature":150},
1010
{"model":"uniform", "min depth":75e3, "max depth":150e3, "temperature":100},
1111
{"model":"uniform", "min depth":150e3, "max depth":225e3, "temperature":50}],
12-
"velocity models":[{"model":"uniform","velocity":[1,2,3]},
13-
{"model":"direction dip", "direction":[1,2], "dip":30, "magnitude": 2}]},
12+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},
1413

1514
{"model":"continental plate", "tag":"B", "name":"Second continental plate", "max depth":250e3, "coordinates":[[2000e3,2000e3],[1000e3,2000e3],[1000e3,1000e3],[2000e3,1000e3]],
1615
"temperature models":[{"model":"adiabatic", "potential mantle temperature":20}],
1716
"composition models":[{"model":"uniform", "compositions":[2]}],
18-
"velocity models":[{"model":"uniform","velocity":[1,2,3]}],
17+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}],
1918
"grains models":[
2019
{"model":"uniform", "compositions":[0,1], // olivine and enstatie
2120
"rotation matrices":[[[1,2,3],[4,5,6],[7,8,9]],[[10,11,12],[13,14,15],[16,17,18]]],
@@ -29,24 +28,24 @@
2928
"rotation matrices":[[[10,20,30],[40,50,60],[70,80,90]],[[100,110,120],[130,140,150],[160,170,180]]],
3029
"grain sizes":[0.3,-1]}
3130
],
32-
"velocity models":[{"model":"uniform","velocity":[1,2,3]}]},
31+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},
3332

3433
{"model":"continental plate", "name":"Fourth continental plate", "max depth":250e3, "coordinates":[[-1e3,1500e3],[500e3,1500e3],[500e3,2000e3],[-1e3,2000e3]],
3534
"temperature models":[{"model":"linear", "max depth":250e3}],
3635
"composition models":[{"model":"uniform", "compositions":[4]}],
37-
"velocity models":[{"model":"uniform","velocity":[1,2,3]}]},
36+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},
3837

3938
{"model":"continental plate", "name":"Fifth continental plate", "max depth":250e3, "coordinates":[[500e3,-1e3],[500e3,500e3],[1000e3,500e3],[1000e3,-1e3]],
4039
"temperature models":[{"model":"linear", "max depth":250e3, "top temperature":10, "bottom temperature":50}],
4140
"composition models":[{"model":"uniform", "compositions":[5,6], "fractions":[0.25,0.75]}],
42-
"velocity models":[{"model":"uniform","velocity":[1,2,3]}]},
41+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},
4342

4443
{"model":"continental plate", "name":"Sixth continental plate", "max depth":250e3, "coordinates":[[1250e3,-1e3],[1250e3,500e3],[1750e3,500e3],[1750e3,-1e3]],
4544
"temperature models":[{"model":"linear", "max depth":250e3, "top temperature":10, "bottom temperature":50}],
4645
"composition models":[{"model":"uniform", "max depth":75e3, "compositions":[6,7], "fractions":[0.25,0.75]},
4746
{"model":"uniform", "min depth":75e3, "max depth":150e3, "compositions":[7]},
4847
{"model":"uniform", "min depth":150e3, "max depth":225e3, "compositions":[8]}],
49-
"velocity models":[{"model":"uniform","velocity":[1,2,3]}]}
48+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]}
5049

5150
]
5251
}
Lines changed: 19 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,19 @@
1-
Expected fail with:
2-
AssertThrow `(..error type..)` failed in (..path..)/source/world_builder/parameters.cc at line (..line..): Invalid schema: #/properties/features/items
3-
Invalid keyword: oneOfInvalid schema: #/features/0
4-
Error document:
5-
#/features/0{
6-
"oneOf": {
7-
"errors": [
8-
{
9-
"oneOf": {
10-
"errors": [
11-
{
12-
"enum": {
13-
"instanceRef": "#/features/0/velocity%20models/0/model",
14-
"schemaRef": "#/properties/features/items/oneOf/0/properties/velocity%20models/items/oneOf/0/properties/model"
15-
}
16-
}
17-
],
18-
"instanceRef": "#/features/0/velocity%20models/0",
19-
"schemaRef": "#/properties/features/items/oneOf/0/properties/velocity%20models/items"
20-
}
21-
},
22-
{
23-
"enum": {
24-
"instanceRef": "#/features/0/model",
25-
"schemaRef": "#/properties/features/items/oneOf/1/properties/model"
26-
}
27-
},
28-
{
29-
"enum": {
30-
"instanceRef": "#/features/0/model",
31-
"schemaRef": "#/properties/features/items/oneOf/2/properties/model"
32-
}
33-
},
34-
{
35-
"enum": {
36-
"instanceRef": "#/features/0/model",
37-
"schemaRef": "#/properties/features/items/oneOf/3/properties/model"
38-
}
39-
},
40-
{
41-
"enum": {
42-
"instanceRef": "#/features/0/model",
43-
"schemaRef": "#/properties/features/items/oneOf/4/properties/model"
44-
}
45-
},
46-
{
47-
"enum": {
48-
"instanceRef": "#/features/0/model",
49-
"schemaRef": "#/properties/features/items/oneOf/5/properties/model"
50-
}
51-
}
52-
],
53-
"instanceRef": "#/features/0",
54-
"schemaRef": "#/properties/features/items"
55-
}
56-
}
57-
1+
# x z d T vx vz c0 c1 c2 c3 c4 c5 c6 c7 c8 gs0-0 gm0-0[0:0] gm0-0[0:1] gm0-0[0:2] gm0-0[1:0] gm0-0[1:1] gm0-0[1:2] gm0-0[2:0] gm0-0[2:1] gm0-0[2:2] gs0-1 gm0-1[0:0] gm0-1[0:1] gm0-1[0:2] gm0-1[1:0] gm0-1[1:1] gm0-1[1:2] gm0-1[2:0] gm0-1[2:1] gm0-1[2:2] gs1-0 gm1-0[0:0] gm1-0[0:1] gm1-0[0:2] gm1-0[1:0] gm1-0[1:1] gm1-0[1:2] gm1-0[2:0] gm1-0[2:1] gm1-0[2:2] gs1-1 gm1-1[0:0] gm1-1[0:1] gm1-1[0:2] gm1-1[1:0] gm1-1[1:1] gm1-1[1:2] gm1-1[2:0] gm1-1[2:1] gm1-1[2:2] tag
2+
1 2 2 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
3+
2 2 2 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
4+
3 4 0 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
5+
560e3 0 0 150 2.2 3 0 0 0 0 1 0 0 0 0 0 0.3 10 20 30 40 50 60 70 80 0.3 90 10 20 30 40 50 60 70 80 90 0.5 100 110 120 130 140 150 160 170 0.5 180 100 110 120 130 140 150 160 170 2
6+
2000e3 0 0 20 2.2 3 0 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 0.5 9 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 0.2 18 10 11 12 13 14 15 16 17 1
7+
2000e3 0 100e3 20.5679 2.2 3 0 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 0.5 9 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 0.2 18 10 11 12 13 14 15 16 17 1
8+
100e3 0 0e3 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
9+
100e3 0 50e3 1622.56 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
10+
100e3 0 100e3 1645.43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
11+
100e3 0 200e3 1692.16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
12+
100e3 0 250e3 1716.01 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
13+
100e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
14+
500e3 0 0e3 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
15+
500e3 0 50e3 1622.56 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
16+
500e3 0 100e3 1645.43 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
17+
500e3 0 200e3 1692.16 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
18+
500e3 0 250e3 1716.01 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
19+
500e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# x y z d g T vx vy vz tag
2-
1 0 2 2 1600 0 0 0 -1
3-
2 250e3 2 2 1600 0 0 0 -1
4-
3 1500e3 4 0 293.15 1 2 3 0
5-
1500e3 1500e3 0 0 20 4 5 6 0
6-
2000e3 1500e3 0 0 20 4 5 6 0
7-
2000e3 1500e3 0 100e3 20.5679 4 5 6 0
8-
1500e3 250e3 0 0e3 10 1 2 3 0
9-
1500e3 250e3 0 50e3 18 1 2 3 0
10-
1500e3 250e3 0 100e3 26 1 2 3 0
11-
1500e3 250e3 0 200e3 42 1 2 3 0
12-
1500e3 250e3 0 250e3 50 1 2 3 0
13-
1500e3 250e3 0 260e3 1720.82 0 0 0 -1
14-
500e3 0 0 0e3 10 1 2 3 0
15-
500e3 0 0 50e3 18 1 2 3 0
16-
500e3 0 0 100e3 26 1 2 3 0
17-
500e3 0 0 200e3 42 1 2 3 0
18-
500e3 0 0 250e3 50 1 2 3 0
19-
500e3 0 0 260e3 1720.82 0 0 0 -1
2+
1 0 2 2 1600 0 0 0 -1
3+
2 250e3 2 2 1600 0 0 0 -1
4+
3 1500e3 4 0 293.15 1 2 3 0
5+
1500e3 1500e3 0 0 20 4 5 6 0
6+
2000e3 1500e3 0 0 20 4 5 6 0
7+
2000e3 1500e3 0 100e3 20.5679 4 5 6 0
8+
1500e3 250e3 0 0e3 10 1 2 3 0
9+
1500e3 250e3 0 50e3 18 1 2 3 0
10+
1500e3 250e3 0 100e3 26 1 2 3 0
11+
1500e3 250e3 0 200e3 42 1 2 3 0
12+
1500e3 250e3 0 250e3 50 1 2 3 0
13+
1500e3 250e3 0 260e3 1720.82 0 0 0 -1
14+
500e3 0 0 0e3 10 1 2 3 0
15+
500e3 0 0 50e3 18 1 2 3 0
16+
500e3 0 0 100e3 26 1 2 3 0
17+
500e3 0 0 200e3 42 1 2 3 0
18+
500e3 0 0 250e3 50 1 2 3 0
19+
500e3 0 0 260e3 1720.82 0 0 0 -1

tests/gwb-dat/app_oceanic_plate_cartesian.wb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
{"model":"oceanic plate", "name":"First continental plate", "max depth":250e3, "coordinates":[[-1e3,500e3],[500e3,500e3],[500e3,1000e3],[-1e3,1000e3]],
99
"temperature models":[{"model":"uniform", "max depth":75e3, "temperature":150},
1010
{"model":"uniform", "min depth":75e3, "max depth":150e3, "temperature":100},
11-
{"model":"uniform", "min depth":150e3, "max depth":22.5e3, "temperature":50}]},
11+
{"model":"uniform", "min depth":150e3, "max depth":22.5e3, "temperature":50}],
12+
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},
1213

1314
{"model":"oceanic plate", "name":"Second continental plate", "coordinates":[[2000e3,2000e3],[1000e3,2000e3],[1000e3,1000e3],[2000e3,1000e3]],
1415
"temperature models":[{"model":"adiabatic", "potential mantle temperature":20}],
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# x y z d g T vx vy vz c0 c1 c2 c3 c4 c5 c6 gs0-0 gm0-0[0:0] gm0-0[0:1] gm0-0[0:2] gm0-0[1:0] gm0-0[1:1] gm0-0[1:2] gm0-0[2:0] gm0-0[2:1] gm0-0[2:2] gs0-1 gm0-1[0:0] gm0-1[0:1] gm0-1[0:2] gm0-1[1:0] gm0-1[1:1] gm0-1[1:2] gm0-1[2:0] gm0-1[2:1] gm0-1[2:2] gs1-0 gm1-0[0:0] gm1-0[0:1] gm1-0[0:2] gm1-0[1:0] gm1-0[1:1] gm1-0[1:2] gm1-0[2:0] gm1-0[2:1] gm1-0[2:2] gs1-1 gm1-1[0:0] gm1-1[0:1] gm1-1[0:2] gm1-1[1:0] gm1-1[1:1] gm1-1[1:2] gm1-1[2:0] gm1-1[2:1] gm1-1[2:2] tag
2-
1 2 2 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
3-
2 2 2 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
4-
3 4 0 2 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5-
560e3 0 0 2 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6-
2000e3 2000e3 2000e3 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
7-
5.30288e-10 -8.66025e+06 5e+06 0 10 0 0 0 0 1 0 0 0 0 0 0.3 0.771281 -0.613092 -0.17101 0.633718 0.71461 0.296198 -0.0593912 -0.336824 0.939693 0.3 0.771281 -0.613092 -0.17101 0.633718 0.71461 0.296198 -0.0593912 -0.336824 0.939693 0.5 0.0252014 -0.747828 -0.663414 0.870002 -0.310468 0.383022 -0.492404 -0.586824 0.642788 0.5 0.0252014 -0.747828 -0.663414 0.870002 -0.310468 0.383022 -0.492404 -0.586824 0.642788 0
8-
5.75396e-11 939693 342020 0 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
9-
5.75396e-11 939693 342020 240e3 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
10-
5.75396e-11 939693 342020 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
11-
5.75396e-11 939693 -342020 0 30 0 0 0 0 0 0 1 0 0 0 0.31 100 200 300 400 500 600 700 800 900 0.31 100 200 300 400 500 600 700 800 900 0.5 1000 1100 1200 1300 1400 1500 1600 1700 1800 0.5 1000 1100 1200 1300 1400 1500 1600 1700 1800 0
12-
5.30288e-10 -8.66025e+06 -5e+06 0 40 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13-
7.4988e-26 1.22465e-09 -1e+07 0 50 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14-
9.84808e+06 1.73648e+06 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15-
-9.84808e+06 -1.73648e+06 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16-
1e+07 0 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17-
-1e+07 1.22465e-09 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18-
1e+07 -2.44929e-09 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
19-
6.06364e-10 9.90268e+06 1.39173e+06 0 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
2+
1 2 2 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
3+
2 2 2 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
4+
3 4 0 2 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
5+
560e3 0 0 2 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
6+
2000e3 2000e3 2000e3 2 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
7+
5.30288e-10 -8.66025e+06 5e+06 0 10 0 0 0 0 1 0 0 0 0 0 0.3 0.771281 -0.613092 -0.17101 0.633718 0.71461 0.296198 -0.0593912 -0.336824 0.939693 0.3 0.771281 -0.613092 -0.17101 0.633718 0.71461 0.296198 -0.0593912 -0.336824 0.939693 0.5 0.0252014 -0.747828 -0.663414 0.870002 -0.310468 0.383022 -0.492404 -0.586824 0.642788 0.5 0.0252014 -0.747828 -0.663414 0.870002 -0.310468 0.383022 -0.492404 -0.586824 0.642788 0
8+
5.75396e-11 939693 342020 0 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
9+
5.75396e-11 939693 342020 240e3 20 0 0 0 0 0 1 0 0 0 0 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.3 -0.163176 -0.0593912 -0.984808 0.34202 -0.939693 6.03021e-17 -0.925417 -0.336824 0.173648 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0.5 0.378522 0.44097 -0.813798 0.0180283 -0.882564 -0.469846 -0.925417 0.163176 -0.34202 0
10+
5.75396e-11 939693 342020 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
11+
5.75396e-11 939693 -342020 0 30 0 0 0 0 0 0 1 0 0 0 0.31 100 200 300 400 500 600 700 800 900 0.31 100 200 300 400 500 600 700 800 900 0.5 1000 1100 1200 1300 1400 1500 1600 1700 1800 0.5 1000 1100 1200 1300 1400 1500 1600 1700 1800 0
12+
5.30288e-10 -8.66025e+06 -5e+06 0 40 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
13+
7.4988e-26 1.22465e-09 -1e+07 0 50 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
14+
9.84808e+06 1.73648e+06 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
15+
-9.84808e+06 -1.73648e+06 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
16+
1e+07 0 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
17+
-1e+07 1.22465e-09 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
18+
1e+07 -2.44929e-09 6.12323e-10 0 60 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
19+
6.06364e-10 9.90268e+06 1.39173e+06 0 1600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# x y z d g T vx vy vz c0 c1 c2 c3 c4 tag
2-
100e3 200e3 0 0 1600 0 0 0 0 0 0 0 0 -1
3-
120e3 550e3 0 0 150 0 0 0 0 0 0 1 0 0
4-
1500e3 1500e3 3 0 20 0 0 0 0 0 1 0 0 0
2+
100e3 200e3 0 0 1600 0 0 0 0 0 0 0 0 -1
3+
120e3 550e3 0 0 150 0 0 0 0 0 0 1 0 0
4+
1500e3 1500e3 3 0 20 0 0 0 0 0 1 0 0 0

0 commit comments

Comments
 (0)