-
Notifications
You must be signed in to change notification settings - Fork 312
add ca fertilization harmonization and ncc compost support #4002
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
divine7022
wants to merge
75
commits into
PecanProject:develop
Choose a base branch
from
divine7022:ncc-compost
base: develop
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.
Open
Changes from all commits
Commits
Show all changes
75 commits
Select commit
Hold shift + click to select a range
5b609f9
rewrite create_n_rate_data data raw script
divine7022 af7171a
refresh n_application_rates csv
divine7022 9079a65
rebuild ca_n_application_rate rda
divine7022 4ba0b09
add oz_per_tree_to_lb_per_acre helper
divine7022 4da526e
add doc for oz_per_tree_to_lb_per_acre
divine7022 00a4ce8
add tpa_lookup helper
divine7022 b738e65
add doc for tpa_lookup
divine7022 70f56c8
rewrite create_compost_data with material class
divine7022 ef7d28c
refresh compost_amendments csv
divine7022 1b96343
rebuild ca_compost_amendment rda
divine7022 36ed147
update doc for ca_compost_amendment
divine7022 3598750
add create_ca_compost_distributions data raw script
divine7022 adc5190
add ca_compost_pct_c_distribution rda
divine7022 9a15db8
add ca_compost_cn_distribution rda
divine7022 e850cee
add ca_compost_app_rate_envelope rda
divine7022 c5cb2ad
add ca_compost_calendar_window rda
divine7022 5e2fff3
add ca_compost_material_whitelist rda
divine7022 e41539f
add doc for ca_compost_pct_c_distribution
divine7022 de0bb71
add doc for ca_compost_cn_distribution
divine7022 9b22635
add doc for ca_compost_app_rate_envelope
divine7022 4dfed63
add doc for ca_compost_calendar_window
divine7022 56a95f6
add doc for ca_compost_material_whitelist
divine7022 ee1ef5e
add sample_ca_compost functions
divine7022 d858456
add doc for sample_ca_compost_pct_c
divine7022 c5d72f0
add doc for sample_ca_compost_cn
divine7022 c353ef5
add doc for sample_ca_compost_app_rate
divine7022 1d24977
add doc for sample_ca_compost_date_offset
divine7022 a71ef65
add doc for sample_ca_compost_material
divine7022 5f5172c
add tests for sample_ca_compost
divine7022 f52c1c3
update bundled dataset docs
divine7022 955e7f1
export new helpers and samplers
divine7022 30e620d
add ncc event type to events schema
divine7022 d0c79ef
update doc for ca_n_application_rate
divine7022 0974b36
update dataset docs
divine7022 d0844c9
update create_compost_data
divine7022 0bd71d9
Merge branch 'develop' into ncc-compost
dlebauer 246fb5b
revert events schema additions; drop ncc as a seperate event
divine7022 f503d37
drop sample_ca_compost functions
divine7022 3fbfcec
drop sample_ca_compost tests
divine7022 81864e8
drop compost distributions build script
divine7022 0b71a7e
drop ca_compost_pct_c_distribution rda
divine7022 daf20d8
drop ca_compost_cn_distribution rda
divine7022 bb138b0
drop ca_compost_app_rate_envelope rda
divine7022 93c7456
drop ca_compost_calendar_window rda
divine7022 eb461d3
drop ca_compost_material_whitelist rda
divine7022 5d4070a
drop doc for ca_compost_pct_c_distribution
divine7022 aec34bf
drop doc for ca_compost_cn_distribution
divine7022 d4567f0
drop doc for ca_compost_app_rate_envelope
divine7022 34a4068
drop doc for ca_compost_calendar_window
divine7022 9a9dcf0
drop doc for ca_compost_material_whitelist
divine7022 7ee162b
drop doc for sample_ca_compost_pct_c
divine7022 6d943fb
drop doc for sample_ca_compost_cn
divine7022 3da67e0
drop doc for sample_ca_compost_app_rate
divine7022 6e025b4
drop doc for sample_ca_compost_date_offset
divine7022 9433f59
drop doc for sample_ca_compost_material
divine7022 0a715a6
drop oz_per_tree_to_lb_per_acre helper
divine7022 2467216
drop doc for oz_per_tree_to_lb_per_acre
divine7022 1e5dbe5
drop tpa_lookup helper
divine7022 aa60cf2
drop doc for tpa_lookup
divine7022 6d3850c
drop docs for removed compost distribution datasets
divine7022 b5c658b
drop namespace exports for removed functions
divine7022 1bc7c15
update look_up_ca_compost_amendment for new column set
divine7022 740cc8c
regen doc for look_up_ca_compost_amendment
divine7022 4150ede
update lookup tests for recovered crops and new compost columns
divine7022 7a59c49
add raw compost tsv to data-raw
divine7022 229b2ac
add raw n fertilization tsv to data-raw
divine7022 ca51a68
read raw compost tsv from data-raw and use ud_convert
divine7022 39ce033
read raw n tsv from data-raw and use ud_convert
divine7022 50c2ffa
rebuild ca_compost_amendment rda
divine7022 0cc6cdf
rebuild ca_n_application_rate rda
divine7022 7b3dd3b
Merge remote-tracking branch 'origin/develop' into ncc-compost
divine7022 76455c1
update news entry to match new compost and n rate columns
divine7022 335031c
update ca_compost_amendment doc to mention material_class
divine7022 fc67a4e
regen doc for ca_compost_amendment
divine7022 b7d07e3
Merge branch 'ncc-compost' of github.com:divine7022/pecan into ncc-co…
divine7022 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
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
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
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 |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| Material C_MIN (C:N) C_MAX (C:N) C_Avg (C:N) C_Assumed (%) Total N (%) 4 week PAN (%) LowerN/HigherN RowsMIN_AppRate (tons/acre) RowsMIN_AppRate (lbs/acre) RowsMIN_Total_N (lbs N/acre) RowsMIN_Avail_N (lbs N/acre) RowsMIN_Total_C (lbs C/acre) RowsMAX_AppRate (tons/acre) RowsMAX_AppRate (lbs/acre) RowsMAX_Total_N (lbs N/acre) RowsMAX_Avail_N (lbs N/acre) RowsMAX_Total_C (lbs C/acre) TreesMIN_AppRate (tons/acre) TreesMIN_AppRate (lbs/acre) TreesMIN_Total_N (lbs N/acre) TreesMIN_Avail_N (lbs N/acre) TreesMIN_Total_C (lbs C/acre) TreesMAX_AppRate (tons/acre) TreesMAX_AppRate (lbs/acre) TreesMAX_Total_N (lbs N/acre) TreesMAX_Avail_N (lbs N/acre) TreesMAX_Total_C (lbs C/acre) Source | ||
| Alfalfa hay 13.00 13.00 13.00 40.00% 3.08 16.15 LOWER 4.00 8000.00 246.15 39.76 98.46 5.30 10600.00 326.15 52.69 130.46 4.00 8000.00 246.15 39.76 98.46 5.30 10600.00 326.15 52.69 130.46 Eghball, UNL Extension | ||
| Apple pomace 21.00 21.00 21.00 40.00% 1.90 -1.43 LOWER 4.00 8000.00 152.38 -2.18 60.95 5.30 10600.00 201.90 -2.88 80.76 4.00 8000.00 152.38 -2.18 60.95 5.30 10600.00 201.90 -2.88 80.76 Eghball, UNL Extension | ||
| Bark 100.00 130.00 115.00 40.00% 0.35 -24.78 LOWER 4.00 8000.00 27.83 -6.90 11.13 5.30 10600.00 36.87 -9.14 14.75 4.00 8000.00 27.83 -6.90 11.13 5.30 10600.00 36.87 -9.14 14.75 Eghball, UNL Extension | ||
| Blood meal 4.00 4.00 4.00 40.00% 10.00 60.00 HIGHER 2.20 4400.00 440.00 264.00 176.00 3.60 7200.00 720.00 432.00 288.00 1.50 3000.00 300.00 180.00 120.00 2.90 5800.00 580.00 348.00 232.00 Eghball, UNL Extension | ||
| Coffee grounds 20.00 20.00 20.00 40.00% 2.00 0.00 LOWER 4.00 8000.00 160.00 0.00 64.00 5.30 10600.00 212.00 0.00 84.80 4.00 8000.00 160.00 0.00 64.00 5.30 10600.00 212.00 0.00 84.80 Eghball, UNL Extension | ||
| Corn cobs 50.00 120.00 85.00 40.00% 0.47 -22.94 LOWER 4.00 8000.00 37.65 -8.64 15.06 5.30 10600.00 49.88 -11.44 19.95 4.00 8000.00 37.65 -8.64 15.06 5.30 10600.00 49.88 -11.44 19.95 Eghball, UNL Extension | ||
| Corn stalks 60.00 70.00 65.00 40.00% 0.62 -20.77 LOWER 4.00 8000.00 49.23 -10.22 19.69 5.30 10600.00 65.23 -13.55 26.09 4.00 8000.00 49.23 -10.22 19.69 5.30 10600.00 65.23 -13.55 26.09 Rynk, NC State Extension | ||
| Corn stalks 80.00 80.00 80.00 40.00% 0.50 -22.50 LOWER 4.00 8000.00 40.00 -9.00 16.00 5.30 10600.00 53.00 -11.93 21.20 4.00 8000.00 40.00 -9.00 16.00 5.30 10600.00 53.00 -11.93 21.20 Eghball, UNL Extension | ||
| Cow manure 20.00 25.00 22.50 40.00% 1.78 -3.33 LOWER 4.00 8000.00 142.22 -4.74 56.89 5.30 10600.00 188.44 -6.28 75.38 4.00 8000.00 142.22 -4.74 56.89 5.30 10600.00 188.44 -6.28 75.38 Rynk, NC State Extension | ||
| Cow manure 20.00 20.00 20.00 40.00% 2.00 0.00 LOWER 4.00 8000.00 160.00 246.15 64.00 5.30 10600.00 212.00 0.00 84.80 4.00 8000.00 160.00 0.00 64.00 5.30 10600.00 212.00 0.00 84.80 Eghball, UNL Extension | ||
| Dry leaves 30.00 80.00 55.00 40.00% 0.73 -19.09 LOWER 4.00 8000.00 58.18 -11.11 23.27 5.30 10600.00 77.09 -14.72 30.84 4.00 8000.00 58.18 -11.11 23.27 5.30 10600.00 77.09 -14.72 30.84 Rynk, NC State Extension | ||
| Fruit waste 35.00 35.00 35.00 40.00% 1.14 -12.86 LOWER 4.00 8000.00 91.43 -11.76 36.57 5.30 10600.00 121.14 -15.58 48.46 4.00 8000.00 91.43 -11.76 36.57 5.30 10600.00 121.14 -15.58 48.46 Eghball, UNL Extension | ||
| Grass 12.00 25.00 18.50 40.00% 2.16 2.43 LOWER 4.00 8000.00 172.97 4.21 69.19 5.30 10600.00 229.19 5.57 91.68 4.00 8000.00 172.97 4.21 69.19 5.30 10600.00 229.19 5.57 91.68 Rynk, NC State Extension | ||
| Grass clippings 12.00 25.00 18.50 40.00% 2.16 2.43 LOWER 4.00 8000.00 172.97 4.21 69.19 5.30 10600.00 229.19 5.57 91.68 4.00 8000.00 172.97 4.21 69.19 5.30 10600.00 229.19 5.57 91.68 Eghball, UNL Extension | ||
| Horse manure 20.00 30.00 25.00 40.00% 1.60 -6.00 LOWER 4.00 8000.00 128.00 -7.68 51.20 5.30 10600.00 169.60 -10.18 67.84 4.00 8000.00 128.00 -7.68 51.20 5.30 10600.00 169.60 -10.18 67.84 Rynk, NC State Extension | ||
| Leaves 40.00 80.00 60.00 40.00% 0.67 -20.00 LOWER 4.00 8000.00 53.33 -10.67 21.33 5.30 10600.00 70.67 -14.13 28.27 4.00 8000.00 53.33 -10.67 21.33 5.30 10600.00 70.67 -14.13 28.27 Eghball, UNL Extension | ||
| Manure — cow and horse 20.00 25.00 22.50 40.00% 1.78 -3.33 LOWER 4.00 8000.00 142.22 -4.74 56.89 5.30 10600.00 188.44 -6.28 75.38 4.00 8000.00 142.22 -4.74 56.89 5.30 10600.00 188.44 -6.28 75.38 Eghball, UNL Extension | ||
| Manure — poultry (fresh) 10.00 10.00 10.00 40.00% 4.00 30.00 HIGHER 2.20 4400.00 176.00 52.80 70.40 3.60 7200.00 288.00 86.40 115.20 1.50 3000.00 120.00 36.00 48.00 2.90 5800.00 232.00 69.60 92.80 Eghball, UNL Extension | ||
| Manure with litter — horse 30.00 60.00 45.00 40.00% 0.89 -16.67 LOWER 4.00 8000.00 71.11 -11.85 28.44 5.30 10600.00 94.22 -15.70 37.69 4.00 8000.00 71.11 -11.85 28.44 5.30 10600.00 94.22 -15.70 37.69 Eghball, UNL Extension | ||
| Manure with litter — poultry 13.00 18.00 15.50 40.00% 2.58 8.71 LOWER 4.00 8000.00 206.45 17.98 82.58 5.30 10600.00 273.55 23.83 109.42 4.00 8000.00 206.45 17.98 82.58 5.30 10600.00 273.55 23.83 109.42 Eghball, UNL Extension | ||
| Newspaper 400.00 800.00 600.00 40.00% 0.07 -29.00 LOWER 4.00 8000.00 5.33 -1.55 2.13 5.30 10600.00 7.07 -2.05 2.83 4.00 8000.00 5.33 -1.55 2.13 5.30 10600.00 7.07 -2.05 2.83 Rynk, NC State Extension | ||
| Newspaper, shredded 400.00 800.00 600.00 40.00% 0.07 -29.00 LOWER 4.00 8000.00 5.33 -1.55 2.13 5.30 10600.00 7.07 -2.05 2.83 4.00 8000.00 5.33 -1.55 2.13 5.30 10600.00 7.07 -2.05 2.83 Eghball, UNL Extension | ||
| Paper 150.00 200.00 175.00 40.00% 0.23 -26.57 LOWER 4.00 8000.00 18.29 -4.86 7.31 5.30 10600.00 24.23 -6.44 9.69 4.00 8000.00 18.29 -4.86 7.31 5.30 10600.00 24.23 -6.44 9.69 Eghball, UNL Extension | ||
| Pine needles 80.00 80.00 80.00 40.00% 0.50 -22.50 LOWER 4.00 8000.00 40.00 -9.00 16.00 5.30 10600.00 53.00 -11.93 21.20 4.00 8000.00 40.00 -9.00 16.00 5.30 10600.00 53.00 -11.93 21.20 Eghball, UNL Extension | ||
| Poultry litter 5.00 20.00 12.50 40.00% 3.20 18.00 LOWER 4.00 8000.00 256.00 46.08 102.40 5.30 10600.00 339.20 61.06 135.68 4.00 8000.00 256.00 46.08 102.40 5.30 10600.00 339.20 61.06 135.68 Rynk, NC State Extension | ||
| Sawdust and wood chips 100.00 500.00 300.00 40.00% 0.13 -28.00 LOWER 4.00 8000.00 10.67 -2.99 4.27 5.30 10600.00 14.13 -3.96 5.65 4.00 8000.00 10.67 -2.99 4.27 5.30 10600.00 14.13 -3.96 5.65 Eghball, UNL Extension | ||
| Straw 40.00 100.00 70.00 40.00% 0.57 -21.43 LOWER 4.00 8000.00 45.71 -9.80 18.29 5.30 10600.00 60.57 -12.98 24.23 4.00 8000.00 45.71 -9.80 18.29 5.30 10600.00 60.57 -12.98 24.23 Rynk, NC State Extension | ||
| Straw — oats and wheat 70.00 80.00 75.00 40.00% 0.53 -22.00 LOWER 4.00 8000.00 42.67 -9.39 17.07 5.30 10600.00 56.53 -12.44 22.61 4.00 8000.00 42.67 -9.39 17.07 5.30 10600.00 56.53 -12.44 22.61 Eghball, UNL Extension | ||
| Swine manure 8.00 20.00 14.00 40.00% 2.86 12.86 LOWER 4.00 8000.00 228.57 29.39 91.43 5.30 10600.00 302.86 38.94 121.14 4.00 8000.00 228.57 29.39 91.43 5.30 10600.00 302.86 38.94 121.14 Rynk, NC State Extension | ||
| Vegetable waste 10.00 20.00 15.00 40.00% 2.67 10.00 LOWER 4.00 8000.00 213.33 21.33 85.33 5.30 10600.00 282.67 28.27 113.07 4.00 8000.00 213.33 21.33 85.33 5.30 10600.00 282.67 28.27 113.07 Rynk, NC State Extension | ||
| Vegetable waste 12.00 20.00 16.00 40.00% 2.50 7.50 LOWER 4.00 8000.00 200.00 15.00 80.00 5.30 10600.00 265.00 19.88 106.00 4.00 8000.00 200.00 15.00 80.00 5.30 10600.00 265.00 19.88 106.00 Eghball, UNL Extension | ||
| Woodchips 100.00 500.00 300.00 40.00% 0.13 -28.00 LOWER 4.00 8000.00 10.67 -2.99 4.27 5.30 10600.00 14.13 -3.96 5.65 4.00 8000.00 10.67 -2.99 4.27 5.30 10600.00 14.13 -3.96 5.65 Rynk, NC State Extension | ||
This file was deleted.
Oops, something went wrong.
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.
This table combines stoichiometric properties with assumed application-rate
scenarios.
Rows*andTrees*application-rate values directly supported bythe cited sources, or did sources provide more granular, species level rates?
Rows*values inca_compost_amendment?compost/organic amendment rates are only available at a broader crop-structure
level?
other organic materials, would
organic_amendments.tsvorcompost_amendments.tsvbe a clearer filename thancompost.tsv?