-
Notifications
You must be signed in to change notification settings - Fork 6
Add library of solidus/liquidus parameterizations selectable via melting_dir parameter #658
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.
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
Open
planetmariana
wants to merge
14
commits into
main
Choose a base branch
from
melting_curves_library
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,332
−11
Open
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
86e288d
loads P-T and P-S melting curves
ade1a4a
version with docstrings
a4fa57c
Final script executable
4b8ca60
Modify the donwload routine
a5e7fde
Add description in usage
1945aa5
Set original metling_dir
480cd0e
Check ruff
01db1c4
Fix lint/formatting
0cba4c5
double check testing
4ca6ac8
Merge branch 'main' into melting_curves_library
planetmariana f394895
modify solifus script
ca37dce
ruff check
662f86e
add test for data modifications
a0e7d02
Format test with ruff
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -296,3 +296,40 @@ Environment variables | |
| FWL_DATA: ok | ||
| RAD_DIR: ok | ||
| ``` | ||
|
|
||
| ## Melting Curves | ||
|
|
||
| PROTEUS uses precomputed solidus and liquidus curves from laboratory experiments and theoretical parametrizations of silicate melting. These define the temperatures at which materials begin to melt and become fully molten as a function of pressure. | ||
|
|
||
| ### Available parametrizations | ||
|
|
||
| Available melting_dir options | ||
| ----------------------------- | ||
| The following directory names are supported and should be used exactly as written in the TOML configuration in the 'melting_dir' parameter: | ||
|
|
||
| - andrault_2011 | ||
| - monteux_2016 | ||
| - wolf_bower_2018 | ||
| - katz_2003 | ||
| - fei_2021 | ||
| - belonoshko_2005 | ||
| - fiquet_2010 | ||
| - hirschmann_2000 | ||
| - stixrude_2014 | ||
| - lin_2024 | ||
|
|
||
| ### Generate melting curves | ||
|
|
||
| Before running PROTEUS, generate the lookup tables: | ||
|
|
||
| ```console | ||
| python src/proteus/utils/solidus_func.py --all | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Executable script should be located in |
||
| ``` | ||
planetmariana marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| Alternatively, you can generate a single parametrization using a specific flag (e.g.--katz2003, --lin2024). | ||
|
|
||
| This will compute all parametrizations, convert them to P–T and P–S space, and store them in: | ||
|
|
||
| ```console | ||
| $FWL_DATA/interior_lookup_tables/Melting_curves/ | ||
| ``` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -167,7 +167,7 @@ version = "2.0" | |
| core_density = 10738.33 # Core density [kg m-3] | ||
| core_heatcap = 880.0 # Core specific heat capacity [J K-1 kg-1] | ||
|
|
||
| module = "zalmoxis" # self | zalmoxis | ||
| module = "self" # self | zalmoxis | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why change this? |
||
| update_interval = 0 # max interval (ceiling) between structure updates [yr]; 0 = only at init | ||
| update_min_interval = 0 # min interval (floor) between updates [yr]; prevents thrashing | ||
| update_dtmagma_frac = 0.03 # trigger on relative T_magma change (3%) | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for adding this documentation. It would be worthwhile moving the large comment at the start of
solidus_func.pyinto the documentation where people can more easily see it. This includes the literature references.