-
Notifications
You must be signed in to change notification settings - Fork 38
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
Shale reference compositions and McLennan 2001 crustal compositions #37
Conversation
While I did add all these files to the refcomp folder, I am not sure if I have to run any scripts to re-populate the Nor am I sure how to update the documentation -- it seems to me that the page on the reference compositions is automatically populated? |
Pull Request Test Coverage Report for Build 1053
💛 - Coveralls |
Thanks @kaarelmand, looks great! I'll have a quick look at the CSVs, but I suspect this should be able to be merged without any issues. If you wanted to check they all import nicely, you could run the To round off the PR, could you add a commit after running the |
On a slight tangent, I have a feeling that soon it will be worth writing up a tutorial about the variety of reference compositions, and their general applicability. Let me know if you're happy to contribute some info for a shale section! |
The documentation example does indeed have an auto-documented list of the reference compositions, so there's no need to update this. Given we now have 31 compositions, this will be something to break out into a new page soon. I've added #38 to this end, and we can address that separately. |
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.
Looks good! These should be able to be directly merged into develop
, and will be released with v0.2.6.
I'm in the process of fixing the .csv files I uploaded earlier. I also added a To Do list in the description. |
a67f2d3
to
8d8908a
Compare
Some musings, so I don't forget: I'm thinking I should probably hold off on adding the conglomerates and sandstones from Condie, 1993 -- I don't know/think that anyone would actually need those compositions. And if someone does, it's very easy to add them in. Seems a bit silly in hindsight.
Sometime in the future, it might be worth thinking of a function that would take a time-series of element concentration data over Earth history, and normalize it to the changing crust in the Archean--Proterozoic. Condie, 1993, actually has 7 different composition brackets through Earth history, even though I only included his eon-averages. |
All right, that should be it for this PR! Not sure if I still have to run any tests or whatnot? |
There's no specific tests for the data files, but I'll pull down the fork and have a look locally. |
@kaarelmand if you could fix the two reference cells for the NASC and PAAS data files I mentioned above and remove the extra text file I think this will then be ready to merge. I'll update the refdb.json after this - have an issue on my side which is likely due to a new version of TinyDB, and I'll update develop to fix this a the same time. |
Whoops, these issues should be fixed now! |
Thanks for this one @kaarelmand! I had to re-update the reference database to pass the tests but everything else looks good. You can see some of the new compositions pop up in the normalization example. |
Some new, mostly shale-based reference compositions for pyrolite.
Description
This PR adds some composition .csv files to the refcomp folder, mainly those concerning shales and other sediments.
Related Issue
Addresses point 2 of issue #35.
Motivation and Context
Pyrolite was previously missing widely-cited shale reference compositions, most notably PAAS. This PR adds those to pyrolite's already extensive reference composition database.
Types of changes
Checklist: