Code

Feature/plants model#312

Code

Merged

davidorme merged 24 commits intodevelopImperialCollegeLondon/virtual_ecosystem:developfrom feature/plants_modelImperialCollegeLondon/virtual_ecosystem:feature/plants_modelCopy head branch name to clipboardSep 12, 2023

+493-101

Commits

Commits on Sep 6, 2023

• Added layer_fapar into canopy model

  davidorme

  committed
  506f20f

  Copy full SHA for 506f20f

• Updating plant model dostrings - start adding irradiance into canopy

  davidorme

  committed
  1cebebf

  Copy full SHA for 1cebebf

• Updated canopy to return fapar placeholders and include irradiance in layer init

  davidorme

  committed
  09c2de8

  Copy full SHA for 09c2de8

• Updated test_canopy and a bug fix on finding already initialised layers

  davidorme

  committed
  cef697c

  Copy full SHA for cef697c

• Added method to set absorbed irradiance

  davidorme

  committed
  6474632

  Copy full SHA for 6474632

• Added PPFD into plant init data fixture in tests

  davidorme

  committed
  b1e45ce

  Copy full SHA for b1e45ce

• Update to set_absorbed_irradiance

  davidorme

  committed
  5543755

  Copy full SHA for 5543755

• Update tests for PlantsModel

  davidorme

  committed
  667ccb8

  Copy full SHA for 667ccb8

Commits on Sep 7, 2023

• Adding canopy_area attribute to Cohort objects

  davidorme

  committed
  a1897bc

  Copy full SHA for a1897bc

• Pad cohort.canopy_area to the n_canopy_layers

  davidorme

  committed
  982cbec

  Copy full SHA for 982cbec

• Add gpp to Cohort attr and type the dict structure of PlantCommunities

  davidorme

  committed
  3108127

  Copy full SHA for 3108127

• Typed cohort.canopy_area as float, updated canopy tests to check canopy area gets padded as expected

  davidorme

  committed
  a35b270

  Copy full SHA for a35b270

• Added p model forcing vars to data fixture in plants conftest.py

  davidorme

  committed
  3d66c53

  Copy full SHA for 3d66c53

• Tidying in plants model - new private attr for canopy layer indices, draft estimate gpp method

  davidorme

  committed
  28e2430

  Copy full SHA for 28e2430

• Updated tests to add estimate_gpp

  davidorme

  committed
  725639b

  Copy full SHA for 725639b

• Added docstrings on cohort attributes

  davidorme

  committed
  266ecd5

  Copy full SHA for 266ecd5

• Docstring and comment updates, fixed sequence of events in update and added test of dbh increment

  davidorme

  committed
  8c5bed7

  Copy full SHA for 8c5bed7

Commits on Sep 8, 2023

• Merge branch 'develop' into local_feature/plant_growth_dummy

  davidorme

  committed
  cb5501c

  Copy full SHA for cb5501c

• Merge branch 'local_feature/plant_growth_dummy' into feature/plants_model

  davidorme

  committed
  13ac8d4

  Copy full SHA for 13ac8d4

• Updated cohort defaults to default_factory to avoid mutability warning on Python 3.11

  davidorme

  committed
  6b21a4c

  Copy full SHA for 6b21a4c

Commits on Sep 11, 2023

• Review fixes: adding approx to tests, iterated lists -> tuples, etc

  davidorme

  committed
  3a0de2f

  Copy full SHA for 3a0de2f

Commits on Sep 12, 2023

• Merge branch 'develop' into feature/plants_model

  davidorme

  authored
  0f1fe3a

  Copy full SHA for 0f1fe3a

• Sneaky missed fixes from soil_depth update

  davidorme

  committed
  b0d4883

  Copy full SHA for b0d4883

• Merge branch 'develop' into feature/plants_model

  davidorme

  authored
  58d8b3c

  Copy full SHA for 58d8b3c