Skip to content

Commit

Permalink
Merge 9b0baa0 into 545bb15
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldouglas92 committed Feb 29, 2024
2 parents 545bb15 + 9b0baa0 commit 3803ef5
Show file tree
Hide file tree
Showing 17 changed files with 8,480 additions and 143 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]
### Added
- Implemented new functionality into the mass conserving slab temperature that allows the temperature to be influenced by the location of a spreading center through time. \[Daniel Douglas; Haoyuan Li; 2024-02-28; [#654](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/654)\]
- Added an option to apply a spline in the mass conserving temperature of the slab. \[Haoyuan Li; 2024-02-27; [#659](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/659)\]
- Added a cookbook tutorial for a simple subduction model in 2D Chunk geometry. \[Magali Billen; 2024-02-16; [#535](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/535)\]
- Added a cookbook tutorial for a simple subduction model in 2D Cartesian geometry. \[Magali Billen; 2024-02-14; [#535](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/535)\]
Expand Down
140 changes: 128 additions & 12 deletions doc/world_builder_declarations.schema.json

Large diffs are not rendered by default.

7,339 changes: 7,339 additions & 0 deletions doc/world_builder_declarations.tex

Large diffs are not rendered by default.

208 changes: 196 additions & 12 deletions doc/world_builder_declarations_closed.md
Original file line number Diff line number Diff line change
Expand Up @@ -8271,7 +8271,7 @@
::::::::::::::{dropdown} /features/items/oneOf/4/temperature models/items/oneOf/2/spreading velocity/oneOf/1
:name: closed_features_items_oneOf_4_temperature-models_items_oneOf_2_spreading-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::::::
Expand Down Expand Up @@ -8302,7 +8302,7 @@
:name: closed_features_items_oneOf_4_temperature-models_items_oneOf_2_spreading-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::::::

::::::::::{dropdown} /features/items/oneOf/4/temperature models/items/oneOf/2/spreading velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -8778,7 +8778,7 @@
::::::::::::::{dropdown} /features/items/oneOf/4/temperature models/items/oneOf/4/spreading velocity/oneOf/1
:name: closed_features_items_oneOf_4_temperature-models_items_oneOf_4_spreading-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::::::
Expand Down Expand Up @@ -8809,7 +8809,7 @@
:name: closed_features_items_oneOf_4_temperature-models_items_oneOf_4_spreading-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::::::

::::::::::{dropdown} /features/items/oneOf/4/temperature models/items/oneOf/4/spreading velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -11256,7 +11256,7 @@
::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/plate velocity/oneOf/1
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::::
Expand Down Expand Up @@ -11287,7 +11287,7 @@
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::::

::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/plate velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -11320,6 +11320,52 @@
::::::::::::


::::::::::::::

::::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity

- **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]
:::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf

::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/1
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_1

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::::

::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
:::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items/items
:name: closed_features_items_oneOf_6_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items_items

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::

:::::::::::

::::::::::::


::::::::::::::

::::::::::::::{dropdown} /features/items/oneOf/6/segments/items/temperature models/items/oneOf/3/coupling depth
Expand Down Expand Up @@ -12410,7 +12456,7 @@
::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/plate velocity/oneOf/1
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_plate-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::::::
Expand Down Expand Up @@ -12441,7 +12487,7 @@
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_plate-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::::::

::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/plate velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -12474,6 +12520,52 @@
::::::::::::::


::::::::::::::::

::::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity

- **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]
:::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity/oneOf
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity_oneOf

::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity/oneOf/1
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity_oneOf_1

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::::::

::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity/oneOf/2
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
:::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items/items
:name: closed_features_items_oneOf_6_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items_items

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::::

:::::::::::::

::::::::::::::


::::::::::::::::

::::::::::::::::{dropdown} /features/items/oneOf/6/temperature models/items/oneOf/3/coupling depth
Expand Down Expand Up @@ -13668,7 +13760,7 @@
::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/plate velocity/oneOf/1
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::
Expand Down Expand Up @@ -13699,7 +13791,7 @@
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::

::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/plate velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -13732,6 +13824,52 @@
::::::::::


::::::::::::

::::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity

- **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]
:::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf

::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/1
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_1

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::

::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
:::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items/items
:name: closed_features_items_oneOf_6_sections_items_segments_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items_items

- **default value**:-1.0
- **type**:number
- **description**:
::::::::

:::::::::

::::::::::


::::::::::::

::::::::::::{dropdown} /features/items/oneOf/6/sections/items/segments/items/temperature models/items/oneOf/3/coupling depth
Expand Down Expand Up @@ -14822,7 +14960,7 @@
::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/plate velocity/oneOf/1
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_1

- **default value**:0.01
- **default value**:0.05
- **type**:number
- **description**:
::::::::::::
Expand Down Expand Up @@ -14853,7 +14991,7 @@
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_plate-velocity_oneOf_2_items_items_anyOf_1

- **type**:number
- **default value**:0.01
- **default value**:0.05
::::::::

::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/plate velocity/oneOf/2/items/items/anyOf/2
Expand Down Expand Up @@ -14886,6 +15024,52 @@
::::::::::::


::::::::::::::

::::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity

- **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]
:::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity/oneOf
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf

::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity/oneOf/1
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_1

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::::

::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
:::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items

- **type**:array
- **minItems**:1
- **maxItems**:4294967295
- **uniqueItems**:false
- **description**:
::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/subducting velocity/oneOf/2/items/items
:name: closed_features_items_oneOf_6_sections_items_temperature-models_items_oneOf_3_subducting-velocity_oneOf_2_items_items

- **default value**:-1.0
- **type**:number
- **description**:
::::::::::

:::::::::::

::::::::::::


::::::::::::::

::::::::::::::{dropdown} /features/items/oneOf/6/sections/items/temperature models/items/oneOf/3/coupling depth
Expand Down

0 comments on commit 3803ef5

Please sign in to comment.