Code

Strum fixes#9629

Code

Open

HamishBrownPFR wants to merge 118 commits intoAPSIMInitiative:masterAPSIMInitiative/ApsimX:masterfrom PlantandFoodResearch:STRUMFixesPlantandFoodResearch/ApsimX:STRUMFixesCopy head branch name to clipboard

+1,270,978-104,036

Commits

Commits on Jan 25, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUM

  Show description for d6def7e
  Xiumei2017

  committed
  d6def7e

  Copy full SHA for d6def7e

Commits on Jan 30, 2024

• observed data for avocado

  Xiumei2017

  committed
  244112c

  Copy full SHA for 244112c

• observed data

  Xiumei2017

  committed
  a882b73

  Copy full SHA for a882b73

Commits on Jan 31, 2024

• observed data

  Xiumei2017

  committed
  eeb03ef

  Copy full SHA for eeb03ef

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUM

  Xiumei2017

  committed
  e9e64ab

  Copy full SHA for e9e64ab

Commits on Apr 8, 2024

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Xiumei2017

  committed
  10cfcb2

  Copy full SHA for 10cfcb2

Commits on Apr 10, 2024

• add avocado datasets by digitizing Teruko' thesis

  Xiumei2017

  committed
  82b8804

  Copy full SHA for 82b8804

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Xiumei2017

  committed
  376a4cc

  Copy full SHA for 376a4cc

Commits on Jun 25, 2024

• Start add avocado experiments

  Xiumei2017

  committed
  ba206f7

  Copy full SHA for ba206f7

Commits on Jul 10, 2024

• add Avocado simulations

  Xiumei2017

  committed
  122bdee

  Copy full SHA for 122bdee

Commits on Aug 6, 2024

• Kiwifruit simulation set-up: Correct soils entered, other entries placeholders only

  ekhaembah

  committed
  13249f2

  Copy full SHA for 13249f2

Commits on Aug 7, 2024

• Added metfiles for the kiwifruit simulations

  ekhaembah

  committed
  da0b3da

  Copy full SHA for da0b3da

Commits on Aug 13, 2024

• Add observed yield dat for kiwifruit

  Xiumei2017

  committed
  51a3ea7

  Copy full SHA for 51a3ea7

• Added OutLayers to Kiwifruit smulations

  ekhaembah

  committed
  059d1f8

  Copy full SHA for 059d1f8

• Added approx StartGrowth and season-end dates over the Kiwifruit evaluation period

  ekhaembah

  committed
  8a13ef6

  Copy full SHA for 8a13ef6

• add soil water data for Orchard Bay, LIN and OPK

  Xiumei2017

  committed
  c105381

  Copy full SHA for c105381

• Updated weather files and documented details in respective memos for the Kiwifruit simulations.

  ekhaembah

  committed
  9c1c899

  Copy full SHA for 9c1c899

• Created a folder for weather data and updated path in simulations

  ekhaembah

  committed
  b1600da

  Copy full SHA for b1600da

• Add met files for avocado experiments

  Xiumei2017

  committed
  57dc569

  Copy full SHA for 57dc569

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Xiumei2017

  committed
  0dfae9e

  Copy full SHA for 0dfae9e

• Add irrigation to simulation orchard OPK and LIN

  Xiumei2017

  committed
  e246593

  Copy full SHA for e246593

• Renamed soils to "Soil" and added ID memo

  ekhaembah

  committed
  a81fa53

  Copy full SHA for a81fa53

• Renamed the soil for Opotiki Kiwifruit sim - the name has to be Soil otherwise it crashes

  ekhaembah

  committed
  b0d093d

  Copy full SHA for b0d093d

• Factorial experiment added to Kiwifruit simulations

  ekhaembah

  committed
  4a40038

  Copy full SHA for 4a40038

Commits on Aug 15, 2024

• Test observd with predicted yield and SWC data for Kiwi fruit and avocado

  Xiumei2017

  committed
  6183656

  Copy full SHA for 6183656

Commits on Aug 19, 2024

• Convert sap data to mm and add avocado orchard diamentions

  Xiumei2017

  committed
  31fbbb9

  Copy full SHA for 31fbbb9

Commits on Aug 21, 2024

• Better fitted Avocado simulations

  Xiumei2017

  committed
  4faa886

  Copy full SHA for 4faa886

