-
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 #360 from mibillen/fix_slab_tip
taper slab age at tip
- Loading branch information
Showing
9 changed files
with
110 additions
and
75 deletions.
There are no files selected for viewing
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
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 |
---|---|---|
@@ -1,35 +1,19 @@ | ||
# Profiles across a vertical slab | ||
# Profiles across a slab dipping at 30 degrees | ||
# Now define parameters: | ||
# dim = 2 | ||
# compositions = 0 | ||
# x z d g T | ||
2420e3 0 50e3 10 | ||
2440e3 0 50e3 10 | ||
2460e3 0 50e3 10 | ||
2480e3 0 50e3 10 | ||
2500e3 0 50e3 10 | ||
2520e3 0 50e3 10 | ||
2540e3 0 50e3 10 | ||
2560e3 0 50e3 10 | ||
2580e3 0 50e3 10 | ||
2600e3 0 50e3 10 | ||
2420e3 0 150e3 10 | ||
2440e3 0 150e3 10 | ||
2460e3 0 150e3 10 | ||
2480e3 0 150e3 10 | ||
2500e3 0 150e3 10 | ||
2520e3 0 150e3 10 | ||
2540e3 0 150e3 10 | ||
2560e3 0 150e3 10 | ||
2580e3 0 150e3 10 | ||
2600e3 0 150e3 10 | ||
2420e3 0 600e3 10 | ||
2440e3 0 600e3 10 | ||
2460e3 0 600e3 10 | ||
2480e3 0 600e3 10 | ||
2500e3 0 600e3 10 | ||
2520e3 0 600e3 10 | ||
2540e3 0 600e3 10 | ||
2560e3 0 600e3 10 | ||
2580e3 0 600e3 10 | ||
2600e3 0 600e3 10 | ||
2490e3 0 5e3 10 | ||
2495e3 0 5e3 10 | ||
2460e3 0 25e3 10 | ||
2475e3 0 35e3 10 | ||
2495e3 0 55e3 10 | ||
2540e3 0 125e3 10 | ||
2365e3 0 125e3 10 | ||
2375e3 0 135e3 10 | ||
2395e3 0 160e3 10 | ||
2425e3 0 200e3 10 | ||
2085e3 0 395e3 10 | ||
2095e3 0 425e3 10 | ||
2125e3 0 445e3 10 | ||
2155e3 0 470e3 10 |
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
44 changes: 14 additions & 30 deletions
44
tests/app/mass_conserving_slab_temperature/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 |
---|---|---|
@@ -1,31 +1,15 @@ | ||
# x z d g T | ||
2420e3 0 50e3 10 1699.13 | ||
2440e3 0 50e3 10 1699.13 | ||
2460e3 0 50e3 10 1699.13 | ||
2480e3 0 50e3 10 1699.13 | ||
2500e3 0 50e3 10 718.923 | ||
2520e3 0 50e3 10 608.515 | ||
2540e3 0 50e3 10 891.918 | ||
2560e3 0 50e3 10 1135.44 | ||
2580e3 0 50e3 10 1328.92 | ||
2600e3 0 50e3 10 1471.07 | ||
2420e3 0 150e3 10 1752.63 | ||
2440e3 0 150e3 10 1752.63 | ||
2460e3 0 150e3 10 1752.63 | ||
2480e3 0 150e3 10 1752.63 | ||
2500e3 0 150e3 10 844.342 | ||
2520e3 0 150e3 10 650.018 | ||
2540e3 0 150e3 10 929.275 | ||
2560e3 0 150e3 10 1171.94 | ||
2580e3 0 150e3 10 1367.07 | ||
2600e3 0 150e3 10 1512.28 | ||
2420e3 0 600e3 10 2015 | ||
2440e3 0 600e3 10 2015 | ||
2460e3 0 600e3 10 2014.86 | ||
2480e3 0 600e3 10 1991.33 | ||
2500e3 0 600e3 10 1602.21 | ||
2520e3 0 600e3 10 1271.86 | ||
2540e3 0 600e3 10 1439.21 | ||
2560e3 0 600e3 10 1591.74 | ||
2580e3 0 600e3 10 1720.8 | ||
2600e3 0 600e3 10 1822.18 | ||
2490e3 0 5e3 10 314.684 | ||
2495e3 0 5e3 10 280.275 | ||
2460e3 0 25e3 10 810.382 | ||
2475e3 0 35e3 10 407.808 | ||
2495e3 0 55e3 10 828.11 | ||
2540e3 0 125e3 10 1589.85 | ||
2365e3 0 125e3 10 1617.34 | ||
2375e3 0 135e3 10 469.316 | ||
2395e3 0 160e3 10 920.435 | ||
2425e3 0 200e3 10 1452.72 | ||
2085e3 0 395e3 10 1649.95 | ||
2095e3 0 425e3 10 1029.35 | ||
2125e3 0 445e3 10 1342.83 | ||
2155e3 0 470e3 10 1658.84 |
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,8 @@ | ||
# Profiles across a slab dipping 30 degrees | ||
# Now define parameters: | ||
# dim = 2 | ||
# compositions = 0 | ||
# x z d g T | ||
2435e3 0 5e3 10 | ||
2430e3 0 5e3 10 | ||
2425e3 0 5e3 10 |
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,35 @@ | ||
{ | ||
"version":"0.5", | ||
"coordinate system":{"model":"cartesian"}, | ||
"cross section":[[0,0],[1000e3,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":"Overriding", "max depth":300e3,"min depth":0, | ||
"coordinates":[[0,-100e3],[0,100e3],[2500e3,100e3],[2500e3,-100e3]], | ||
"temperature models":[ | ||
{"model":"half space model", "min depth":-10e3, "max depth":300e3, "spreading velocity":0.0625, | ||
"top temperature":273, "bottom temperature":-1, | ||
"ridge coordinates": [[0,-100e3],[0,100e3]]}]}, | ||
{ "model":"oceanic plate", "name":"Subducting", "max depth":300e3,"min depth":0, | ||
"coordinates" :[[2500e3,100e3],[2500e3,-100e3],[4500e3,-100e3],[4500e3,100e3]], | ||
"temperature models":[ | ||
{"model":"half space model", "min depth":0, "max depth":300e3, "spreading velocity":0.05, | ||
"top temperature":273, "bottom temperature":-1, | ||
"ridge coordinates": [[4500e3,-100e3],[4500e3,100e3]]}], | ||
"composition models":[ | ||
{"model":"uniform", "compositions":[0], "min depth":0, "max depth":100e3}]}, | ||
{ "model":"subducting plate", "name":"Slab", | ||
"coordinates":[[2500e3,-100e3],[2500e3,100e3]], | ||
"dip point":[0,0],"max depth":1000e3, | ||
"segments":[{"length":350e3,"thickness":[300e3],"top truncation":[-200e3],"angle":[0, 90]}], | ||
"temperature models":[{"model":"mass conserving", "density":3300, "thermal conductivity":3.3, | ||
"adiabatic heating":true,"plate velocity":0.05,"ridge coordinates":[[4500e3,-100e3],[4500e3,100e3]], | ||
"coupling depth":80e3, "shallow dip":30.0, "taper distance":50e3, | ||
"min distance slab top":-50e3, "max distance slab top":300e3}], | ||
"composition models":[ | ||
{"model":"uniform", "compositions":[0], "max distance slab top":100e3}] | ||
} | ||
] | ||
} |
4 changes: 4 additions & 0 deletions
4
tests/app/mass_conserving_slab_temperature_proto/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,4 @@ | ||
# x z d g T | ||
2435e3 0 5e3 10 385.65 | ||
2430e3 0 5e3 10 385.765 | ||
2425e3 0 5e3 10 385.881 |
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