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.

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

Jump to bottom

58 add vcmax as parameter #1916

Closed
wants to merge 165 commits into from
Closed

58 add vcmax as parameter #1916

wants to merge 165 commits into from

Conversation

CannedIce
Copy link

Description

Added photosynthesis parameters to user input files and found a bug in calculation of NSC content with emergence

Checklist - did you ...

  • Add a news fragment file entry if necessary?
  • Add / update tests if necessary?
  • Add new / update outdated documentation?
  • All tests have passed?
  • Formatted code with black?
  • Removed lint reported by flake8?
  • Sucessful documentation built? (if documentation added or modified)

CannedIce and others added 30 commits August 25, 2021 17:04
@CannedIce
Initial changes to replicate crop model in landlab
a5c5f0a
@CannedIce
Initial files created for GenVeg
b51b6ab
@CannedIce
Added growth.py functionality
ceb2968 
growth.py now initializes correctly and structure set up
MainGenVegScript runs
load_veg_params creates Landlab-compatible yaml file of input parameters
@CannedIce
Merge branch 'landlab:master' into Crops
079f8e4
@CannedIce
Merge branch 'landlab:master' into Crops
364fc83
@CannedIce
Added notes
da019a8
@CannedIce
Merge branch 'Crops' of https://github.com/CannedIce/landlab into Crops
83ccf1b
@CannedIce
Merge branch 'landlab:master' into Crops
888eea1
@CannedIce
Fixed __init__
31b3729
@CannedIce
Pushed wrong init
53b81e3
@tswannack
changes made by Todd and Emily to these two files on March 29 2022
a49a066
@tswannack
new file created by Todd and Emily on March 29 2022
75d6493
@tswannack
Merge branch 'Crops' of https://github.com/CannedIce/landlab into Crops
089551c
@tswannack
removing file from todd and emily
e09dd7b
changes Carra made to the Crops model conversion in growth.py
616d88e
@tswannack
updated changes
aff66b8
@tswannack
new input file created by Todd and Emily
0f1e4b2
Carra making changes to the growth parameters
e039604
carra making one small change to the Python numbering of the excell rows
e2f9759
@CannedIce
Minor changes in main script
e06797f
@CannedIce
Merge branch 'Crops' of https://github.com/CannedIce/landlab into Crops
509e7f6
@CannedIce
new dictionary structure
9d0bf46
@tswannack
Delete GenVeg_params_inputs_1col_TS.xlsx
4cfb44e
@tswannack
new file with variable names
5a8ad32
growth_ER.py
c1058aa
@CannedIce
Fixed dictionary structure
7c6a077
@CannedIce
Merge branch 'Crops' of https://github.com/CannedIce/landlab into Crops
3a9e6a1
@CannedIce
Added error checks to growth and make_veg_params.
c3e0771 
Added private method to make_veg_params to build sub dictionaries.
Removed extra GenVeg folder.
@CannedIce
Modified parameters, added allocation & mortality
f9e0e32
@CannedIce
Added fields to grid, tried to fix init error
fd571c4
CannedIce and others added 28 commits January 5, 2024 15:46
@CannedIce
Merge branch 'landlab:master' into veg_species
d3885ec
@CannedIce
Merge pull request #43 from CannedIce/42-senesce-bug
f872cd4 
42 senesce bug
Patched photosynthesis_test.py from branch 40 to branch 44
1817d4e
Photosynthesis_test.py updated to test all equations in photosynthesi…
ac15435 
…s.py
@CannedIce
Calculate width and height separately
6232206
@CannedIce
Merge branch '44-graminoid-allometric-relationship-bug' of https://gi…
ff0e51b 
…thub.com/CannedIce/landlab into 44-graminoid-allometric-relationship-bug
@CannedIce
Changed lai used in gphot, allometry with crown area
d5ceadd
@CannedIce
Edited photosynthesis to calc gphot from leaf area
a4844d2
@CannedIce
Merge pull request #45 from CannedIce/44-graminoid-allometric-relatio…
9224323 
…nship-bug

44 graminoid allometric relationship bug
@acatlett8
quick fix for mortality function
a470245
@acatlett8
DRY principle
f4f4ccc
@CannedIce
Made notes in mortality
d591251
Broke mortality into 2 functions: whole plant mortality and leaf mort…
2201b65 
…ality from shade
@CannedIce
summed dead leaf biomass and removed from leaf, added lai crit to inputs
c16fbd9
@CannedIce
Merge pull request #47 from CannedIce/46-lai-induced-leaf-mortality
e03c018 
46 lai induced leaf mortality
@CannedIce
added more checks for nans and infs throughout
a2d2bcd
@emrebruss89
Merge pull request #49 from CannedIce/48-photosynthesis-carbohydrate-…
643c304 
…biomass-bug

Photosythesis producing too much carb
@acatlett8
Merge branch 'veg_species' into EG-2-resolve-overflow-errors
9a7c554
@CannedIce
Merge branch 'landlab:master' into veg_species
93aac39
@CannedIce
Added new tests and source doc
df85550
@CannedIce
Added reqd files, tested Photosythesis.py, fixed bugs in photosynthes…
fc4493c 
…is methods
@CannedIce
Changes to allow pytest to run from successfully from command line
31ba7ec
@tswannack
Merge pull request #54 from CannedIce/51-photosynthesis-testing
87ef238 
51 photosynthesis testing
@CannedIce
Redid the dead age tracking method for decomp
3b853cb
@CannedIce
Merge branch 'veg_species' into 55-litter-decomp-and-dead-accounting-bug
91fb7e5
@CannedIce
Merge pull request #56 from CannedIce/55-litter-decomp-and-dead-accou…
dd712e8 
…nting-bug

Redid the dead age tracking method for decomp
@CannedIce
Fixed rubisco bug
2433bab
@CannedIce
Updated photo testing and fixed nsc bug
50a398a
@CannedIce CannedIce closed this Apr 23, 2024
@CannedIce CannedIce deleted the 58-add-vcmax-as-parameter branch April 23, 2024 19:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@CannedIce @tswannack @cccarrillo @acatlett8 @emrebruss89