• Better fitted kiwifruit

  Xiumei2017

  committed
  97c466a

  Copy full SHA for 97c466a

Commits on Aug 22, 2024

• Added notes from 19/08/24 meeting

  ekhaembah

  committed
  91e0acc

  Copy full SHA for 91e0acc

• Add met data 2016 to kaitaia and whangarei

  Xiumei2017

  committed
  9164059

  Copy full SHA for 9164059

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Xiumei2017

  committed
  b249c2e

  Copy full SHA for b249c2e

• Add kiwi fruit experiment

  Xiumei2017

  committed
  0ae9fcb

  Copy full SHA for 0ae9fcb

Commits on Aug 23, 2024

• Version after conversation with Gustavo

  Xiumei2017

  committed
  f23369a

  Copy full SHA for f23369a

• Added STRUM_AppleScenarios.apsimx file for reference

  ekhaembah

  committed
  b06eb90

  Copy full SHA for b06eb90

Commits on Aug 26, 2024

• Add avocado and kiwifruit scenario test place holder

  Xiumei2017

  committed
  09221a0

  Copy full SHA for 09221a0

• Add locations

  Xiumei2017

  committed
  400d5b0

  Copy full SHA for 400d5b0

Commits on Aug 27, 2024

• Add met files for scenarios testing

  Xiumei2017

  committed
  bcb1b95

  Copy full SHA for bcb1b95

Commits on Aug 28, 2024

• Add climate files to scenario test files

  Xiumei2017

  committed
  6d6fbe6

  Copy full SHA for 6d6fbe6

Commits on Aug 29, 2024

• Added kiwi fruit sap flow data

  Xiumei2017

  committed
  01072a7

  Copy full SHA for 01072a7

Commits on Sep 11, 2024

• Adding general accumulate function which combines functionality of others

  HamishBrownPFR

  committed
  2eb0b69

  Copy full SHA for 2eb0b69

• fixing bugs

  HamishBrownPFR

  committed
  2d2fc74

  Copy full SHA for 2d2fc74

• Dealing with evergreens a bit better

  HamishBrownPFR

  committed
  aa9b3c2

  Copy full SHA for aa9b3c2

• working on kiwifruit

  HamishBrownPFR

  committed
  048e049

  Copy full SHA for 048e049

• finalising kiwifruit simulations

  HamishBrownPFR

  committed
  6f5ccea

  Copy full SHA for 6f5ccea

Commits on Sep 16, 2024

• Add StrumTreeTypes to properties

  HamishBrownPFR

  committed
  134652a

  Copy full SHA for 134652a

• Make general accum function more general

  HamishBrownPFR

  committed
  5ce745e

  Copy full SHA for 5ce745e

• harmonizing evergreen and decidious approaches

  HamishBrownPFR

  committed
  c2ce979

  Copy full SHA for c2ce979

• tidyup accumulate function

  HamishBrownPFR

  committed
  3d7687f

  Copy full SHA for 3d7687f

• add date for annual triggering of biomass removal

  HamishBrownPFR

  committed
  1a478fb

  Copy full SHA for 1a478fb

• harmonizing tree types

  HamishBrownPFR

  committed
  c3954d8

  Copy full SHA for c3954d8

• Avocado all going agian

  HamishBrownPFR

  committed
  8b3d56d

  Copy full SHA for 8b3d56d

Commits on Sep 18, 2024

• Fix spelling

  HamishBrownPFR

  committed
  abb804f

  Copy full SHA for abb804f

• Fix spelling. Set zone area

  HamishBrownPFR

  committed
  af271bc

  Copy full SHA for af271bc

• Add canopies into zone

  HamishBrownPFR

  committed
  2bc4825

  Copy full SHA for 2bc4825

• Add model to agregate variables over multiple zones

  HamishBrownPFR

  committed
  4077363

  Copy full SHA for 4077363

• Add some variables and graphs

  HamishBrownPFR

  committed
  6223f02

  Copy full SHA for 6223f02

• Make Light profile getable

  HamishBrownPFR

  committed
  1a3f3f9

  Copy full SHA for 1a3f3f9

• fixing trunk demand

  HamishBrownPFR

  committed
  b78e6ea

  Copy full SHA for b78e6ea

• Better trunk DM demand

  HamishBrownPFR

  committed
  ffff72c

  Copy full SHA for ffff72c

