Skip to content

Commit

Permalink
Update unit tests and test results.
Browse files Browse the repository at this point in the history
  • Loading branch information
@MFraters
MFraters committed Oct 19, 2024
1 parent 30e7b6a commit 7c03251
Show file tree
Hide file tree
Showing 83 changed files with 2,589 additions and 2,509 deletions.
6 changes: 3 additions & 3 deletions tests/gwb-dat/2d_cartesian_plume_points/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# x z d T c0 c1 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
450e3 225e3 525e3 1800 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 1
600e3 225e3 525e3 1665.65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
# x z d T vx vz c0 c1 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
450e3 225e3 525e3 1800 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
600e3 225e3 525e3 1665.65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
76 changes: 57 additions & 19 deletions tests/gwb-dat/app_continental_plate_2d/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,57 @@
# x z d T 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 -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 -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 -1
560e3 0 0 150 0 0 0 1 0 0 0 0 0 0.3 10 20 30 40 50 60 70 80 90 0.3 10 20 30 40 50 60 70 80 90 0.5 100 110 120 130 140 150 160 170 180 0.5 100 110 120 130 140 150 160 170 180 2
2000e3 0 0 20 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 1
2000e3 0 100e3 20.5679 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 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 -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 -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 -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 -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 -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 -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 -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 -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 -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 -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 -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 -1
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"
}
}

12 changes: 6 additions & 6 deletions tests/gwb-dat/app_continental_plate_3d.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"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]}]},
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}]},

{"model":"continental plate", "name":"Second continental plate", "max depth":250e3, "coordinates":[[2000e3,2000e3],[1000e3,2000e3],[1000e3,1000e3],[2000e3,1000e3]],
"temperature models":[{"model":"adiabatic", "potential mantle temperature":20}],
Expand All @@ -19,7 +19,7 @@
"rotation matrices":[[[1,2,3],[4,5,6],[7,8,9]],[[10,11,12],[13,14,15],[16,17,18]]],
"grain sizes":[-1,0.2]}
],
"velocity models":[{"model":"uniform","velocity":[1,2,3]}]},
"velocity models":[{"model":"uniform raw","velocity":[4,5,6]}]},

