Skip to content

Implement continental geotherm from Chapman (1986) #797

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

Merged
merged 8 commits into from
Jan 21, 2025
Merged

Implement continental geotherm from Chapman (1986) #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f25cca
Implemented continental geotherm from Chapman (1986)
alanjyu Jan 20, 2025
58cdc0d
Fixed parentheses in chapman.cc
alanjyu Jan 21, 2025
b3ba963
Add test files for Chapman geotherm
alanjyu Jan 21, 2025
ac920d5
Added Chapman geotherm in CHANGELOG
alanjyu Jan 21, 2025
c6f326e
Remove unused variable in chapman.cc
alanjyu Jan 21, 2025
526cd1a
Update declared entry for 'chapman' model
alanjyu Jan 21, 2025
4e7d1b6
Update test results
alanjyu Jan 21, 2025
f9876d8
Update declaration document
alanjyu Jan 21, 2025
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 @@ -15,6 +15,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- There is now a CMake variable to automatically update the reference files for failed tests (gdb-dat and gwb-grid tests) \[Menno Fraters; 2024-10-20; [#761](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/761)\]
- There is now a properties_output_size function, which returns the size of the output vector/array returned by the properties functions for a given properties input vector \[Menno Fraters; 2024-10-27; [#765](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/765)\]
- Added 2d and 3d versions of the properties function to the C wrapper \[Menno Fraters; 2024-10-27; [#765](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/765)\]
- Added continental geotherm from Chapman (1986) for the Temperature Model in Continental Plate \[Alan Yu; 2025-01-21; [#778](https://github.com/GeodynamicWorldBuilder/WorldBuilder/issues/778), [#797](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/797)\]

### Changed
- The tian2019 composition model now returns a mass fraction instead of a mass percentage. \[Daniel Douglas; 2024-11-12; [#767](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/767)\]
Expand Down
138 changes: 138 additions & 0 deletions doc/world_builder_declarations.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,144 @@
}
}
},
{
"type": "object",
"description": "Continental geotherm using the steady-state 1-D heat conduction equation from Chapman (1986).",
"additionalProperties": false,
"required": [
"model"
],
"properties": {
"model": {
"default value": "",
"type": "string",
"description": "The name of the temperature model.",
"enum": [
"chapman"
]
},
"operation": {
"default value": "replace",
"type": "string",
"description": "Whether the value should replace any value previously defined at this location (replace), add the value to the previously define value (add) or subtract the value to the previously define value (subtract).",
"enum": [
"replace",
"add",
"subtract"
]
},
"top temperature": {
"default value": 293.15,
"type": "number",
"description": "The temperature at the top surface in K of this feature.If the value is below zero, then an adiabatic temperature is used."
},
"top heat flux": {
"default value": 0.055,
"type": "number",
"description": "The heat flux at the top surface in W m^(-2) of this feature.The default value is 0.055."
},
"thermal conductivity": {
"default value": 2.5,
"type": "number",
"description": "The thermal conductivity in W m^(-1) K^(-1) of this feature.The default value is 2.5."
},
"heat generation per unit volume": {
"default value": 0.000001,
"type": "number",
"description": "The heat generation per unit volume in W m^(-3) of this feature.The default value is 1e-6."
},
"min depth": {
"description": "The depth in m from which the composition of this feature is present.",
"oneOf": [
{
"default value": 0.0,
"type": "number",
"description": ""
},
{
"type": "array",
"minItems": 0,
"maxItems": 4294967295,
"uniqueItems": false,
"description": "",
"items": {
"type": "array",
"additionalProperties": false,
"minItems": 1,
"maxItems": 2,
"description": "",
"items": {
"anyOf": [
{
"type": "number",
"default value": 0.0
},
{
"type": "array",
"minItems": 1,
"maxItems": 4294967295,
"items": {
"type": "array",
"minItems": 1,
"maxItems": 2,
"items": {
"type": "number"
}
}
}
]
}
}
}
]
},
"max depth": {
"description": "The depth in m to which the composition of this feature is present.",
"oneOf": [
{
"default value": 1.7976931348623157e308,
"type": "number",
"description": ""
},
{
"type": "array",
"minItems": 0,
"maxItems": 4294967295,
"uniqueItems": false,
"description": "",
"items": {
"type": "array",
"additionalProperties": false,
"minItems": 1,
"maxItems": 2,
"description": "",
"items": {
"anyOf": [
{
"type": "number",
"default value": 1.7976931348623157e308
},
{
"type": "array",
"minItems": 1,
"maxItems": 4294967295,
"items": {
"type": "array",
"minItems": 1,
"maxItems": 2,
"items": {
"type": "number"
}
}
}
]
}
}
}
]
}
}
},
{
"type": "object",
"description": "Linear temperature model. Can be set to use an adiabatic temperature at the boundaries.",
Expand Down
Loading
Loading