Commits on Sep 19, 2024

• Stop using alley zones for avocado and kiwifruit sims. Few tweeks

  HamishBrownPFR

  committed
  9b7e24a

  Copy full SHA for 9b7e24a

Commits on Sep 26, 2024

• Added Kiwifruit and Avocado longterm scenarios

  ekhaembah

  committed
  a4a358a

  Copy full SHA for a4a358a

Commits on Sep 30, 2024

• Kiwifruit long-term scenario simulations

  ekhaembah

  committed
  fab3cd8

  Copy full SHA for fab3cd8

Commits on Oct 2, 2024

• Add missing values to Whangarei met file

  Xiumei2017

  committed
  5a9cc0e

  Copy full SHA for 5a9cc0e

• Add agregrate zone in avocado experiment setup

  Xiumei2017

  committed
  17d6959

  Copy full SHA for 17d6959

Commits on Oct 6, 2024

• Observed file - Adjusted Kiwifruit yield to carter for 7% reject rate; Simulation - removed autoirrigation from simulations with measured irrigation data

  ekhaembah

  committed
  5e400ac

  Copy full SHA for 5e400ac

• Edited Irrigation management for LIN & OPK orchards

  ekhaembah

  committed
  55be85f

  Copy full SHA for 55be85f

Commits on Oct 7, 2024

• Updated avocado simulations

  ekhaembah

  committed
  b9e2ac4

  Copy full SHA for b9e2ac4

• Updated RowZoneReport with SimYear Reset dat

  ekhaembah

  committed
  3015e78

  Copy full SHA for 3015e78

• Updated WeatherFiles with Gisborne, Pukekohe, Ruakura metfiles

  ekhaembah

  committed
  e21c91c

  Copy full SHA for e21c91c

Commits on Oct 8, 2024

• Avocado experiment progress

  Xiumei2017

  committed
  d56a527

  Copy full SHA for d56a527

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Xiumei2017

  committed
  7540e75

  Copy full SHA for 7540e75

• Updated kiwifruit scenarios, AccumWaterStress (Fraction removed at harvest=1)

  ekhaembah

  committed
  7272f6e

  Copy full SHA for 7272f6e

• ignore chick pea data files

  HamishBrownPFR

  committed
  51c1404

  Copy full SHA for 51c1404

• Get Avocado tests working better

  HamishBrownPFR

  committed
  9628e46

  Copy full SHA for 9628e46

• Updated Kaitaia met file

  Xiumei2017

  committed
  ae0e1b1

  Copy full SHA for ae0e1b1

Commits on Oct 9, 2024

• Updated AllObs.xlsx file

  ekhaembah

  committed
  b815a98

  Copy full SHA for b815a98

• Adjusted kiwifruit density & weight

  ekhaembah

  committed
  c28c351

  Copy full SHA for c28c351

• Add Gisborne simulation

  Xiumei2017

  committed
  6d17523

  Copy full SHA for 6d17523

• Adjusted kiwifruit parameters

  ekhaembah

  committed
  8a8a8c6

  Copy full SHA for 8a8a8c6

• Created MeasuredMetFiles folder

  ekhaembah

  committed
  c63aa82

  Copy full SHA for c63aa82

• Updated FarNorth, PNTH, HawkesBay metfiles in kiwifruit simulations

  ekhaembah

  committed
  4fc9820

  Copy full SHA for 4fc9820

• VCSN metfile folder

  ekhaembah

  committed
  97f34e0

  Copy full SHA for 97f34e0

Commits on Oct 10, 2024

• Modified STRUM kl values=0 belowr root depth

  ekhaembah

  committed
  d327f16

  Copy full SHA for d327f16

• Duplicate simulation updated

  ekhaembah

  committed
  c7f9320

  Copy full SHA for c7f9320

Commits on Oct 15, 2024

• Updated observed data (deleted zeroes and spurious SWC data - Orchard_BAY)

  rcichota

  committed
  699b372

  Copy full SHA for 699b372

• Checked and few updates to soil params (mostly Kiwifruit)

  rcichota

  committed
  f80306d

  Copy full SHA for f80306d

Commits on Oct 16, 2024

• Updated obs data file

  ekhaembah

  committed
  42192a9

  Copy full SHA for 42192a9

Commits on Oct 17, 2024

• Updated observed data file

  ekhaembah

  committed
  078b4e4

  Copy full SHA for 078b4e4

