Skip to content

Commit 1c46a95

Browse files
MFratersMFraters
committed
update tests.
1 parent de0a5f0 commit 1c46a95

File tree

2 files changed

+25
-64
lines changed

2 files changed

+25
-64
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
}

‎tests/gwb-dat/app_continental_plate_2d/screen-output.log‎

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

0 commit comments

Comments
 (0)