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.

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

Add new study: Li_2018 #719

Open
wants to merge 29 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
4e9eb8e
Add data
yangsophieee May 19, 2023
33b4461
Update data with seed source site name and fill in some metadata
yangsophieee May 19, 2023
d6faa16
Change seed source information to an entity_context
yangsophieee May 19, 2023
30a7541
Fix units in data file and fill in more metadata
yangsophieee May 19, 2023
0821d12
Add new studies: Data extracted from textual flora descriptions (#701)
ehwenk May 25, 2023
4a57b13
Add new study: RussellSmith_2012 (#702)
yangsophieee May 25, 2023
3fd10d3
Add new studies: Santini_2012; Santini_2013; Santini_2016 (#703)
ehwenk May 26, 2023
15ef184
Add new study: Nano_2011 (#704)
yangsophieee May 26, 2023
57f46fe
Add new study: Enright_2014 (#705)
yangsophieee May 26, 2023
6a730b0
Fire response workshop 2023 (#709)
ehwenk May 30, 2023
c859c95
Add new study: Mitchell_2008 (#706)
ehwenk Jun 1, 2023
dd19033
Add new study: Kocacinar_2003 (#708)
ehwenk Jun 1, 2023
b1a32d3
Add new study: Searson_2004 (#707)
ehwenk Jun 1, 2023
1dc281a
Add new study: Witkowski_1991 (#710)
ehwenk Jun 2, 2023
de31f45
Add new study: Britton_1994 (#712)
ehwenk Jun 3, 2023
359dada
Add new study: Cowling_1987 (#713)
ehwenk Jun 4, 2023
4050503
Add new study: Auld_2000 (#711)
ehwenk Jun 5, 2023
5decbbf
edit metadata_create_template (#716)
ehwenk Jun 6, 2023
a311f6c
add new study: Tsakalos_2022 (#714)
ehwenk Jun 7, 2023
bea3387
Update remake and add supplementary material to raw folder
yangsophieee Jun 7, 2023
9c17cb2
Update metadata.yml
yangsophieee Jun 7, 2023
18debcb
Remove unnecessary context columns
yangsophieee Jun 7, 2023
5c1653b
Change columns that are -MPa to MPA
yangsophieee Jun 7, 2023
7110702
Merge branch 'develop' into Li_2018
ehwenk Jun 7, 2023
1465aec
Update metadata.yml
ehwenk Jun 7, 2023
9097c56
Remove special character
yangsophieee Jun 8, 2023
9c63c32
Fix replicates for `leaf_photosynthetic_rate_per_area_saturated` and …
yangsophieee Jun 8, 2023
ec8a2ae
Fix small formatting
yangsophieee Jun 8, 2023
3c2a64f
Fix unit and add question about hydraulic capacitance units
yangsophieee Jun 15, 2023
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
7 changes: 4 additions & 3 deletions R/setup.R
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@ metadata_create_template <- function(dataset_id,
out$source$primary["key"] = dataset_id
out$source$primary["bibtype"] = "Article"

collectors <- c("last_name", "given_name", "ORCID", "affiliation")

out$contributors <- out$contributors$elements
out$contributors$data_collectors[c(exclude, "notes")] <- NULL
out$contributors$data_collectors[] <- "unknown"
out$contributors$data_collectors <- list(out$contributors$data_collectors)
out$contributors$data_collectors <- list(out$contributors$data_collectors$elements[collectors])
out$contributors$data_collectors[[1]][] <- "unknown"
out$contributors[c("assistants", "austraits_curators")] <- "unknown"

out$dataset <- out$dataset$values[c("data_is_long_format", "custom_R_code", "collection_date", "taxon_name", "location_name",
Expand Down
84,191 changes: 42,374 additions & 41,817 deletions config/taxon_list.csv

Large diffs are not rendered by default.

459 changes: 178 additions & 281 deletions config/traits.yml

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion config/unit_conversions.csv
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ unit_from,unit_to,function
%,{count}/{count},x*.01
{dimensionless},{count}/{count},x*1
a,mo,x*12
mo,a,x/12
mo,a,x*1/12
{count}/m2,{count}/mm2,x*1/1000000
{count}/cm2,{count}/mm2,x*1/100
cm,m,x*0.01
cm,mm,x*10
um,mm,x*0.001
mm,um,x*1000
mm,cm,x*0.1
m,mm,x*1000
cm2,mm2,x*100
m2,mm2,x*1000000
Expand Down Expand Up @@ -133,6 +134,7 @@ cm2{leaf}/cm2{sapwood},mm2{sapwood}/mm2{leaf},1/x
mm2{leaf}/mm2{sapwood},mm2{sapwood}/mm2{leaf},1/x
cm2{leaf}/mm2{sapwood},mm2{sapwood}/mm2{leaf},x*1/100
cm2{sapwood}/m2{leaf},mm2{sapwood}/mm2{leaf},x*1/10000
m2{sapwood}/m2{leaf},mm2{sapwood}/mm2{leaf},x*1
10^4.mm2{sapwood}/mm2{leaf},mm2{sapwood}/mm2{leaf},x*1/10000
MPa,Pa,x*1000
neg_MPa,MPa,x*-1
Expand All @@ -154,6 +156,7 @@ kg/m/MPa/s,10^4.kg/m/MPa/s,x*10000
10^3.kg/m/MPa/s,10^4.kg/m/MPa/s,x*10
ml/cm/MPa/s,10^4.kg/m/MPa/s,x*100
kg/m/Pa/s,kg/m/MPa/s,x*1/1000
kg/mm/MPa/s,kg/m/MPa/s,x*1000
10^6.kg/m/MPa/s,kg/m/MPa/s,x*1/1000000
10^4.kg/m/MPa/s,kg/m/MPa/s,x*1/10000
10^1.kg/m/MPa/s,kg/m/MPa/s,x*0.1
Expand Down
172,842 changes: 172,842 additions & 0 deletions data/ABRS_2023/data.csv

Large diffs are not rendered by default.

Loading