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

Maize leaf #7620

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Maize leaf #7620

wants to merge 19 commits into from

Conversation

hut104
Copy link
Contributor

@hut104 hut104 commented Nov 14, 2022 •
edited
Loading

working on #6726

@hol353
Copy link
Contributor

hol353 commented Nov 14, 2022

retest this please jenkins

@jbrider
Copy link
Contributor

jbrider commented Nov 14, 2022

@APSIMInitiative/reference-panel I bought this to Graeme's attention and he would like to have a discussion about the maize model given we have an established working Nitrogen model around leaf dynamics.

@hut104
Copy link
Contributor Author

hut104 commented Nov 14, 2022

@jbrider Thanks for that.
Currently I am just converting maize to use simple leaf rather than complex leaf as part of our migration to a more maintainable and usable code base. I am not looking to make any major change to the science at this point as I'm just in a 3-day sprint for code maintenance and was looking to sort out some issues raised by users about stress outputs etc.
However, it is worth checking. Are you able to send a link to the code you are suggesting? Would it be a simple change (e.g. adding a different class)?

@jbrider
Copy link
Contributor

jbrider commented Nov 14, 2022

https://github.com/APSIMInitiative/ApsimX/tree/master/Prototypes/C4Maize
This is some of the main work Drew did for us.
It uses the same leaf structure to Sorghum with some changes in parameterisation - so I doubt it is an easy change for the current Maize model.

@par456 par456 mentioned this pull request Jan 22, 2024
Closed
hut104 added 2 commits July 1, 2024 09:49
@hut104
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
c529ec2 
…to MaizeLeaf

# Conflicts:
#	Models/Core/ApsimFile/Converter.cs
#	Models/Resources/AGPBrowntop.json
#	Models/Resources/AGPCocksfoot.json
#	Models/Resources/AGPKikuyu.json
#	Models/Resources/AGPLucerne.json
#	Models/Resources/AGPPaspalum.json
#	Models/Resources/AGPPhalaris.json
#	Models/Resources/AGPRedClover.json
#	Models/Resources/AGPRhodes.json
#	Models/Resources/AGPRyegrass.json
#	Models/Resources/AGPTallFescue.json
#	Models/Resources/AGPWhiteClover.json
#	Models/Resources/Barley.json
#	Models/Resources/Canola.json
#	Models/Resources/Chickpea.json
#	Models/Resources/Chicory.json
#	Models/Resources/Eucalyptus.json
#	Models/Resources/Fertiliser.json
#	Models/Resources/FodderBeet.json
#	Models/Resources/Gliricidia.json
#	Models/Resources/Grapevine.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Angus.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Beef Shorthorn.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Brahman.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/British x Brahman.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/British x Charolais.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/British x Friesian.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/British x Holstein.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Charolais x Friesian.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Charolais x Holstein.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Charolais.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Chianina.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Hereford.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Limousin.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Simmental.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/South Devon.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Ujimqin Cattle.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Ujimqin x Angus (1st cross).json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Ujimqin x Angus (2nd cross).json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Ujimqin x Charolais (1st cross).json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Beef/Ujimqin x Charolais (2nd cross).json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Ayrshire.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Brown Swiss.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Dairy Shorthorn.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Friesian.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Guernsey.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Holstein.json
#	Models/Resources/GrazPlan/Genotypes/Cattle/Dairy/Jersey.json
#	Models/Resources/GrazPlan/Genotypes/Goats/Ujimqin Goats.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Crossbreds/Border Leicester x Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Crossbreds/Dorset x Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Crossbreds/Mongolian x Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Blackface x Whiteface.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Border Leicester.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Cheviot.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Columbia.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Dorset.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Finnsheep.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Hampshire.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Polypay.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Rambouillet.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Ryeland.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Southdown (US).json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Southdown.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Suffolk (US).json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Suffolk.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Texel.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Meat breeds/Ujimqin Sheep.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Corriedale.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Delaine-Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Large Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Medium Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Polwarth.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Romney.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Small Merino.json
#	Models/Resources/GrazPlan/Genotypes/Sheep/Wool breeds/Targhee.json
#	Models/Resources/Maize.json
#	Models/Resources/Mungbean.json
#	Models/Resources/Nutrient.json
#	Models/Resources/Oats.json
#	Models/Resources/OilPalm.json
#	Models/Resources/Peanut.json
#	Models/Resources/Pinus.json
#	Models/Resources/PlantainForage.json
#	Models/Resources/Potato.json
#	Models/Resources/RedClover.json
#	Models/Resources/SCRUM.json
#	Models/Resources/Slurp.json
#	Models/Resources/Sorghum.json
#	Models/Resources/Soybean.json
#	Models/Resources/Sugarcane.json
#	Models/Resources/SurfaceOrganicMatter.json
#	Models/Resources/WaterBalance.json
#	Models/Resources/Wheat.json
#	Models/Resources/WhiteClover.json
@hut104
Merged in 2 years of change!
c22b1e5
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.
3 participants
@hut104 @hol353 @jbrider