-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #638 from danieldouglas92/add_tests_for_variable_s…
…preading Add tests for variable spreading
- Loading branch information
Showing
9 changed files
with
229 additions
and
5 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
tests/gwb-dat/mass_conserving_slab_with_variable_spreading.dat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Profiles across a slab dipping at 30 degrees | ||
# Now define parameters: | ||
# dim = 2 | ||
# compositions = 0 | ||
# x z d T | ||
2490e3 0 5e3 | ||
2495e3 0 5e3 | ||
2460e3 0 25e3 | ||
2475e3 0 35e3 | ||
7553e3 0 145e3 | ||
7714e3 0 44e3 | ||
7804e3 0 126e3 | ||
7875e3 0 150e3 |
162 changes: 162 additions & 0 deletions
162
tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,162 @@ | ||
{ | ||
"version":"0.6", | ||
"coordinate system":{"model":"cartesian"}, | ||
"gravity model":{"model":"uniform", "magnitude":10}, | ||
"cross section":[[0,0],[10000e3,0]],"surface temperature":273, "force surface temperature":true, | ||
"potential mantle temperature":1673, "thermal expansion coefficient":3.1e-5, | ||
"specific heat":1000, "thermal diffusivity":1.0e-6, | ||
"features": | ||
[ | ||
{ | ||
"model": "oceanic plate", | ||
"name": "sp plate", | ||
"max depth": 150000.0, | ||
"min depth": -100000.0, | ||
"coordinates": [ | ||
[ | ||
0.0, | ||
-1000.0 | ||
], | ||
[ | ||
0.0, | ||
1000.0 | ||
], | ||
[ | ||
7500000.0, | ||
1000.0 | ||
], | ||
[ | ||
7500000.0, | ||
-1000.0 | ||
] | ||
], | ||
"temperature models": [ | ||
{ | ||
"model": "plate model", | ||
"min depth": -10000.0, | ||
"max depth": 150000.0, | ||
"spreading velocity": [ [1,[[0.000005, 0.05]]] ], | ||
"ridge coordinates": [ | ||
[ | ||
[ | ||
0, | ||
-1000.0 | ||
], | ||
[ | ||
0, | ||
1000.0 | ||
] | ||
] | ||
] | ||
} | ||
], | ||
"composition models": [ | ||
{ | ||
"model": "uniform", | ||
"min depth": -10000.0, | ||
"max depth": 7500.0, | ||
"compositions": [ | ||
0 | ||
] | ||
}, | ||
{ | ||
"model": "uniform", | ||
"min depth": 7500.0, | ||
"max depth": 35200.0, | ||
"compositions": [ | ||
1 | ||
] | ||
} | ||
] | ||
}, | ||
{ | ||
"model": "subducting plate", | ||
"name": "initial slab", | ||
"coordinates": [ | ||
[ | ||
7500000.0, | ||
-1000.0 | ||
], | ||
[ | ||
7500000.0, | ||
1000.0 | ||
] | ||
], | ||
"dip point": [ | ||
40000000.0, | ||
0.0 | ||
], | ||
"segments": [ | ||
{ | ||
"length": 418880.0, | ||
"thickness": [ | ||
300000.0 | ||
], | ||
"top truncation": [ | ||
-100000.0 | ||
], | ||
"angle": [ | ||
0, | ||
60 | ||
], | ||
"composition models": [ | ||
{ | ||
"model": "uniform", | ||
"compositions": [ | ||
0 | ||
], | ||
"max distance slab top": 7500.0 | ||
}, | ||
{ | ||
"model": "uniform", | ||
"compositions": [ | ||
1 | ||
], | ||
"min distance slab top": 7500.0, | ||
"max distance slab top": 35200.0 | ||
} | ||
] | ||
}, | ||
{ | ||
"length": 100000.0, | ||
"thickness": [ | ||
300000.0 | ||
], | ||
"top truncation": [ | ||
-100000.0 | ||
], | ||
"angle": [ | ||
60, | ||
60 | ||
] | ||
} | ||
], | ||
"temperature models": [ | ||
{ | ||
"model": "mass conserving", | ||
"density": 3300, | ||
"thermal conductivity": 3.3, | ||
"adiabatic heating": true, | ||
"plate velocity": [ [1,[[0.000005, 0.05]]] ], | ||
"ridge coordinates": [ | ||
[ | ||
[ | ||
0, | ||
-1000.0 | ||
], | ||
[ | ||
0, | ||
1000.0 | ||
] | ||
] | ||
], | ||
"coupling depth": 50000.0, | ||
"taper distance": 100000.0, | ||
"min distance slab top": -100000.0, | ||
"max distance slab top": 150000.0, | ||
"reference model name": "plate model" | ||
} | ||
] | ||
} | ||
] | ||
} |
9 changes: 9 additions & 0 deletions
9
tests/gwb-dat/mass_conserving_slab_with_variable_spreading/screen-output.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# x z d T tag | ||
2490e3 0 5e3 362.805 0 | ||
2495e3 0 5e3 362.737 0 | ||
2460e3 0 25e3 640.65 0 | ||
2475e3 0 35e3 772.684 0 | ||
7553e3 0 145e3 1646.98 1 | ||
7714e3 0 44e3 1695.97 1 | ||
7804e3 0 126e3 1604.77 1 | ||
7875e3 0 150e3 1752.59 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
# This is a comment in the data | ||
# file. | ||
# Now define parameters: | ||
# dim = 3 | ||
# compositions = 0 | ||
# x y z d T | ||
250e3 -90e3 0 50e3 | ||
250e3 -60e3 0 50e3 | ||
250e3 -30e3 0 50e3 | ||
250e3 -1e3 0 50e3 | ||
250e3 1e3 0 50e3 | ||
250e3 30e3 0 50e3 | ||
250e3 60e3 0 50e3 | ||
250e3 90e3 0 50e3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
{ | ||
"version": "0.6", | ||
"coordinate system":{"model":"cartesian"}, | ||
"gravity model":{"model":"uniform", "magnitude":10}, | ||
"surface temperature":273, "force surface temperature":true, | ||
"potential mantle temperature":1673, "thermal expansion coefficient":3.1e-5, | ||
"specific heat":1250, "thermal diffusivity":1.0e-6, | ||
"features": | ||
[ | ||
{ "model":"oceanic plate", "name":"Subducting", "max depth":250e3,"min depth":0, | ||
"coordinates" :[[500e3, -100e3],[500e3, 100e3],[0, 100e3],[0, -100e3]], | ||
"temperature models":[ | ||
{"model":"plate model", "min depth":0, "max depth":100e3, "spreading velocity":[ [0,[[0.1, 0.0005, 0.000001]]], [1,[[0.000005, 0.005]]] ], | ||
"top temperature":273, | ||
"ridge coordinates": [[[100e3,-110e3], [150e3, -60e3], [100e3, 0]], [[400e3, 0], [400e3, 110e3]]]}]} | ||
] | ||
} |
9 changes: 9 additions & 0 deletions
9
tests/gwb-dat/plate_model_variable_spreading/screen-output.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# x y z d g T tag | ||
250e3 -90e3 0 50e3 1053.64 0 | ||
250e3 -60e3 0 50e3 1061.62 0 | ||
250e3 -30e3 0 50e3 1053.64 0 | ||
250e3 -1e3 0 50e3 1036.17 0 | ||
250e3 1e3 0 50e3 992.583 0 | ||
250e3 30e3 0 50e3 1059.59 0 | ||
250e3 60e3 0 50e3 1179.08 0 | ||
250e3 90e3 0 50e3 1289.95 0 |