diff --git a/tests/gwb-dat/cartesian_variable_spreading.dat b/tests/gwb-dat/half_space_variable_spreading.dat similarity index 100% rename from tests/gwb-dat/cartesian_variable_spreading.dat rename to tests/gwb-dat/half_space_variable_spreading.dat diff --git a/tests/gwb-dat/cartesian_variable_spreading.wb b/tests/gwb-dat/half_space_variable_spreading.wb similarity index 96% rename from tests/gwb-dat/cartesian_variable_spreading.wb rename to tests/gwb-dat/half_space_variable_spreading.wb index 8d278f6e2..88e7706b3 100644 --- a/tests/gwb-dat/cartesian_variable_spreading.wb +++ b/tests/gwb-dat/half_space_variable_spreading.wb @@ -10,7 +10,7 @@ { "model":"oceanic plate", "name":"Subducting", "max depth":250e3,"min depth":0, "coordinates" :[[500e3, -100e3],[500e3, 100e3],[0, 100e3],[0, -100e3]], "temperature models":[ - {"model":"half space model", "min depth":0, "max depth":100e3, "spreading velocity":[ [0,[[0.001, 0.0005, 0.0001]]], [1,[[0.000005, 0.0005]]] ], + {"model":"half space model", "min depth":0, "max depth":100e3, "spreading velocity":[ [0,[[0.001, 0.0005, 0.0001]]], [1,[[0.000005, 0.05]]] ], "top temperature":273, "ridge coordinates": [[[100e3,-110e3], [150e3, -60e3], [100e3, 0]], [[400e3, 0], [400e3, 110e3]]]}]} ] diff --git a/tests/gwb-dat/cartesian_variable_spreading/screen-output.log b/tests/gwb-dat/half_space_variable_spreading/screen-output.log similarity index 54% rename from tests/gwb-dat/cartesian_variable_spreading/screen-output.log rename to tests/gwb-dat/half_space_variable_spreading/screen-output.log index 8d7356469..44fbb526d 100644 --- a/tests/gwb-dat/cartesian_variable_spreading/screen-output.log +++ b/tests/gwb-dat/half_space_variable_spreading/screen-output.log @@ -3,7 +3,7 @@ 250e3 -60e3 0 50e3 761.356 0 250e3 -30e3 0 50e3 751.596 0 250e3 -1e3 0 50e3 728.246 0 -250e3 1e3 0 50e3 329.759 0 -250e3 30e3 0 50e3 489.645 0 -250e3 60e3 0 50e3 574.848 0 -250e3 90e3 0 50e3 639.408 0 +250e3 1e3 0 50e3 660.065 0 +250e3 30e3 0 50e3 1611.87 0 +250e3 60e3 0 50e3 1683.53 0 +250e3 90e3 0 50e3 1692.43 0 diff --git a/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.dat b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.dat new file mode 100644 index 000000000..1cd727f1d --- /dev/null +++ b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.dat @@ -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 \ No newline at end of file diff --git a/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb new file mode 100644 index 000000000..970e2e9a1 --- /dev/null +++ b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading.wb @@ -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" + } + ] + } + ] +} diff --git a/tests/gwb-dat/mass_conserving_slab_with_variable_spreading/screen-output.log b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading/screen-output.log new file mode 100644 index 000000000..45493d1bb --- /dev/null +++ b/tests/gwb-dat/mass_conserving_slab_with_variable_spreading/screen-output.log @@ -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 diff --git a/tests/gwb-dat/plate_model_variable_spreading.dat b/tests/gwb-dat/plate_model_variable_spreading.dat new file mode 100644 index 000000000..c79f091aa --- /dev/null +++ b/tests/gwb-dat/plate_model_variable_spreading.dat @@ -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 diff --git a/tests/gwb-dat/plate_model_variable_spreading.wb b/tests/gwb-dat/plate_model_variable_spreading.wb new file mode 100644 index 000000000..3d994e44b --- /dev/null +++ b/tests/gwb-dat/plate_model_variable_spreading.wb @@ -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]]]}]} + ] +} diff --git a/tests/gwb-dat/plate_model_variable_spreading/screen-output.log b/tests/gwb-dat/plate_model_variable_spreading/screen-output.log new file mode 100644 index 000000000..a4e928433 --- /dev/null +++ b/tests/gwb-dat/plate_model_variable_spreading/screen-output.log @@ -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