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

Sorghum leaf #6986

Merged
merged 31 commits into from
Dec 12, 2021
Merged

Sorghum leaf #6986

merged 31 commits into from
Dec 12, 2021

Conversation

jbrider
Copy link
Contributor

@jbrider jbrider commented Dec 3, 2021

working on #572

@jbrider
update apsimx file
c45a12c
@jbrider
remove UpdateLeafAreaMethod
6ed9eee 
call updateArea at SetNSupply in sorghumLeaf
@jbrider
Calling extracted LightSenescence function
a1138fe
@jbrider
extracting watersenescence
7de22ca
@jbrider
extracting frost senscence
4164159
@jbrider
extracting ageSenescence
bbee538 
cleaning up code
@jbrider
updates to senescence functions
88ba67d
@jbrider
update to water senescence function
5f635f3
@jbrider
minor cleanup
17860ca
@jbrider
extracting tilleringMethod and leafArea calcs
dba4c1c
@jbrider
Extracting FinalLeafNo calculation to NumberOfLeaves
3751c25
@jbrider
getting leafAppearance working
b533058
@jbrider
extracting leafArea calculations
47ae6f4
@jbrider
add units converter extension for square mm to m
3dc6763
@jbrider
Updating c4maize
ecfdf29
@jbrider
Fixed budnumber = 1 default issue by adding budNumber = 0.0 to every …
8ae0259 
…sow() reference
@jbrider
Fix to LeafNo reference - made minor change
6ecaa19
@jbrider
Moving LeafPartitionCoefficient to DMDemands
f2bdb86 
Moving PArtitionRate to Leaf.Paramaters folder
@jbrider
extracting actualArea calcs
b80c1e3 
fixing phenology stage checks
@jbrider
minor changes to phenology variable definitions
9a357d5
@jbrider
cleaning up unneeded variables
1863337
@jbrider
Merge remote-tracking branch 'root/master' into SorghumLeaf
d29bec0
@jbrider
enable microclimate
e61ca8e
@jbrider
Merge remote-tracking branch 'root/master' into SorghumLeaf
87b35e3 
# Conflicts:
#	Models/PMF/Organs/SorghumLeaf.cs
@jbrider
putting message parameter back in after merge
135b680
@jbrider
Merge remote-tracking branch 'root/master' into SorghumLeaf
9368947
@jbrider
Fix skip row effects on cover green
17ec05d 
update files with changes to master
@jbrider
removing if statements from root code
166a415
@jbrider
Fixes for Cover calculations
b3fd135 
Fix for Water Pheno Stress
@hol430 hol430 mentioned this pull request Dec 9, 2021
Closed
@hol353
Copy link
Contributor

hol353 commented Dec 9, 2021 •
edited
Loading

The stats are different. Can you provide advice on why they are different and whether you're happy with them?

@hol353
Copy link
Contributor

hol353 commented Dec 9, 2021

I came across a PlantAvailableWaterSupply method in Root. It seems to be sorghum specific but isn't used anymore. Can you please remove it if not needed?

@jbrider
Copy link
Contributor Author

jbrider commented Dec 10, 2021

The changes are due to a fix made to the phenology water stress which resulted in changes to the phenology in some water stressed simulations - 2 of which no longer reach harvest. This was an expected outcome that we are happy with. The same change will be made to Classic as well.

@jbrider
Copy link
Contributor Author

jbrider commented Dec 10, 2021

@hol353 This would be a good time to merge.
If it's only comments now, then I will be working on them and improving the documentation before it gets released.

@hol353 hol353 merged commit c8740fb into APSIMInitiative:master Dec 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hol353 hol353 hol353 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jbrider @hol353