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.

Sign up for GitHub

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

Jump to bottom

Adding new BaseModel structure into the abiotic model. #382

Merged
merged 44 commits into from
Feb 6, 2024
Merged

Adding new BaseModel structure into the abiotic model. #382

merged 44 commits into from
Feb 6, 2024

Conversation

davidorme
Copy link
Collaborator

@davidorme davidorme commented Feb 6, 2024 •
edited
Loading

Description

This PR updates the code in the feature/new_abiotic_model branch to the current develop including the new BaseModel architecture.

@vgro - because this brings in develop there are a lot of changes, but this PR seemed the easiest way to make changes to your branch. You can see what changes in the individual models and tests you're working on. I don't think there is anything controversial (apart from that the components all have long names).

The end result of merging this PR will be that the new_abiotic_branch is up to date with develop and all the tests run.

Fixes #381

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

@davidorme
Draft implementation of CoreComponents
685e42b
@davidorme
Doc fixes
f5f6a20
@davidorme
Forgot to add new tests file
4a70211
@davidorme
Extending and fixing tests
01fc628
@davidorme
Updating callable signatures to use CoreComponents - not unpacked yet.
9513801
@davidorme
Updating main to use CoreComponents
45ac49a
@davidorme
Unpacking core components into new BaseModel attributes
9a76bba
@davidorme
Revising docstrings
548c849
@davidorme
MoarRevising docstrings
adaf95b
@davidorme
Updating Plants Model
b96e68e
@davidorme
Updating soils model
be73d57
@davidorme
Updating litter model
9f2c892
@davidorme
Updated hydrology_model
42d8bbc
@davidorme
Updated abiotic_simple_model
53153fd
@davidorme
Added n_layers to LayerStructure
a5cd8bd
@davidorme
Use n_layers in models
4359c6e
@davidorme
Updated animal model
03b5a81
@davidorme
Converted layer_roles from tuple to list - incompatible with xarray c…
e17e368 
…oords definition
@davidorme
AnimalModel loads wrong constants
f862264
@davidorme
Added Config and CoreComponents fixtures, updated fixtures using prev…
b02d14a 
…ious fixture_layer_roles
@davidorme
Removing test for deprecated extract_timing_details
242fe2f
@davidorme
Updating plants tests to new BaseModel structure
e3c33a7
@davidorme
Potential solution to BaseModel._repr issue
086e53f
@davidorme
Updating soil tests
a705be0
@davidorme
Update litter model tests
5d55541
@davidorme
Updating hydrology model tests
388fc9f
@davidorme
Updated abiotic_simple model tests
86c4c93
@davidorme
Restored BaseModel._check_update_speed functionality
cb048e8
@davidorme
Fixing core tests, log message tweaks
e3181e9
@davidorme
Deprecated input file location in tests
663d3c4
@davidorme
Updating animal model tests
ce3396b
@davidorme
Last test fixes
127423e
@davidorme
Cleaner start_time setting
b1c9339
@davidorme
add _validate_canopy_layer function
53d820f
@davidorme
add _validate_soil_layers function
849e651
@davidorme
Updating core_component.py validators and adding unit tests for valid…
162daa4 
…ators
@davidorme
Merge pull request #375 from ImperialCollegeLondon/369-adopting-new-core
20fe796 
Adopting the new BaseModel structure in the model files.
@davidorme
Indenting issue in RST
42bd787
@davidorme
Fixing docstring issues
7443127
@davidorme
Merge branch 'develop' into 369-simplifying-the-model-creation-setup
b4fb178
@davidorme
Merge pull request #374 from ImperialCollegeLondon/369-simplifying-th…
76f1906 
…e-model-creation-setup

Defining the CoreComponents, LayerStructure and ModelTiming classes
@davidorme
Merge branch 'develop' into feature/new_abiotic_model_with_core
96fed6e
@davidorme davidorme requested a review from vgro February 6, 2024 09:52
vgro
vgro approved these changes Feb 6, 2024
View reviewed changes
Copy link
Collaborator

@vgro vgro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, I'll let you know if I get in trouble with the children

@vgro vgro merged commit 8bf6c66 into feature/new_abiotic_model Feb 6, 2024
16 checks passed
@vgro vgro deleted the feature/new_abiotic_model_with_core branch February 6, 2024 15:03
@davidorme davidorme mentioned this pull request Mar 1, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vgro vgro vgro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@davidorme @vgro