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.

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

Integrate apsim classic DCaPST #7713

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

Conversation

joesaddigh
Copy link

Working on #7705

joesaddighext and others added 30 commits December 7, 2022 12:19
…LNRatio from a calculated value (equalling 1.8) to 2.5 as recommended by Alex.
…as previously broken by new DCAPS code changes.
…types of Crop & Cultivars to be specified. Add sample config for this to the HE3 experiment.
…r via a string rather than multiple GetChild calls. Add Replacements to model to set the Cultivar settings for both the M35-1 & CSH13R Cultivars.
…ch has been superseded by the SorghumDCaPST model.
…phs and add Annotations/Memos to the corresponding sites that are missing simulations from the Classic DCaPST wheat validation. Remove DCaPST from model.
…the replacements for DCaPST based of off the DCaPST inputs spreadsheet.
…the DCaPSTParameters based on the crop type selected. Hide all of the DCaPSTParameters from the UI, apart from the CropName. Add an onchange event. Move TemperatureResponseValues into its own file.
… interface so that it can be mocked when testing. Change invalid namespaces (Mixture of DCaPST.Parameters, DCaPST and DCAPST).
…rator tests. Add Classic Default Generators so that they can be used to compare them.
…zation issue. Add DCaPST to the wheat validation model.
…rator (ICropParameterGenerator) so that this can be injected for testing purposes.
…er to DCaPST models. Add stub for replacements.
joesaddigh and others added 30 commits December 30, 2022 09:21
…defaults, as per spreadsheet. Start adding Daily Comparisons (New Vs Old) to Wheat model using exported data from Apsim Classic.
…ns (New Vs Old) using exported data from Apsim Classic.
… exactly as is from classic scripts (within the Classic software).
…anges the date format for the combined_<Site>.csv. Remove some of the values from the NewVsOld 9 panel graph.
…or everything apart from CSH13R as this is the only "Tall" Cultivar according to the Classic implementation.
… >= rather than > laiTrigger to match the Classic implementation. Refactor to adopt VS suggestions and add a safety check.
…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat

# Conflicts:
#	Models/DCaPST/DCaPSTModelNG.cs
…-1 simulations (Change from HE7CultivarM35-1r to HE7CultivarM35-1 and HE8CultivarM35-1r to HE8CultivarM35-1)
…son graphs (DCaPSTVsNoRootAdj and OldFixedVsNoDCaPST).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants