Skip to content

Commit

Permalink
update tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MFraters
MFraters committed Oct 19, 2024
1 parent de0a5f0 commit 1c46a95
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 64 deletions.
13 changes: 6 additions & 7 deletions tests/gwb-dat/app_continental_plate_2d.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
"temperature models":[{"model":"uniform", "max depth":75e3, "temperature":150},
{"model":"uniform", "min depth":75e3, "max depth":150e3, "temperature":100},
{"model":"uniform", "min depth":150e3, "max depth":225e3, "temperature":50}],
"velocity models":[{"model":"uniform","velocity":[1,2,3]},
{"model":"direction dip", "direction":[1,2], "dip":30, "magnitude": 2}]},
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},

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

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

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

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

]
}
76 changes: 19 additions & 57 deletions tests/gwb-dat/app_continental_plate_2d/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,57 +1,19 @@
Expected fail with:
AssertThrow `(..error type..)` failed in (..path..)/source/world_builder/parameters.cc at line (..line..): Invalid schema: #/properties/features/items
Invalid keyword: oneOfInvalid schema: #/features/0
Error document:
#/features/0{
"oneOf": {
"errors": [
{
"oneOf": {
"errors": [
{
"enum": {
"instanceRef": "#/features/0/velocity%20models/0/model",
"schemaRef": "#/properties/features/items/oneOf/0/properties/velocity%20models/items/oneOf/0/properties/model"
}
}
],
"instanceRef": "#/features/0/velocity%20models/0",
"schemaRef": "#/properties/features/items/oneOf/0/properties/velocity%20models/items"
}
},
{
"enum": {
"instanceRef": "#/features/0/model",
"schemaRef": "#/properties/features/items/oneOf/1/properties/model"
}
},
{
"enum": {
"instanceRef": "#/features/0/model",
"schemaRef": "#/properties/features/items/oneOf/2/properties/model"
}
},
{
"enum": {
"instanceRef": "#/features/0/model",
"schemaRef": "#/properties/features/items/oneOf/3/properties/model"
}
},
{
"enum": {
"instanceRef": "#/features/0/model",
"schemaRef": "#/properties/features/items/oneOf/4/properties/model"
}
},
{
"enum": {
"instanceRef": "#/features/0/model",
"schemaRef": "#/properties/features/items/oneOf/5/properties/model"
}
}
],
"instanceRef": "#/features/0",
"schemaRef": "#/properties/features/items"
}
}

# 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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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 comments on commit 1c46a95

Please sign in to comment.