-
Notifications
You must be signed in to change notification settings - Fork 167
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
Integrate apsim classic DCaPST #7713
Commits on Dec 7, 2022
-
IntegrateApsimClassicDCaPST: Manual merge of classic code.
joesaddighext committedDec 7, 2022 Configuration menu - View commit details
-
Copy full SHA for ab388eb - Browse repository at this point
Copy the full SHA ab388ebView commit details -
IntegrateApsimClassicDCaPST: Add default Sorghum values to DCaPST mod…
…el (taken from Classic).
joesaddighext committedDec 7, 2022 Configuration menu - View commit details
-
Copy full SHA for c145900 - Browse repository at this point
Copy the full SHA c145900View commit details -
IntegrateApsimClassicDCaPST: Add start of DCaPST validation model.
joesaddighext committedDec 7, 2022 Configuration menu - View commit details
-
Copy full SHA for 93d15aa - Browse repository at this point
Copy the full SHA 93d15aaView commit details
Commits on Dec 9, 2022
-
IntegrateApsimClassicDCaPST: Change the default MaxElectronTransportS…
…LNRatio from a calculated value (equalling 1.8) to 2.5 as recommended by Alex.
Configuration menu - View commit details
-
Copy full SHA for 34bc945 - Browse repository at this point
Copy the full SHA 34bc945View commit details -
IntegrateApsimClassicDCaPST: Fix dcaps.apsimx validation model that w…
…as previously broken by new DCAPS code changes.
Configuration menu - View commit details
-
Copy full SHA for cc1b67e - Browse repository at this point
Copy the full SHA cc1b67eView commit details
Commits on Dec 14, 2022
-
IntegrateApsimClassicDCaPST: 7705 - Extend DCaPST to allow different …
…types of Crop & Cultivars to be specified. Add sample config for this to the HE3 experiment.
Configuration menu - View commit details
-
Copy full SHA for 7394ac8 - Browse repository at this point
Copy the full SHA 7394ac8View commit details -
IntegrateApsimClassicDCaPST: 7705 - Fix issue referencing the Cultiva…
…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.
Configuration menu - View commit details
-
Copy full SHA for a0ead35 - Browse repository at this point
Copy the full SHA a0ead35View commit details -
IntegrateApsimClassicDCaPST: 7705 - Delete redundant DCaPST model whi…
…ch has been superseded by the SorghumDCaPST model.
Configuration menu - View commit details
-
Copy full SHA for d815248 - Browse repository at this point
Copy the full SHA d815248View commit details
Commits on Dec 15, 2022
-
IntegrateApsimClassicDCaPST: 7705 - Add SowingParametersParser so tha…
…t model Cultivar overrides can be tested.
Configuration menu - View commit details
-
Copy full SHA for 857f990 - Browse repository at this point
Copy the full SHA 857f990View commit details -
Configuration menu - View commit details
-
Copy full SHA for 12e64c9 - Browse repository at this point
Copy the full SHA 12e64c9View commit details
Commits on Dec 16, 2022
-
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
…to IntegrateApsimClassicDCaPST
Configuration menu - View commit details
-
Copy full SHA for 71a15ba - Browse repository at this point
Copy the full SHA 71a15baView commit details -
IntegrateApsimClassicDCaPST: 7705 - Make test helper functions static…
… and add extra region.
Configuration menu - View commit details
-
Copy full SHA for b773b41 - Browse repository at this point
Copy the full SHA b773b41View commit details -
IntegrateApsimClassicDCaPST: 7705 - Move SorghumDCaPST.apsimx to a de…
…dicated DCaPST directory.
Configuration menu - View commit details
-
Copy full SHA for 0fd046b - Browse repository at this point
Copy the full SHA 0fd046bView commit details -
IntegrateApsimClassicDCaPST: 7705 - Add fresh copy of Wheat before ad…
…ding DCaPST to the model.
Configuration menu - View commit details
-
Copy full SHA for 0f1667f - Browse repository at this point
Copy the full SHA 0f1667fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4222205 - Browse repository at this point
Copy the full SHA 4222205View commit details -
Configuration menu - View commit details
-
Copy full SHA for cbd555f - Browse repository at this point
Copy the full SHA cbd555fView commit details
Commits on Dec 21, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 6602bb0 - Browse repository at this point
Copy the full SHA 6602bb0View commit details
Commits on Dec 22, 2022
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove individual Wheat gra…
…phs and add Annotations/Memos to the corresponding sites that are missing simulations from the Classic DCaPST wheat validation. Remove DCaPST from model.
Configuration menu - View commit details
-
Copy full SHA for 079e338 - Browse repository at this point
Copy the full SHA 079e338View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add missing Cultivars from …
…the replacements for DCaPST based of off the DCaPST inputs spreadsheet.
Configuration menu - View commit details
-
Copy full SHA for 741befd - Browse repository at this point
Copy the full SHA 741befdView commit details
Commits on Dec 23, 2022
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add mechanism for changing …
…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.
Configuration menu - View commit details
-
Copy full SHA for 9db4de7 - Browse repository at this point
Copy the full SHA 9db4de7View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add ICropParameterGenerator…
… interface so that it can be mocked when testing. Change invalid namespaces (Mixture of DCaPST.Parameters, DCaPST and DCAPST).
Configuration menu - View commit details
-
Copy full SHA for 00f4625 - Browse repository at this point
Copy the full SHA 00f4625View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - First stab at adding Wheat …
…Validation defaults.
Configuration menu - View commit details
-
Copy full SHA for 77a7a4e - Browse repository at this point
Copy the full SHA 77a7a4eView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Move Generators to their ow…
…n sub directory. Add DCaPSTModelNGTests.
Configuration menu - View commit details
-
Copy full SHA for 17a4b66 - Browse repository at this point
Copy the full SHA 17a4b66View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add stub Sorghum/Wheat Gene…
…rator test classes.
Configuration menu - View commit details
-
Copy full SHA for bc9f4d5 - Browse repository at this point
Copy the full SHA bc9f4d5View commit details
Commits on Dec 28, 2022
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Complete Sorghum/Wheat Gene…
…rator tests. Add Classic Default Generators so that they can be used to compare them.
Configuration menu - View commit details
-
Copy full SHA for a7b1c27 - Browse repository at this point
Copy the full SHA a7b1c27View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add more tests. Fix seriali…
…zation issue. Add DCaPST to the wheat validation model.
Configuration menu - View commit details
-
Copy full SHA for b781a63 - Browse repository at this point
Copy the full SHA b781a63View commit details -
Configuration menu - View commit details
-
Copy full SHA for f8ed13d - Browse repository at this point
Copy the full SHA f8ed13dView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix build issue (lack of co…
…mments on class name).
Configuration menu - View commit details
-
Copy full SHA for f17c0aa - Browse repository at this point
Copy the full SHA f17c0aaView commit details
Commits on Dec 29, 2022
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add in static ParameterGene…
…rator (ICropParameterGenerator) so that this can be injected for testing purposes.
Configuration menu - View commit details
-
Copy full SHA for e1b7ba6 - Browse repository at this point
Copy the full SHA e1b7ba6View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add CultivarParameters fold…
…er to DCaPST models. Add stub for replacements.
Configuration menu - View commit details
-
Copy full SHA for 231b6bb - Browse repository at this point
Copy the full SHA 231b6bbView commit details
Commits on Dec 30, 2022
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix unit test so that it ru…
…ns locally (Windows 11).
Configuration menu - View commit details
-
Copy full SHA for 29e8c32 - Browse repository at this point
Copy the full SHA 29e8c32View commit details -
Configuration menu - View commit details
-
Copy full SHA for 503e4d2 - Browse repository at this point
Copy the full SHA 503e4d2View commit details
Commits on Jan 4, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add latest Sorghum & Wheat …
…defaults, as per spreadsheet. Start adding Daily Comparisons (New Vs Old) to Wheat model using exported data from Apsim Classic.
Configuration menu - View commit details
-
Copy full SHA for a3c9773 - Browse repository at this point
Copy the full SHA a3c9773View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Sorghum Daily Compariso…
…ns (New Vs Old) using exported data from Apsim Classic.
Configuration menu - View commit details
-
Copy full SHA for 3fc41b6 - Browse repository at this point
Copy the full SHA 3fc41b6View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Copy Sorghum/Wheat defaults…
… exactly as is from classic scripts (within the Classic software).
Configuration menu - View commit details
-
Copy full SHA for fc0c828 - Browse repository at this point
Copy the full SHA fc0c828View commit details
Commits on Jan 5, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Use latest merge.py that ch…
…anges the date format for the combined_<Site>.csv. Remove some of the values from the NewVsOld 9 panel graph.
Configuration menu - View commit details
-
Copy full SHA for 436997c - Browse repository at this point
Copy the full SHA 436997cView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Further removal of redundan…
…t fields from NewVsOld graphs.
Configuration menu - View commit details
-
Copy full SHA for 808ff69 - Browse repository at this point
Copy the full SHA 808ff69View commit details -
Configuration menu - View commit details
-
Copy full SHA for 39f790a - Browse repository at this point
Copy the full SHA 39f790aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0cb43e0 - Browse repository at this point
Copy the full SHA 0cb43e0View commit details
Commits on Jan 6, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove Cultivar Overrides f…
…or everything apart from CSH13R as this is the only "Tall" Cultivar according to the Classic implementation.
Configuration menu - View commit details
-
Copy full SHA for be119c6 - Browse repository at this point
Copy the full SHA be119c6View commit details
Commits on Jan 11, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 280b518 - Browse repository at this point
Copy the full SHA 280b518View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6daa8bb - Browse repository at this point
Copy the full SHA 6daa8bbView commit details -
Configuration menu - View commit details
-
Copy full SHA for c5a7609 - Browse repository at this point
Copy the full SHA c5a7609View commit details -
Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…
…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat
Configuration menu - View commit details
-
Copy full SHA for 80db1a2 - Browse repository at this point
Copy the full SHA 80db1a2View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Integrate Jasons changes an…
…d tidy up as agreed.
Configuration menu - View commit details
-
Copy full SHA for daf4aaa - Browse repository at this point
Copy the full SHA daf4aaaView commit details -
Configuration menu - View commit details
-
Copy full SHA for e545fcd - Browse repository at this point
Copy the full SHA e545fcdView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove DoDCAPST commented o…
…ut line from Clock.
Configuration menu - View commit details
-
Copy full SHA for 6f4ede3 - Browse repository at this point
Copy the full SHA 6f4ede3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7ec56e7 - Browse repository at this point
Copy the full SHA 7ec56e7View commit details
Commits on Jan 12, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Change DCAPS SLA trigger to…
… >= rather than > laiTrigger to match the Classic implementation. Refactor to adopt VS suggestions and add a safety check.
Configuration menu - View commit details
-
Copy full SHA for dd4c1e3 - Browse repository at this point
Copy the full SHA dd4c1e3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0f99e24 - Browse repository at this point
Copy the full SHA 0f99e24View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix GBH error (Attempt 2 - …
…Check with Jason).
Configuration menu - View commit details
-
Copy full SHA for aee0468 - Browse repository at this point
Copy the full SHA aee0468View commit details -
Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…
…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat # Conflicts: # Models/DCaPST/DCaPSTModelNG.cs
Configuration menu - View commit details
-
Copy full SHA for 3e67a22 - Browse repository at this point
Copy the full SHA 3e67a22View commit details -
Configuration menu - View commit details
-
Copy full SHA for c548241 - Browse repository at this point
Copy the full SHA c548241View commit details
Commits on Jan 18, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Rectify typo with H7/8 MR35…
…-1 simulations (Change from HE7CultivarM35-1r to HE7CultivarM35-1 and HE8CultivarM35-1r to HE8CultivarM35-1)
Configuration menu - View commit details
-
Copy full SHA for ecd6bb7 - Browse repository at this point
Copy the full SHA ecd6bb7View commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Classic simulation outp…
…uts and generate combined Results.
Configuration menu - View commit details
-
Copy full SHA for d0b715d - Browse repository at this point
Copy the full SHA d0b715dView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add 2 Classic Daily compari…
…son graphs (DCaPSTVsNoRootAdj and OldFixedVsNoDCaPST).
Configuration menu - View commit details
-
Copy full SHA for e7e2c3a - Browse repository at this point
Copy the full SHA e7e2c3aView commit details -
IntegrateApsimClassicDCaPST_Wheat: 7705 - Add 2 NextGenVsClassic Dail…
…y comparison graphs.
Configuration menu - View commit details
-
Copy full SHA for f013530 - Browse repository at this point
Copy the full SHA f013530View commit details -
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
…to IntegrateApsimClassicDCaPST_Wheat
Configuration menu - View commit details
-
Copy full SHA for 85cf3a2 - Browse repository at this point
Copy the full SHA 85cf3a2View commit details
Commits on Jan 19, 2023
-
IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix incorrect references of…
… BiomassWt in graphing.
Configuration menu - View commit details
-
Copy full SHA for 2ce97a5 - Browse repository at this point
Copy the full SHA 2ce97a5View commit details
Commits on May 25, 2023
-
Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…
…to IntegrateApsimClassicDCaPST_Wheat
Configuration menu - View commit details
-
Copy full SHA for 157df80 - Browse repository at this point
Copy the full SHA 157df80View commit details