Integrate latest DCaPST and Dynamic Tillering changes. #9312

joesaddigh · 2024-09-12T00:29:46Z

This PR addresses some fixes that were made to the Dynamic Tillering routines. It also integrates DCaPST with some tweaks to parameters, as per Alex Wu's instructions.

Working on #7705

This PR also supersedes: #9008

…er to DCaPST models. Add stub for replacements.

…ns locally (Windows 11).

…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.

…t fields from NewVsOld graphs.

…raphs.

…ewVsOld graphs.

…or everything apart from CSH13R as this is the only "Tall" Cultivar according to the Classic implementation.

…ements.

…ST vs NoDCaPST.

…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat

…d tidy up as agreed.

…y up.

…ut line from Clock.

… >= rather than > laiTrigger to match the Classic implementation. Refactor to adopt VS suggestions and add a safety check.

…Check with Jason).

…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat # Conflicts: # Models/DCaPST/DCaPSTModelNG.cs

…change.

…-1 simulations (Change from HE7CultivarM35-1r to HE7CultivarM35-1 and HE8CultivarM35-1r to HE8CultivarM35-1)

…uts and generate combined Results.

…son graphs (DCaPSTVsNoRootAdj and OldFixedVsNoDCaPST).

…y comparison graphs.

…to IntegrateApsimClassicDCaPST_Wheat

… BiomassWt in graphing.

# Conflicts: # Models/Core/ApsimFile/Converter.cs # Tests/UnitTests/Interop/PdfRendering/ParagraphExtensionsTests.cs

joesaddigh · 2024-09-12T01:30:53Z

Just replying to Dean Holzworth's original comment as this PR is a new version of the originally reviewed PR #9008.

I notice in the stats that the sorghum model performance has changed. Does this mean that DCaPST is turned on by default for sorghum simulations? Does this slow down the runtime speed of sorghum?

DCaPST is not turned on by default. You can only enable DCaPST by adding it to the model under the Paddock.
The stats might've changed due to some changes to tillering and the canopy for Sorghum. However, we also removed some experiments that we deemed as unfit for the validation. We also increased the N by allowing certain experiments through the validation that didn't quite make it to Harvest. There were a number that got very very close but didn't reach the harvest stage due to a freeze event.. This has been reviewed by Graeme Hammer.
We are going to profile DCaPST in a separate PR in the near future to try and speed it up and address any bottlenecks.

The stats also show that the number of observations for sorghum has changed, in some cases 'n' has reduced.

As explained above :-)

There are also a bunch of files in this PR that probably aren't needed. Under DCaPST there is a Sorghum and Wheat directory. Are these needed?
There is also an 'old' directory under Tests/Sorghum.

These files have now been removed.

Please let me know if you have any other feedback and we will be happy to address.

Thanks,
Joe

…rs possible.

…erOverride).

…aves.

…ile.,

…tLimitedModifier.

joesaddigh and others added 30 commits December 29, 2022 10:48

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add CultivarParameters fold…

231b6bb

…er to DCaPST models. Add stub for replacements.

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

29e8c32

…ns locally (Windows 11).

IntegrateApsimClassicDCaPST_Wheat: 7705 - Minor name changes.

503e4d2

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add latest Sorghum & Wheat …

a3c9773

…defaults, as per spreadsheet. Start adding Daily Comparisons (New Vs Old) to Wheat model using exported data from Apsim Classic.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Sorghum Daily Compariso…

3fc41b6

…ns (New Vs Old) using exported data from Apsim Classic.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Copy Sorghum/Wheat defaults…

fc0c828

… exactly as is from classic scripts (within the Classic software).

IntegrateApsimClassicDCaPST_Wheat: 7705 - Use latest merge.py that ch…

436997c

…anges the date format for the combined_<Site>.csv. Remove some of the values from the NewVsOld 9 panel graph.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Further removal of redundan…

808ff69

…t fields from NewVsOld graphs.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Changes to Wheat NewVsOld g…

39f790a

…raphs.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add missing Wheat Lincoln N…

0cb43e0

…ewVsOld graphs.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove Cultivar Overrides f…

be119c6

…or everything apart from CSH13R as this is the only "Tall" Cultivar according to the Classic implementation.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove redundant using stat…

280b518

…ements.

brought nextgen dcaps into line with classic code.

6daa8bb

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add comparison between DCaP…

c5a7609

…ST vs NoDCaPST.

Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…

80db1a2

…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat

IntegrateApsimClassicDCaPST_Wheat: 7705 - Integrate Jasons changes an…

daf4aaa

…d tidy up as agreed.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Further refactoring and tid…