{"model":"continental plate", "name":"Third continental plate", "max depth":250e3, "coordinates":[[-1e3,500e3],[500e3,500e3],[500e3,1000e3],[-1e3,1000e3]],
"composition models":[{"model":"uniform", "compositions":[3]}],
Expand All @@ -28,21 +28,21 @@
"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}],
"velocity models":[{"model":"uniform","velocity":[1,2,3]}],
"velocity models":[{"model":"uniform raw","velocity":[1,2,3]}],
"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]}],
Expand Down
38 changes: 19 additions & 19 deletions tests/gwb-dat/app_continental_plate_3d/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# x y z d g T 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 0 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 -1
2 250e3 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 -1
3 1500e3 4 0 293.15 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 0 0
1500e3 1500e3 0 0 20 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 0
2000e3 1500e3 0 0 20 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 0
2000e3 1500e3 0 100e3 20.5679 0 0 1 0 0 0 0 0 0 0.5 1 2 3 4 5 6 7 8 9 0.5 1 2 3 4 5 6 7 8 9 0.2 10 11 12 13 14 15 16 17 18 0.2 10 11 12 13 14 15 16 17 18 0
1500e3 250e3 0 0e3 10 0 0 0 0 0 0 0.25 0.75 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
1500e3 250e3 0 50e3 18 0 0 0 0 0 0 0.25 0.75 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
1500e3 250e3 0 100e3 26 0 0 0 0 0 0 0 1 0 0.32 101 201 301 401 501 601 7011 801 901 0.32 101 201 301 401 501 601 7011 801 901 0.5 1001 1101 1201 1301 1401 1501 1601 1701 1801 0.5 1001 1101 1201 1301 1401 1501 1601 1701 1801 0
1500e3 250e3 0 200e3 42 0 0 0 0 0 0 0 0 1 0.33 102 202 302 402 502 602 702 802 902 0.33 102 202 302 402 502 602 702 802 902 0.5 1002 1102 1202 1302 1402 1502 1602 1702 1802 0.5 1002 1102 1202 1302 1402 1502 1602 1702 1802 0
1500e3 250e3 0 250e3 50 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1500e3 250e3 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 -1
500e3 0 0 0e3 10 0 0 0 0 0 0.25 0.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
500e3 0 0 50e3 18 0 0 0 0 0 0.25 0.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
500e3 0 0 100e3 26 0 0 0 0 0 0.25 0.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
500e3 0 0 200e3 42 0 0 0 0 0 0.25 0.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
500e3 0 0 250e3 50 0 0 0 0 0 0.25 0.75 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
500e3 0 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 -1
# x y z d g T vx vy vz tag
1 0 2 2 1600 0 0 0 -1
2 250e3 2 2 1600 0 0 0 -1
3 1500e3 4 0 293.15 1 2 3 0
1500e3 1500e3 0 0 20 4 5 6 0
2000e3 1500e3 0 0 20 4 5 6 0
2000e3 1500e3 0 100e3 20.5679 4 5 6 0
1500e3 250e3 0 0e3 10 1 2 3 0
1500e3 250e3 0 50e3 18 1 2 3 0
1500e3 250e3 0 100e3 26 1 2 3 0
1500e3 250e3 0 200e3 42 1 2 3 0
1500e3 250e3 0 250e3 50 1 2 3 0
1500e3 250e3 0 260e3 1720.82 0 0 0 -1
500e3 0 0 0e3 10 1 2 3 0
500e3 0 0 50e3 18 1 2 3 0
500e3 0 0 100e3 26 1 2 3 0
500e3 0 0 200e3 42 1 2 3 0
500e3 0 0 250e3 50 1 2 3 0
500e3 0 0 260e3 1720.82 0 0 0 -1
38 changes: 19 additions & 19 deletions tests/gwb-dat/app_continental_plate_cartesian/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# x z d T c0 c1 c2 c3 c4 c5 c6 c7 c8 tag
1 2 2 1600 0 0 0 0 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 0 0 0 0 -1
560e3 0 0 150 0 0 0 1 0 0 0 0 0 0
2000e3 0 0 20 0 0 1 0 0 0 0 0 0 0
2000e3 0 100e3 20.5679 0 0 1 0 0 0 0 0 0 0
100e3 0 0e3 6 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 50e3 6 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 100e3 7 0 0 0 0 0 0 0 1 0 0
100e3 0 200e3 8 0 0 0 0 0 0 0 0 1 0
100e3 0 250e3 8 0 0 0 0 0 0.25 0.75 0 0 0
100e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 -1
500e3 0 0e3 12 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 50e3 19.6 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 100e3 27.2 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 200e3 42.4 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 250e3 50 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 -1
# x z d T vx vz c0 c1 c2 c3 c4 c5 c6 c7 c8 tag
1 2 2 1600 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 -1
3 4 0 1600 0 0 0 0 0 0 0 0 0 0 0 -1
560e3 0 0 150 0 0 0 0 0 0 1 0 0 0 0 0
2000e3 0 0 20 0 0 0 0 0 1 0 0 0 0 0 0
2000e3 0 100e3 20.5679 0 0 0 0 0 1 0 0 0 0 0 0
100e3 0 0e3 6 0 0 0 0 0 0 0 0 0 0.25 0.75 0
100e3 0 50e3 6 0 0 0 0 0 0 0 0 0 0.25 0.75 0
100e3 0 100e3 7 0 0 0 0 0 0 0 0 0 0 1 0
100e3 0 200e3 8 0 0 0 0 0 0 0 0 0 0 0 0
100e3 0 250e3 8 0 0 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 -1
500e3 0 0e3 12 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 50e3 19.6 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 100e3 27.2 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 200e3 42.4 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 250e3 50 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 -1
38 changes: 19 additions & 19 deletions tests/gwb-dat/app_oceanic_plate_cartesian/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# x z d T c0 c1 c2 c3 c4 c5 c6 c7 c8 tag
1 2 2 1600 0 0 0 0 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 0 0 0 0 -1
560e3 0 0 150 0 0 0 1 0 0 0 0 0 0
2000e3 0 0 20 0 0 1 0 0 0 0 0 0 0
2000e3 0 100e3 20.5679 0 0 1 0 0 0 0 0 0 0
100e3 0 0e3 6 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 50e3 6 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 100e3 7 0 0 0 0 0 0 0 1 0 0
100e3 0 200e3 8 0 0 0 0 0 0 0 0 1 0
100e3 0 250e3 8 0 0 0 0 0 0.25 0.75 0 0 0
100e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 -1
500e3 0 0e3 12 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 50e3 19.6 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 100e3 27.2 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 200e3 42.4 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 250e3 50 0 0 0 0 0 0.25 0.75 0 0 0
500e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 -1
# x z d T vx vz c0 c1 c2 c3 c4 c5 c6 c7 c8 tag
1 2 2 1600 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 -1
3 4 0 1600 0 0 0 0 0 0 0 0 0 0 0 -1
560e3 0 0 150 0 0 0 0 0 0 1 0 0 0 0 0
2000e3 0 0 20 0 0 0 0 0 1 0 0 0 0 0 0
2000e3 0 100e3 20.5679 0 0 0 0 0 1 0 0 0 0 0 0
100e3 0 0e3 6 0 0 0 0 0 0 0 0 0 0.25 0.75 0
100e3 0 50e3 6 0 0 0 0 0 0 0 0 0 0.25 0.75 0
100e3 0 100e3 7 0 0 0 0 0 0 0 0 0 0 1 0
100e3 0 200e3 8 0 0 0 0 0 0 0 0 0 0 0 0
100e3 0 250e3 8 0 0 0 0 0 0 0 0 0.25 0.75 0 0
100e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 -1
500e3 0 0e3 12 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 50e3 19.6 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 100e3 27.2 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 200e3 42.4 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 250e3 50 0 0 0 0 0 0 0 0 0.25 0.75 0 0
500e3 0 260e3 1720.82 0 0 0 0 0 0 0 0 0 0 0 -1
22 changes: 11 additions & 11 deletions tests/gwb-dat/app_oceanic_plate_constant_age/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# x z d T tag
3000e3 0 10e3 494.513 0
3000e3 0 50e3 1239.65 0
3000e3 0 80e3 1546.91 0
3000e3 0 100e3 1647.86 0
3000e3 0 150e3 1732.26 0
3000e3 0 250e3 1780.01 0
3000e3 0 300e3 1802.22 0
4500e3 0 10e3 494.513 0
4500e3 0 50e3 1239.65 0
4500e3 0 80e3 1546.91 0
# x z d T vx vz tag
3000e3 0 10e3 494.513 0 0 0
3000e3 0 50e3 1239.65 0 0 0
3000e3 0 80e3 1546.91 0 0 0
3000e3 0 100e3 1647.86 0 0 0
3000e3 0 150e3 1732.26 0 0 0
3000e3 0 250e3 1780.01 0 0 0
3000e3 0 300e3 1802.22 0 0 0
4500e3 0 10e3 494.513 0 0 0
4500e3 0 50e3 1239.65 0 0 0
4500e3 0 80e3 1546.91 0 0 0
12 changes: 6 additions & 6 deletions tests/gwb-dat/app_operations_add/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# x z d T c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 -1
560e3 1 0 1900 0 0 0 1 0 0
2000e3 1 0 1620 0 0 1 0 0 0
# x z d T vx vz c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 0 0 -1
560e3 1 0 1900 0 0 0 0 0 0 1 0
2000e3 1 0 1620 0 0 0 0 0 1 0 0
12 changes: 6 additions & 6 deletions tests/gwb-dat/app_operations_replace/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# x z d T c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 -1
560e3 1 0 150 0 0 0 1 0 0
2000e3 1 0 20 0 0 1 0 0 0
# x z d T vx vz c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 0 0 -1
560e3 1 0 150 0 0 0 0 0 0 1 0
2000e3 1 0 20 0 0 0 0 0 1 0 0
12 changes: 6 additions & 6 deletions tests/gwb-dat/app_operations_subtract/screen-output.log
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# x z d T c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 -1
560e3 1 0 1300 0 0 0 1 0 0
2000e3 1 0 1580 0 0 1 0 0 0
# x z d T vx vz c0 c1 c2 c3 c4 tag
1 2 2 1600 0 0 0 0 0 0 0 -1
2 2 2 1600 0 0 0 0 0 0 0 -1
3 4 0 1600 0 0 0 0 0 0 0 -1
560e3 1 0 1300 0 0 0 0 0 0 1 0
2000e3 1 0 1580 0 0 0 0 0 1 0 0
Loading

0 comments on commit 7c03251

Please sign in to comment.