• Observed datafile - Created copied and renamed transpiration, radiation interception and yield columns to align with variable names in simulations, updated .apsim file to reflect the changes

  ekhaembah

  committed
  cbf8d66

  Copy full SHA for cbf8d66

Commits on Oct 30, 2024

• Add apple simulation files

  Xiumei2017

  committed
  06ea4b4

  Copy full SHA for 06ea4b4

Commits on Oct 31, 2024

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Show description for 907d8de
  Xiumei2017

  committed
  907d8de

  Copy full SHA for 907d8de

Commits on Nov 13, 2024

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into SoilTemperature

  Show description for 16a2012
  rcichota

  committed
  16a2012

  Copy full SHA for 16a2012

• Add reference to strum type in the list of DisplayAtributes (re-apply after updating APSIM)

  rcichota

  committed
  a493001

  Copy full SHA for a493001

• Remove reference to autoDocumentation in AccumulateFunctionGeneral (deprecated functionality?)

  rcichota

  committed
  3bf22c3

  Copy full SHA for 3bf22c3

• re-uploading strum simulation after bringing it to APSIM's head version

  rcichota

  committed
  dba28c8

  Copy full SHA for dba28c8

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  rcichota

  committed
  0f3c068

  Copy full SHA for 0f3c068

Commits on Nov 25, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  Show description for 4113ea3
  ekhaembah

  committed
  4113ea3

  Copy full SHA for 4113ea3

Commits on Nov 27, 2024

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUM

  Show description for 8446ee6
  Xiumei2017

  committed
  8446ee6

  Copy full SHA for 8446ee6

• Add new weather files

  Xiumei2017

  committed
  a35f226

  Copy full SHA for a35f226

Commits on Nov 28, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  2a63e99

  Copy full SHA for 2a63e99

Commits on Dec 5, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  0a2ac10

  Copy full SHA for 0a2ac10

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  8f8d293

  Copy full SHA for 8f8d293

Commits on Dec 10, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  5cc7c6a

  Copy full SHA for 5cc7c6a

Commits on Dec 12, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  a1e9ae7

  Copy full SHA for a1e9ae7

Commits on Dec 16, 2024

• updated copy of STRUM.apsimx file

  ekhaembah

  committed
  386978d

  Copy full SHA for 386978d

Commits on Dec 20, 2024

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  bf3b803

  Copy full SHA for bf3b803

Commits on Jan 21, 2025

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  Show description for cf8bbf4
  HamishBrownPFR

  committed
  cf8bbf4

  Copy full SHA for cf8bbf4

Commits on Jan 26, 2025

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUMFixes

  Show description for bf97655
  HamishBrownPFR

  committed
  bf97655

  Copy full SHA for bf97655

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  Show description for aeff81c
  HamishBrownPFR

  committed
  aeff81c

  Copy full SHA for aeff81c

Commits on Jan 28, 2025

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  ekhaembah

  committed
  4f21f03

  Copy full SHA for 4f21f03

Commits on Jan 30, 2025

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  Show description for 1bc0294
  HamishBrownPFR

  committed
  1bc0294

  Copy full SHA for 1bc0294

• Merge branch 'STRUMFixes' of https://github.com/PlantandFoodResearch/ApsimX into STRUMFixes

  HamishBrownPFR

  committed
  8d613b9

  Copy full SHA for 8d613b9

Commits on Feb 2, 2025

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  HamishBrownPFR

  committed
  fe52781

  Copy full SHA for fe52781

• Merge remote-tracking branch 'upstream/master' into STRUMFixes

  HamishBrownPFR

  committed
  fb3684f

  Copy full SHA for fb3684f

• Remove redundant data rows and tabs from obs sheat

  HamishBrownPFR

  committed
  85969e6

  Copy full SHA for 85969e6

• working on scropts

  HamishBrownPFR

  committed
  e2ce056

  Copy full SHA for e2ce056

• Remove invalid characters left over after incomplete conflict merge

  HamishBrownPFR

  committed
  c2b951f

  Copy full SHA for c2b951f

Commits on Feb 3, 2025

• Merge branch 'master' of https://github.com/APSIMInitiative/ApsimX into STRUMFixes

  Show description for baf07c5
  ekhaembah

  committed
  baf07c5

  Copy full SHA for baf07c5