1181 canopy evaporation is not returned properly

[vgro]

The problem was that part of the canopy water balance were averaged over all canopy layers and therefore returned 1D variables - for the rest to work we require 2D variables. This PR updates interception and canopy evaporation to 3D and includes the understorey layer. I dropped the leaf_drainage for simplification - we assume that all water falls down in one time step (1 day) so it was a bit pointless.

I also got rid of the understorey aerodynamic resistance for now assuming that it is the same as the canopy, and I renamed the aerodynamic resistance of the soil for clarification (see this comment) by @davidorme .

I believe this also fixes #1162 .

Fixes #1181

Type of change

• New feature (non-breaking change which adds functionality)
• Optimization (back-end change that speeds up the code)
• Bug fix (non-breaking change which fixes an issue)

Key checklist

• Make sure you've run the pre-commit checks: $ pre-commit run -a
• All tests pass: $ poetry run pytest

Further checks

• Code is commented, particularly in hard-to-understand areas
• Tests added that prove fix is effective or that feature works
• Relevant documentation reviewed and updated

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 94.96%. Comparing base (f1d1164) to head (e06fd95).

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1227      +/-   ##
===========================================
- Coverage    95.00%   94.96%   -0.04%     
===========================================
  Files           71       71              
  Lines         7271     7273       +2     
===========================================
- Hits          6908     6907       -1     
- Misses         363      366       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[davidorme]

LGTM

[jacobcook1995]

LGTM, just one small thing

[jacobcook1995]

Think this needs a longer description

[davidorme]

Oh hell, they all need a longer description. And units. And proper axes. I think we're gunna need a bigger PR 😄

[davidorme]

@vgro When this merges, does that unstick the problem with the naming changes in #1223?

[vgro]

@vgro When this merges, does that unstick the problem with the naming changes in #1223?

yes it should, see intro :-)