Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust function Utilities::calculate_effective_trench_and_plate_ages #694

Merged
merged 1 commit into from
Mar 28, 2024
Merged

adjust function Utilities::calculate_effective_trench_and_plate_ages #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Added

### 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)\]

### Fixed

Expand Down
33 changes: 17 additions & 16 deletions cookbooks/simple_subduction_2d_cartesian/simple_subduction_2d_cartesian.wb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,23 @@
{"model":"subducting plate", "name":"Slab",
"coordinates":[[3500e3,-100e3],[3500e3,100e3]],
"dip point":[0,0],"max depth":1000e3,
"segments":[{"length":200e3,"thickness":[300e3],"top truncation":[-50e3],"angle":[0,30]},
{"length":100e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[30,50]},
{"length":500e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[50,50]},
{"length":300e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[50,10]},
{"length":300e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[10,10]}],
"composition models":[
"segments":[{"length":200e3,"thickness":[300e3],"top truncation":[-50e3],"angle":[0,30]},
{"length":100e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[30,50]},
{"length":500e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[50,50]},
{"length":300e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[50,10]},
{"length":300e3, "thickness":[300e3],"top truncation":[-50e3], "angle":[10,10]}],
"composition models":[
{"model":"uniform", "compositions":[0], "max distance slab top":100e3}],
"temperature models":[{"model":"mass conserving",
"reference model name": "plate model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":false,
"plate velocity":0.03,
"ridge coordinates":[[[8000e3,-100e3],[8000e3,100e3]]],
"coupling depth":80e3,
"forearc cooling factor":20.0,
"taper distance":100e3,
"min distance slab top":-200e3, "max distance slab top":300e3}]
}
"temperature models":[{"model":"mass conserving",
"reference model name": "plate model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":false,
"spreading velocity":0.03,
"subducting velocity":0.03,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you align this?

"ridge coordinates":[[[8000e3,-100e3],[8000e3,100e3]]],
"coupling depth":80e3,
"forearc cooling factor":20.0,
"taper distance":100e3,
"min distance slab top":-200e3, "max distance slab top":300e3}]
}
]
}
51 changes: 26 additions & 25 deletions cookbooks/simple_subduction_2d_chunk/simple_subduction_2d_chunk.wb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,36 @@
"spreading velocity":0.05,
"ridge coordinates":[[[135,-5],[135,5]]]
}],
"composition models":[
"composition models":[
{"model":"uniform", "compositions":[1], "min depth":0, "max depth":100e3}]
},
{ "model":"subducting plate", "name":"Slab",
"coordinates":[[90,-5],[90,5]],
"dip point":[0,0], "max depth":1000e3,
"segments":[
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[0,30]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[30,50]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[50,50]},
{"length":300e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[50,10]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[10,10]},
{"length":300e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[10,150]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[150,150]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[150,90]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[90,90]}
],
"composition models":[
{"model":"uniform", "compositions":[1], "max distance slab top":100e3}],
"temperature models":[
{"model":"mass conserving",
"reference model name": "half space model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":true,
"plate velocity":0.05,
"ridge coordinates":[[[135,-5],[135,5]]],
"coupling depth":80e3,
"forearc cooling factor":10.0,
"taper distance":150e3,
"min distance slab top":-200e3, "max distance slab top":300e3}]
}
"segments":[
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[0,30]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[30,50]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[50,50]},
{"length":300e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[50,10]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[10,10]},
{"length":300e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[10,150]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[150,150]},
{"length":200e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[150,90]},
{"length":100e3, "thickness":[300e3], "top truncation":[-100e3], "angle":[90,90]}
],
"composition models":[
{ "model":"uniform", "compositions":[1], "max distance slab top":100e3}],
"temperature models":[
{ "model":"mass conserving",
"reference model name": "half space model",
"density":3300, "thermal conductivity":3.3,"adiabatic heating":true,
"spreading velocity":0.05,
"subducting velocity":0.05,
"ridge coordinates":[[[135,-5],[135,5]]],
"coupling depth":80e3,
"forearc cooling factor":10.0,
"taper distance":150e3,
"min distance slab top":-200e3, "max distance slab top":300e3}]
}
]
}
2 changes: 1 addition & 1 deletion doc/sphinx/_static/gwb_input_files/BST_16_mass_conserving.wb
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading
Loading