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

Strum fixes #9629

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

Strum fixes #9629

wants to merge 118 commits into from

Conversation

HamishBrownPFR
Copy link
Contributor

working on #7869

Xiumei2017 and others added 30 commits January 26, 2024 10:02
@Xiumei2017
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
d6def7e 
…to STRUM

# Conflicts:
#	Tests/Validation/Plantain/Observed.xlsx
@Xiumei2017
observed data for avocado
244112c
@Xiumei2017
observed data
a882b73
@Xiumei2017
observed data
eeb03ef
@Xiumei2017
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
e9e64ab 
…to STRUM
@Xiumei2017
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
10cfcb2 
…ApsimX into STRUM
@Xiumei2017
add avocado datasets by digitizing Teruko' thesis
82b8804
@Xiumei2017
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
376a4cc 
…ApsimX into STRUM
@Xiumei2017
Start add avocado experiments
ba206f7
@Xiumei2017
add Avocado simulations
122bdee
@ekhaembah
Kiwifruit simulation set-up: Correct soils entered, other entries pla…
13249f2 
…ceholders only
@ekhaembah
Added metfiles for the kiwifruit simulations
da0b3da
@Xiumei2017
Add observed yield dat for kiwifruit
51a3ea7
@ekhaembah
Added OutLayers to Kiwifruit smulations
059d1f8
@ekhaembah
Added approx StartGrowth and season-end dates over the Kiwifruit eval…
8a13ef6 
…uation period
@Xiumei2017
add soil water data for Orchard Bay, LIN and OPK
c105381
@ekhaembah
Updated weather files and documented details in respective memos for …
9c1c899 
…the Kiwifruit simulations.
@ekhaembah
Created a folder for weather data and updated path in simulations
b1600da
@Xiumei2017
Add met files for avocado experiments
57dc569
@Xiumei2017
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
0dfae9e 
…ApsimX into STRUM
@Xiumei2017
Add irrigation to simulation orchard OPK and LIN
e246593
@ekhaembah
Renamed soils to "Soil" and added ID memo
a81fa53
@ekhaembah
Renamed the soil for Opotiki Kiwifruit sim - the name has to be Soil …
b0d093d 
…otherwise it crashes
@ekhaembah
Factorial experiment added to Kiwifruit simulations
4a40038
@Xiumei2017
Test observd with predicted yield and SWC data for Kiwi fruit and avo…
6183656 
…cado
@Xiumei2017
Convert sap data to mm and add avocado orchard diamentions
31fbbb9
@Xiumei2017
Better fitted Avocado simulations
4faa886
@Xiumei2017
Better fitted kiwifruit
97c466a
@ekhaembah
Added notes from 19/08/24 meeting
91e0acc
@Xiumei2017
Add met data 2016 to kaitaia and whangarei
9164059
ekhaembah and others added 30 commits October 17, 2024 16:16
@ekhaembah
Observed datafile - Created copied and renamed transpiration, radiati…
cbf8d66 
…on interception and yield columns to align with variable names in simulations, updated .apsim file to reflect the changes
@Xiumei2017
Add apple simulation files
06ea4b4
@Xiumei2017
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
907d8de 
…ApsimX into STRUM

# Conflicts:
#	Prototypes/STRUM/AllObs.xlsx
#	Prototypes/STRUM/STRUM.apsimx
@rcichota
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
16a2012 
…ApsimX into SoilTemperature

# Conflicts:
#	Models/Core/Attributes/DisplayAttribute.cs
#	Prototypes/STRUM/STRUM.apsimx
@rcichota
Add reference to strum type in the list of DisplayAtributes (re-apply…
a493001 
… after updating APSIM)
@rcichota
Remove reference to autoDocumentation in AccumulateFunctionGeneral (d…
3bf22c3 
…eprecated functionality?)
@rcichota
re-uploading strum simulation after bringing it to APSIM's head version
dba28c8
@rcichota
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
0f3c068 
…to STRUMFixes
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
4113ea3 
…to STRUMFixes

# Conflicts:
#	.gitignore
@Xiumei2017
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
8446ee6 
…ApsimX into STRUM

# Conflicts:
#	Prototypes/STRUM/STRUM.apsimx
@Xiumei2017
Add new weather files
a35f226
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
2a63e99 
…to STRUMFixes
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
0a2ac10 
…to STRUMFixes
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
8f8d293 
…to STRUMFixes
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
5cc7c6a 
…to STRUMFixes
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
a1e9ae7 
…to STRUMFixes
@ekhaembah
updated copy of STRUM.apsimx file
386978d
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
bf3b803 
…to STRUMFixes
@HamishBrownPFR
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
cf8bbf4 
…to STRUMFixes

# Conflicts:
#	.gitignore
#	Models/Core/Attributes/DisplayAttribute.cs
#	Prototypes/STRUM/STRUM.apsimx
@HamishBrownPFR
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
bf97655 
…ApsimX into STRUMFixes

# Conflicts:
#	.gitignore
#	Models/Core/Attributes/DisplayAttribute.cs
#	Prototypes/STRUM/STRUM.apsimx
@HamishBrownPFR
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
aeff81c 
…to STRUMFixes

# Conflicts:
#	.gitignore
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
4f21f03 
…to STRUMFixes
@HamishBrownPFR
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
1bc0294 
…to STRUMFixes

# Conflicts:
#	.gitignore
@HamishBrownPFR
Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/…
8d613b9 
…ApsimX into STRUMFixes
@HamishBrownPFR
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
fe52781 
…to STRUMFixes
@HamishBrownPFR
Merge remote-tracking branch 'upstream/master' into STRUMFixes
fb3684f
@HamishBrownPFR
Remove redundant data rows and tabs from obs sheat
85969e6
@HamishBrownPFR
working on scropts
e2ce056
@HamishBrownPFR
Remove invalid characters left over after incomplete conflict merge
c2b951f
@ekhaembah
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
baf07c5 
…to STRUMFixes

# Conflicts:
#	ApsimNG/Classes/Property.cs
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.
4 participants
@HamishBrownPFR @Xiumei2017 @ekhaembah @rcichota