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

Commits on Dec 7, 2022

  1. Configuration menu
    Copy the full SHA
    ab388eb View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST: Add default Sorghum values to DCaPST mod…

    …el (taken from Classic).
    joesaddighext committed Dec 7, 2022
    Configuration menu
    Copy the full SHA
    c145900 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    93d15aa View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2022

  1. IntegrateApsimClassicDCaPST: Change the default MaxElectronTransportS…

    …LNRatio from a calculated value (equalling 1.8) to 2.5 as recommended by Alex.
    joesaddigh committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    34bc945 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST: Fix dcaps.apsimx validation model that w…

    …as previously broken by new DCAPS code changes.
    joesaddigh committed Dec 9, 2022
    Configuration menu
    Copy the full SHA
    cc1b67e View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2022

  1. IntegrateApsimClassicDCaPST: 7705 - Extend DCaPST to allow different …

    …types of Crop & Cultivars to be specified. Add sample config for this to the HE3 experiment.
    joesaddigh committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    7394ac8 View commit details
    Browse the repository at this point in the history
  2. 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.
    joesaddigh committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    a0ead35 View commit details
    Browse the repository at this point in the history
  3. IntegrateApsimClassicDCaPST: 7705 - Delete redundant DCaPST model whi…

    …ch has been superseded by the SorghumDCaPST model.
    joesaddigh committed Dec 14, 2022
    Configuration menu
    Copy the full SHA
    d815248 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2022

  1. IntegrateApsimClassicDCaPST: 7705 - Add SowingParametersParser so tha…

    …t model Cultivar overrides can be tested.
    joesaddigh committed Dec 15, 2022
    Configuration menu
    Copy the full SHA
    857f990 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    12e64c9 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2022

  1. Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…

    …to IntegrateApsimClassicDCaPST
    joesaddigh committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    71a15ba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b773b41 View commit details
    Browse the repository at this point in the history
  3. IntegrateApsimClassicDCaPST: 7705 - Move SorghumDCaPST.apsimx to a de…

    …dicated DCaPST directory.
    joesaddigh committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    0fd046b View commit details
    Browse the repository at this point in the history
  4. IntegrateApsimClassicDCaPST: 7705 - Add fresh copy of Wheat before ad…

    …ding DCaPST to the model.
    joesaddigh committed Dec 16, 2022
    Configuration menu
    Copy the full SHA
    0f1667f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4222205 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cbd555f View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2022

  1. Configuration menu
    Copy the full SHA
    6602bb0 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2022

  1. 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.
    joesaddigh committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    079e338 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add missing Cultivars from …

    …the replacements for DCaPST based of off the DCaPST inputs spreadsheet.
    joesaddigh committed Dec 22, 2022
    Configuration menu
    Copy the full SHA
    741befd View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2022

  1. 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.
    joesaddigh committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    9db4de7 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add ICropParameterGenerator…

    … interface so that it can be mocked when testing. Change invalid namespaces (Mixture of DCaPST.Parameters, DCaPST and DCAPST).
    joesaddigh committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    00f4625 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    77a7a4e View commit details
    Browse the repository at this point in the history
  4. IntegrateApsimClassicDCaPST_Wheat: 7705 - Move Generators to their ow…

    …n sub directory. Add DCaPSTModelNGTests.
    joesaddigh committed Dec 23, 2022
    Configuration menu
    Copy the full SHA
    17a4b66 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    bc9f4d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2022

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Complete Sorghum/Wheat Gene…

    …rator tests. Add Classic Default Generators so that they can be used to compare them.
    joesaddigh committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    a7b1c27 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add more tests. Fix seriali…

    …zation issue. Add DCaPST to the wheat validation model.
    joesaddigh committed Dec 28, 2022
    Configuration menu
    Copy the full SHA
    b781a63 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f8ed13d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f17c0aa View commit details
    Browse the repository at this point in the history

Commits on Dec 29, 2022

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add in static ParameterGene…

    …rator (ICropParameterGenerator) so that this can be injected for testing purposes.
    joesaddigh committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    e1b7ba6 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add CultivarParameters fold…

    …er to DCaPST models. Add stub for replacements.
    joesaddigh committed Dec 29, 2022
    Configuration menu
    Copy the full SHA
    231b6bb View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2022

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix unit test so that it ru…

    …ns locally (Windows 11).
    joesaddigh committed Dec 30, 2022
    Configuration menu
    Copy the full SHA
    29e8c32 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    503e4d2 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. 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.
    joesaddigh committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    a3c9773 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Sorghum Daily Compariso…

    …ns (New Vs Old) using exported data from Apsim Classic.
    joesaddigh committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    3fc41b6 View commit details
    Browse the repository at this point in the history
  3. IntegrateApsimClassicDCaPST_Wheat: 7705 - Copy Sorghum/Wheat defaults…

    … exactly as is from classic scripts (within the Classic software).
    joesaddigh committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    fc0c828 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2023

  1. 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.
    joesaddigh committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    436997c View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Further removal of redundan…

    …t fields from NewVsOld graphs.
    joesaddigh committed Jan 5, 2023
    Configuration menu
    Copy the full SHA
    808ff69 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    39f790a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0cb43e0 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2023

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove Cultivar Overrides f…

    …or everything apart from CSH13R as this is the only "Tall" Cultivar according to the Classic implementation.
    joesaddigh committed Jan 6, 2023
    Configuration menu
    Copy the full SHA
    be119c6 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2023

  1. Configuration menu
    Copy the full SHA
    280b518 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6daa8bb View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c5a7609 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…

    …m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat
    joesaddigh committed Jan 11, 2023
    Configuration menu
    Copy the full SHA
    80db1a2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    daf4aaa View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    e545fcd View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    6f4ede3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7ec56e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2023

  1. 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.
    joesaddigh committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    dd4c1e3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0f99e24 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aee0468 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…

    …m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat
    
    # Conflicts:
    #	Models/DCaPST/DCaPSTModelNG.cs
    joesaddigh committed Jan 12, 2023
    Configuration menu
    Copy the full SHA
    3e67a22 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    c548241 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Rectify typo with H7/8 MR35…

    …-1 simulations (Change from HE7CultivarM35-1r to HE7CultivarM35-1 and HE8CultivarM35-1r to HE8CultivarM35-1)
    joesaddigh committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    ecd6bb7 View commit details
    Browse the repository at this point in the history
  2. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Classic simulation outp…

    …uts and generate combined Results.
    joesaddigh committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    d0b715d View commit details
    Browse the repository at this point in the history
  3. IntegrateApsimClassicDCaPST_Wheat: 7705 - Add 2 Classic Daily compari…

    …son graphs (DCaPSTVsNoRootAdj and OldFixedVsNoDCaPST).
    joesaddigh committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    e7e2c3a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f013530 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…

    …to IntegrateApsimClassicDCaPST_Wheat
    joesaddigh committed Jan 18, 2023
    Configuration menu
    Copy the full SHA
    85cf3a2 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix incorrect references of…

    … BiomassWt in graphing.
    joesaddigh committed Jan 19, 2023
    Configuration menu
    Copy the full SHA
    2ce97a5 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2023

  1. Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX in…

    …to IntegrateApsimClassicDCaPST_Wheat
    joesaddigh committed May 25, 2023
    Configuration menu
    Copy the full SHA
    157df80 View commit details
    Browse the repository at this point in the history