e545fcd

…y up.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Remove DoDCAPST commented o…

6f4ede3

…ut line from Clock.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Pre/Post DCaPST to Wheat.

7ec56e7

IntegrateApsimClassicDCaPST_Wheat: 7705 - Change DCAPS SLA trigger to…

dd4c1e3

… >= rather than > laiTrigger to match the Classic implementation. Refactor to adopt VS suggestions and add a safety check.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix GBH error.

0f99e24

IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix GBH error (Attempt 2 - …

aee0468

…Check with Jason).

Merge branch 'IntegrateApsimClassicDCaPST_Wheat' of https://github.co…

3e67a22

…m/joesaddigh/ApsimX into IntegrateApsimClassicDCaPST_Wheat # Conflicts: # Models/DCaPST/DCaPSTModelNG.cs

IntegrateApsimClassicDCaPST_Wheat: 7705 - Slight refactor and naming …

c548241

…change.

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

ecd6bb7

…-1 simulations (Change from HE7CultivarM35-1r to HE7CultivarM35-1 and HE8CultivarM35-1r to HE8CultivarM35-1)

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add Classic simulation outp…

d0b715d

…uts and generate combined Results.

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add 2 Classic Daily compari…

e7e2c3a

…son graphs (DCaPSTVsNoRootAdj and OldFixedVsNoDCaPST).

IntegrateApsimClassicDCaPST_Wheat: 7705 - Add 2 NextGenVsClassic Dail…

f013530

…y comparison graphs.

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

85cf3a2

…to IntegrateApsimClassicDCaPST_Wheat

IntegrateApsimClassicDCaPST_Wheat: 7705 - Fix incorrect references of…

2ce97a5

… BiomassWt in graphing.

joesaddigh and others added 18 commits August 21, 2024 14:11

Remove flag.

fbfc4de

Merge branch 'validation_fixes' into dcapst_with_dt

6d1ae05

My regression and json

4fa6150

Changes to parameters for Root allocation and DCaPST

ad255a5

Updated ApsimX files

cbce8c4

Change location of combined_ApsimFixed.csv file.

fceb14a

Revert Regression.cs to remove ShowStats.

e14f0a5

Remove redundant validation files. Update Sorghum.apsimx.

d9381cc

Add DCaPST validation (copy of Sorghum validation + DCaPST).

a066157

Remove Wheat DCaPST because it was out of date.

785ee4f

Remove Evapotranspiration variable

c1b7dfa

Remove 176 upgrade code temporarily before merging in latest changes.

960237e

Also downgrade files.

97363f3

Also downgrade the resource files.

de94f55

Merge branch 'master' into NewDCaPST

ea30cce

# Conflicts: # Models/Core/ApsimFile/Converter.cs # Tests/UnitTests/Interop/PdfRendering/ParagraphExtensionsTests.cs

Add upgrade to 181 converter code back in.

7322cd3

Add DCaPST reporting variables into the DailyReport.

ddf6803

Fix unit tests. Remove git ignore entries that are now redundant.

f778aba

joesaddigh and others added 11 commits September 13, 2024 11:49

Add Dynamic Tillering ApsimX validation files.

2814979

Fix SLA bounding for tillering and leaf growth reduction.

35dce45

Updated DynamicTillering.apsimx for LE20 4 populations

c8e0ece

Updated Validation simulations

7720e7a

Corrected error in calculating leaf area. Limited the number of tille…

f0dbfea

…rs possible.

fix for security risk

4423582

Add a mechanism for overriding the CalculatedTillerNumber (TillerNumb…

56637ab

…erOverride).

Changed ratioRootShoot

ce2912f

Updated leaf distribution calculations for culms with many and few le…

eadd582

…aves.

Remove talls (CSH13R and M35-1) from SorghumDCaPST validation APSIM f…

48c240e

…ile.,

Add limited modifiers for rubiscoLimitedModifier and electronTranspor…

666a38c

…tLimitedModifier.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Integrate latest DCaPST and Dynamic Tillering changes. #9312

Integrate latest DCaPST and Dynamic Tillering changes. #9312

joesaddigh commented Sep 12, 2024 •

edited

Loading

joesaddigh commented Sep 12, 2024

Integrate latest DCaPST and Dynamic Tillering changes. #9312

Are you sure you want to change the base?

Integrate latest DCaPST and Dynamic Tillering changes. #9312

Conversation

joesaddigh commented Sep 12, 2024 • edited Loading

joesaddigh commented Sep 12, 2024

joesaddigh commented Sep 12, 2024 •

edited

Loading