Skip to content

Commit

Permalink
adjust function Utilities::calculate_effective_trench_and_plate_ages
Browse files Browse the repository at this point in the history
  • Loading branch information
@lhy11009
lhy11009 committed Mar 12, 2024
1 parent 2361838 commit 8356180
Show file tree
Hide file tree
Showing 30 changed files with 717 additions and 270 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Added a `random` composition in the `continental plate` feature that allows the user to specify a random compositional value to a given compositional field. \[Arushi Saxena; Menno Fraters; 2024-02-26; [#651](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/651)\]

### Changed
- In the "mass conserving" model, change the name of the entry "plate velocity" to "spreading velocity" \[Haoyuan Li; 2024-03-11; [#694](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/694)\]
- Unified the directories `cookbooks/` and `doc/sphinx/user_manual/cookbooks`. All information about cookbooks including the documentation is now bundled in the top-level `cookbooks/` directory. \[Rene Gassmoeller; 2024-02-14; [#558](github.com/GeodynamicWorldBuilder/WorldBuilder/pull/558)\]
- Deleted the deprecated Latex manual. Use the new sphinx documentation instead, which can be build into a .pdf file as well. \[Rene Gassmoeller; 2024-02-14; [#595](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/595)\]
- Relocated the code that is used to calculate spreading center quantities like distance from the ridge, and spreading rate. Currently the spreading rate is just a constant value, but this will be changed in a follow up pull request. \[Daniel Douglas; 2024-02-14; [#590](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/590)\]
Expand Down
3 changes: 2 additions & 1 deletion cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"temperature models":[{"model":"mass conserving",
"reference model name": "plate model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":false,
"plate velocity":0.03,
"spreading velocity":0.03,
"subducting velocity":0.03,
"ridge coordinates":[[[8000e3,-100e3],[8000e3,100e3]]],
"coupling depth":80e3,
"forearc cooling factor":20.0,
Expand Down
3 changes: 2 additions & 1 deletion cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@
{"model":"mass conserving",
"reference model name": "half space model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":true,
"plate velocity":0.05,
"spreading velocity":0.05,
"subducting velocity":0.05,
"ridge coordinates":[[[135,-5],[135,5]]],
"coupling depth":80e3,
"forearc cooling factor":10.0,
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"composition models":[{"model":"uniform", "compositions":[1],"max distance slab top":100e3}]}
],
"temperature models":[
{"model":"mass conserving", "density":3300, "plate velocity":0.02,
{"model":"mass conserving", "density":3300, "spreading velocity":0.02, "subducting velocity":0.02,
"ridge coordinates":[[[5e6,-1],[5e6,2000e3]]],"coupling depth":50e3,
"min distance slab top":-200e3, "max distance slab top":300e3}],
"composition models":[{"model":"uniform", "compositions":[2], "max distance slab top":100e3}]
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/_static/gwb_input_files/BST_17_plume.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"composition models":[{"model":"uniform", "compositions":[1],"max distance slab top":100e3}]}
],
"temperature models":[
{"model":"mass conserving", "density":3300, "plate velocity":0.02,
{"model":"mass conserving", "density":3300, "spreading velocity":0.02, "subducting velocity":0.02,
"ridge coordinates":[[[5e6,-1],[5e6,2000e3]]],"coupling depth":50e3,
"min distance slab top":-200e3, "max distance slab top":300e3}],
"composition models":[{"model":"uniform", "compositions":[2], "max distance slab top":100e3}]
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/_static/gwb_input_files/BST_18_2D_models.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{"length":400e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[60]}],
"composition models":[{"model":"uniform", "compositions":[1],"max distance slab top":100e3}]}
],
"temperature models":[{"model":"mass conserving", "density":3300, "plate velocity":0.02,
"temperature models":[{"model":"mass conserving", "density":3300, "spreading velocity":0.02, "subducting velocity":0.02,
"ridge coordinates":[[[5e6,-1],[5e6,2000e3]]],"coupling depth":50e3,
"min distance slab top":-200e3, "max distance slab top":300e3}],
"composition models":[{"model":"uniform", "compositions":[2], "max distance slab top":100e3}]
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/_static/gwb_input_files/BST_19_spherical_models.wb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{"length":400e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[60]}],
"composition models":[{"model":"uniform", "compositions":[1], "max distance slab top":100e3}]}
],
"temperature models":[{"model":"mass conserving", "density":3300, "plate velocity":0.02,
"temperature models":[{"model":"mass conserving", "density":3300, "spreading velocity":0.02, "subducting velocity":0.02,
"ridge coordinates":[[[30,0],[30,10]]],"coupling depth":50e3,
"min distance slab top":-200e3, "max distance slab top":300e3}],
"composition models":[{"model":"uniform", "compositions":[2], "max distance slab top":100e3}]
Expand Down
40 changes: 20 additions & 20 deletions doc/world_builder_declarations.schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7659,7 +7659,7 @@
"additionalProperties": false,
"required": [
"model",
"plate velocity"
"spreading velocity"
],
"properties": {
"model": {
Expand Down Expand Up @@ -7695,8 +7695,8 @@
"type": "number",
"description": "The reference density of the subducting plate in $kg/m^3$"
},
"plate velocity": {
"description": "The velocity with which the plate subducts in meters per year. Default is 5 cm/yr",
"spreading velocity": {
"description": "The velocity with which the ridge spreads and create the plate in meters per year. Default is 5 cm/yr",
"oneOf": [
{
"default value": 0.05,
Expand Down Expand Up @@ -7744,7 +7744,7 @@
"description": "The velocity with which the ridge is moving through time, and how long the ridge has been moving. First value is the velocity, second is the time. Default is [0 cm/yr, 0 yr]",
"oneOf": [
{
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
},
Expand All @@ -7761,7 +7761,7 @@
"uniqueItems": false,
"description": "",
"items": {
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
}
Expand Down Expand Up @@ -8514,7 +8514,7 @@
"additionalProperties": false,
"required": [
"model",
"plate velocity"
"spreading velocity"
],
"properties": {
"model": {
Expand Down Expand Up @@ -8550,8 +8550,8 @@
"type": "number",
"description": "The reference density of the subducting plate in $kg/m^3$"
},
"plate velocity": {
"description": "The velocity with which the plate subducts in meters per year. Default is 5 cm/yr",
"spreading velocity": {
"description": "The velocity with which the ridge spreads and create the plate in meters per year. Default is 5 cm/yr",
"oneOf": [
{
"default value": 0.05,
Expand Down Expand Up @@ -8599,7 +8599,7 @@
"description": "The velocity with which the ridge is moving through time, and how long the ridge has been moving. First value is the velocity, second is the time. Default is [0 cm/yr, 0 yr]",
"oneOf": [
{
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
},
Expand All @@ -8616,7 +8616,7 @@
"uniqueItems": false,
"description": "",
"items": {
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
}
Expand Down Expand Up @@ -9439,7 +9439,7 @@
"additionalProperties": false,
"required": [
"model",
"plate velocity"
"spreading velocity"
],
"properties": {
"model": {
Expand Down Expand Up @@ -9475,8 +9475,8 @@
"type": "number",
"description": "The reference density of the subducting plate in $kg/m^3$"
},
"plate velocity": {
"description": "The velocity with which the plate subducts in meters per year. Default is 5 cm/yr",
"spreading velocity": {
"description": "The velocity with which the ridge spreads and create the plate in meters per year. Default is 5 cm/yr",
"oneOf": [
{
"default value": 0.05,
Expand Down Expand Up @@ -9524,7 +9524,7 @@
"description": "The velocity with which the ridge is moving through time, and how long the ridge has been moving. First value is the velocity, second is the time. Default is [0 cm/yr, 0 yr]",
"oneOf": [
{
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
},
Expand All @@ -9541,7 +9541,7 @@
"uniqueItems": false,
"description": "",
"items": {
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
}
Expand Down Expand Up @@ -10294,7 +10294,7 @@
"additionalProperties": false,
"required": [
"model",
"plate velocity"
"spreading velocity"
],
"properties": {
"model": {
Expand Down Expand Up @@ -10330,8 +10330,8 @@
"type": "number",
"description": "The reference density of the subducting plate in $kg/m^3$"
},
"plate velocity": {
"description": "The velocity with which the plate subducts in meters per year. Default is 5 cm/yr",
"spreading velocity": {
"description": "The velocity with which the ridge spreads and create the plate in meters per year. Default is 5 cm/yr",
"oneOf": [
{
"default value": 0.05,
Expand Down Expand Up @@ -10379,7 +10379,7 @@
"description": "The velocity with which the ridge is moving through time, and how long the ridge has been moving. First value is the velocity, second is the time. Default is [0 cm/yr, 0 yr]",
"oneOf": [
{
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
},
Expand All @@ -10396,7 +10396,7 @@
"uniqueItems": false,
"description": "",
"items": {
"default value": -1.0,
"default value": 0.05,
"type": "number",
"description": ""
}
Expand Down
Loading

0 comments on commit 8356180

Please sign in to comment.